Sun Jun 3 22:09:52 2018 UTC ()
Drop hal by default, upstream has dropped it and it is severely deprecated.


(youri)
diff -r1.94 -r1.95 pkgsrc/sysutils/gvfs/Makefile
cvs diff -r1.94 -r1.95 pkgsrc/sysutils/gvfs/Makefile (switch to unified diff)

--- pkgsrc/sysutils/gvfs/Makefile 2018/05/15 15:29:44 1.94
+++ pkgsrc/sysutils/gvfs/Makefile 2018/06/03 22:09:52 1.95
@@ -1,91 +1,91 @@ @@ -1,91 +1,91 @@
1# $NetBSD: Makefile,v 1.94 2018/05/15 15:29:44 jperkin Exp $ 1# $NetBSD: Makefile,v 1.95 2018/06/03 22:09:52 youri Exp $
2# 2#
3 3
4DISTNAME= gvfs-1.6.7 4DISTNAME= gvfs-1.6.7
5PKGREVISION= 35 5PKGREVISION= 35
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gvfs/1.6/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gvfs/1.6/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.gnome.org/ 11HOMEPAGE= https://www.gnome.org/
12COMMENT= Userspace virtual filesystem 12COMMENT= Userspace virtual filesystem
13LICENSE= gnu-lgpl-v2 13LICENSE= gnu-lgpl-v2
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= intltool gmake pkg-config msgfmt 17USE_TOOLS+= intltool gmake pkg-config msgfmt
18CONFIGURE_ARGS+= --enable-http 18CONFIGURE_ARGS+= --enable-http
19CONFIGURE_ARGS+= --disable-bash-completion 19CONFIGURE_ARGS+= --disable-bash-completion
20 20
21.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
22 22
23PKG_OPTIONS_VAR= PKG_OPTIONS.gvfs 23PKG_OPTIONS_VAR= PKG_OPTIONS.gvfs
24PKG_SUPPORTED_OPTIONS+= avahi hal fuse samba 24PKG_SUPPORTED_OPTIONS+= avahi hal fuse samba
25PKG_SUGGESTED_OPTIONS+= hal samba 25PKG_SUGGESTED_OPTIONS+= samba
26PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} 26PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS}
27 27
28# XXX fuse.bl3.mk will fail if we include it and fuse is not available 28# XXX fuse.bl3.mk will fail if we include it and fuse is not available
29.if ${OPSYS} == "Linux" #|| (${OPSYS} == "NetBSD" && exists(/usr/include/fuse.h)) 29.if ${OPSYS} == "Linux" #|| (${OPSYS} == "NetBSD" && exists(/usr/include/fuse.h))
30PKG_SUGGESTED_OPTIONS+= fuse 30PKG_SUGGESTED_OPTIONS+= fuse
31.endif 31.endif
32 32
33.include "../../mk/bsd.options.mk" 33.include "../../mk/bsd.options.mk"
34 34
35.if !empty(PKG_OPTIONS:Mavahi) 35.if !empty(PKG_OPTIONS:Mavahi)
36.include "../../net/avahi/buildlink3.mk" 36.include "../../net/avahi/buildlink3.mk"
37CONFIGURE_ARGS+= --enable-avahi 37CONFIGURE_ARGS+= --enable-avahi
38PLIST.avahi= yes 38PLIST.avahi= yes
39.else 39.else
40CONFIGURE_ARGS+= --disable-avahi 40CONFIGURE_ARGS+= --disable-avahi
41.endif 41.endif
42 42
43.if !empty(PKG_OPTIONS:Msamba) 43.if !empty(PKG_OPTIONS:Msamba)
44CONFIGURE_ARGS+= --with-samba-includes=${BUILDLINK_PREFIX.samba}/include 44CONFIGURE_ARGS+= --with-samba-includes=${BUILDLINK_PREFIX.samba}/include
45CONFIGURE_ARGS+= --with-samba-libs=${BUILDLINK_PREFIX.samba}/lib 45CONFIGURE_ARGS+= --with-samba-libs=${BUILDLINK_PREFIX.samba}/lib
46.include "../../net/samba/buildlink3.mk" 46.include "../../net/samba/buildlink3.mk"
47PLIST.samba= yes 47PLIST.samba= yes
48.else 48.else
49CONFIGURE_ARGS+= --disable-samba 49CONFIGURE_ARGS+= --disable-samba
50.endif 50.endif
51 51
52.if !empty(PKG_OPTIONS:Mhal) 52.if !empty(PKG_OPTIONS:Mhal)
53.include "../../misc/libcdio-paranoia/buildlink3.mk" 53.include "../../misc/libcdio-paranoia/buildlink3.mk"
54.include "../../sysutils/hal/buildlink3.mk" 54.include "../../sysutils/hal/buildlink3.mk"
55CONFIGURE_ARGS+= --enable-hal 55CONFIGURE_ARGS+= --enable-hal
56CONFIGURE_ARGS+= --enable-cdda 56CONFIGURE_ARGS+= --enable-cdda
57PLIST.hal= yes 57PLIST.hal= yes
58.else 58.else
59CONFIGURE_ARGS+= --disable-hal 59CONFIGURE_ARGS+= --disable-hal
60CONFIGURE_ARGS+= --disable-cdda 60CONFIGURE_ARGS+= --disable-cdda
61.endif 61.endif
62 62
63.if !empty(PKG_OPTIONS:Mfuse) 63.if !empty(PKG_OPTIONS:Mfuse)
64.include "../../mk/fuse.buildlink3.mk" 64.include "../../mk/fuse.buildlink3.mk"
65CONFIGURE_ARGS+= --enable-fuse 65CONFIGURE_ARGS+= --enable-fuse
66PLIST.fuse= yes 66PLIST.fuse= yes
67.else 67.else
68CONFIGURE_ARGS+= --disable-fuse 68CONFIGURE_ARGS+= --disable-fuse
69.endif 69.endif
70 70
71BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED 71BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED
72 72
73.include "../../mk/compiler.mk" 73.include "../../mk/compiler.mk"
74 74
75.if !empty(PKGSRC_COMPILER:Mclang) || !empty(CC_VERSION:Mgcc-[6-9]*) 75.if !empty(PKGSRC_COMPILER:Mclang) || !empty(CC_VERSION:Mgcc-[6-9]*)
76CFLAGS.SunOS+= -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ 76CFLAGS.SunOS+= -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
77.else 77.else
78CFLAGS.SunOS+= -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ 78CFLAGS.SunOS+= -D_XOPEN_SOURCE=500 -D__EXTENSIONS__
79.endif 79.endif
80 80
81BUILDLINK_API_DEPENDS.glib2+= glib2>=2.23.4 81BUILDLINK_API_DEPENDS.glib2+= glib2>=2.23.4
82.include "../../devel/glib2/modules.mk" 82.include "../../devel/glib2/modules.mk"
83.include "../../sysutils/dbus/buildlink3.mk" 83.include "../../sysutils/dbus/buildlink3.mk"
84.include "../../archivers/libarchive/buildlink3.mk" 84.include "../../archivers/libarchive/buildlink3.mk"
85BUILDLINK_API_DEPENDS.libsoup+= libsoup>=2.26.0 85BUILDLINK_API_DEPENDS.libsoup+= libsoup>=2.26.0
86.include "../../net/libsoup/buildlink3.mk" 86.include "../../net/libsoup/buildlink3.mk"
87.include "../../textproc/libxml2/buildlink3.mk" 87.include "../../textproc/libxml2/buildlink3.mk"
88.include "../../devel/GConf/buildlink3.mk" 88.include "../../devel/GConf/buildlink3.mk"
89.include "../../security/libgnome-keyring/buildlink3.mk" 89.include "../../security/libgnome-keyring/buildlink3.mk"
90.include "../../security/openssl/buildlink3.mk" 90.include "../../security/openssl/buildlink3.mk"
91.include "../../mk/bsd.pkg.mk" 91.include "../../mk/bsd.pkg.mk"