Thu Oct 3 21:28:46 2019 UTC ()
sysutils/hal: remove reference to GConf2

option --disable-schemas-install is unknown in all 1 configure scripts
option --with-gconf-schema-file-dir is unknown in all 1 configure scripts


(rillig)
diff -r1.85 -r1.86 pkgsrc/sysutils/hal/Makefile
cvs diff -r1.85 -r1.86 pkgsrc/sysutils/hal/Makefile (switch to unified diff)

--- pkgsrc/sysutils/hal/Makefile 2019/08/11 13:23:08 1.85
+++ pkgsrc/sysutils/hal/Makefile 2019/10/03 21:28:45 1.86
@@ -1,133 +1,132 @@ @@ -1,133 +1,132 @@
1# $NetBSD: Makefile,v 1.85 2019/08/11 13:23:08 wiz Exp $ 1# $NetBSD: Makefile,v 1.86 2019/10/03 21:28:45 rillig Exp $
2 2
3DISTNAME= hal-0.5.14 3DISTNAME= hal-0.5.14
4PKGREVISION= 22 4PKGREVISION= 22
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6MASTER_SITES= http://hal.freedesktop.org/releases/ 6MASTER_SITES= http://hal.freedesktop.org/releases/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.freedesktop.org/wiki/Software/hal/ 10HOMEPAGE= https://www.freedesktop.org/wiki/Software/hal/
11COMMENT= FreeDesktop hardware abstraction layer 11COMMENT= FreeDesktop hardware abstraction layer
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DEPENDS+= pciids-[0-9]*:../../misc/pciids 14DEPENDS+= pciids-[0-9]*:../../misc/pciids
15 15
16BUILD_DEFS+= VARBASE PKG_SYSCONFBASE 16BUILD_DEFS+= VARBASE PKG_SYSCONFBASE
17 17
18GNU_CONFIGURE= YES 18GNU_CONFIGURE= YES
19USE_PKGLOCALEDIR= YES 19USE_PKGLOCALEDIR= YES
20USE_TOOLS+= gmake intltool msgfmt perl pkg-config 20USE_TOOLS+= gmake intltool msgfmt perl pkg-config
21USE_TOOLS+= autoconf automake autoreconf 21USE_TOOLS+= autoconf automake autoreconf
22USE_LIBTOOL= YES 22USE_LIBTOOL= YES
23 23
24MAKE_DIRS+= /media 24MAKE_DIRS+= /media
25MAKE_DIRS+= ${VARBASE}/cache/hald 25MAKE_DIRS+= ${VARBASE}/cache/hald
26SPECIAL_PERMS+= ${VARBASE}/cache/hald ${HAL_USER} ${HAL_GROUP} 0644 26SPECIAL_PERMS+= ${VARBASE}/cache/hald ${HAL_USER} ${HAL_GROUP} 0644
27 27
28EGDIR= ${PREFIX}/share/examples/hal 28EGDIR= ${PREFIX}/share/examples/hal
29 29
30CONF_FILES= ${EGDIR}/hal.conf ${PKG_SYSCONFBASE}/dbus-1/system.d/hal.conf 30CONF_FILES= ${EGDIR}/hal.conf ${PKG_SYSCONFBASE}/dbus-1/system.d/hal.conf
31 31
32CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} 32CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
33CONFIGURE_ARGS+= --localstatedir=${VARBASE} 33CONFIGURE_ARGS+= --localstatedir=${VARBASE}
34CONFIGURE_ARGS+= --with-pci-ids=${PREFIX}/share/pciids 34CONFIGURE_ARGS+= --with-pci-ids=${PREFIX}/share/pciids
35CONFIGURE_ARGS+= --with-usb-ids=${PREFIX}/share/usbids 35CONFIGURE_ARGS+= --with-usb-ids=${PREFIX}/share/usbids
36CONFIGURE_ARGS+= --without-os-type 36CONFIGURE_ARGS+= --without-os-type
37 37
38.include "../../mk/bsd.prefs.mk" 38.include "../../mk/bsd.prefs.mk"
39 39
40.if ${OPSYS} == "DragonFly" 40.if ${OPSYS} == "DragonFly"
41.include "../../devel/libvolume_id/buildlink3.mk" 41.include "../../devel/libvolume_id/buildlink3.mk"
42CONFIGURE_ARGS+= --with-eject=/usr/sbin/cdcontrol 42CONFIGURE_ARGS+= --with-eject=/usr/sbin/cdcontrol
43CONFIGURE_ARGS+= --with-backend=freebsd 43CONFIGURE_ARGS+= --with-backend=freebsd
44PLIST_SRC= PLIST.DragonFly PLIST 44PLIST_SRC= PLIST.DragonFly PLIST
45 45
46.elif ${OPSYS} == "FreeBSD" 46.elif ${OPSYS} == "FreeBSD"
47.include "../../devel/libvolume_id/buildlink3.mk" 47.include "../../devel/libvolume_id/buildlink3.mk"
48CONFIGURE_ARGS+= --with-eject=/usr/sbin/cdcontrol 48CONFIGURE_ARGS+= --with-eject=/usr/sbin/cdcontrol
49CONFIGURE_ARGS+= --with-backend=freebsd 49CONFIGURE_ARGS+= --with-backend=freebsd
50PLIST_SRC= PLIST.FreeBSD PLIST 50PLIST_SRC= PLIST.FreeBSD PLIST
51 51
52.elif !empty(MACHINE_PLATFORM:MNetBSD-[5-9]*) 52.elif !empty(MACHINE_PLATFORM:MNetBSD-[5-9]*)
53.include "../../devel/libvolume_id/buildlink3.mk" 53.include "../../devel/libvolume_id/buildlink3.mk"
54CONFIGURE_ARGS+= --with-backend=netbsd 54CONFIGURE_ARGS+= --with-backend=netbsd
55HAL_GROUP= operator 55HAL_GROUP= operator
56 56
57.elif ${OPSYS} == "Linux" 57.elif ${OPSYS} == "Linux"
58.include "../../devel/gperf/buildlink3.mk" 58.include "../../devel/gperf/buildlink3.mk"
59.include "../../devel/libblkid/buildlink3.mk" 59.include "../../devel/libblkid/buildlink3.mk"
60.include "../../devel/libvolume_id/buildlink3.mk" 60.include "../../devel/libvolume_id/buildlink3.mk"
61# XXX we install libpci headers to an unexpected location 61# XXX we install libpci headers to an unexpected location
62# as far as this package is concerned, so it fails 62# as far as this package is concerned, so it fails
63# to detect libpci! 63# to detect libpci!
64#.include "../../sysutils/pciutils/buildlink3.mk" 64#.include "../../sysutils/pciutils/buildlink3.mk"
65CONFIGURE_ARGS+= --with-backend=linux 65CONFIGURE_ARGS+= --with-backend=linux
66MAKE_DIRS+= /etc/udev 66MAKE_DIRS+= /etc/udev
67MAKE_DIRS+= /etc/udev/rules.d 67MAKE_DIRS+= /etc/udev/rules.d
68CONF_FILES+= ${EGDIR}/90-hal.rules \ 68CONF_FILES+= ${EGDIR}/90-hal.rules \
69 /etc/udev/rules.d/90-hal.rules 69 /etc/udev/rules.d/90-hal.rules
70PLIST_VARS+= imac 70PLIST_VARS+= imac
71.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 71.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
72PLIST.imac= yes 72PLIST.imac= yes
73CONFIGURE_ARGS+= --with-imac 73CONFIGURE_ARGS+= --with-imac
74.else 74.else
75CONFIGURE_ARGS+= --without-imac 75CONFIGURE_ARGS+= --without-imac
76.endif 76.endif
77.else # Unsupported systems 77.else # Unsupported systems
78# Pull in the dummy backend 78# Pull in the dummy backend
79.include "../../devel/libvolume_id/buildlink3.mk" 79.include "../../devel/libvolume_id/buildlink3.mk"
80CONFIGURE_ARGS+= --with-backend=dummy 80CONFIGURE_ARGS+= --with-backend=dummy
81PLIST_SRC= PLIST 81PLIST_SRC= PLIST
82.endif 82.endif
83 83
84CFLAGS.SunOS+= -Du_int32_t=uint32_t 84CFLAGS.SunOS+= -Du_int32_t=uint32_t
85 85
86BUILDLINK_TRANSFORM.SunOS+= opt:-Wl,--as-needed:-Wl,-zignore 86BUILDLINK_TRANSFORM.SunOS+= opt:-Wl,--as-needed:-Wl,-zignore
87 87
88REPLACE_INTERPRETER+= bash 88REPLACE_INTERPRETER+= bash
89REPLACE.bash.old= /bin/bash 89REPLACE.bash.old= /bin/bash
90REPLACE.bash.new= ${SH} 90REPLACE.bash.new= ${SH}
91.for halscript in luks-remove luks-setup luks-teardown system-wol-enable system-wol-enabled system-wol-supported 91.for halscript in luks-remove luks-setup luks-teardown system-wol-enable system-wol-enabled system-wol-supported
92REPLACE_FILES.bash+= tools/hal-${halscript} 92REPLACE_FILES.bash+= tools/hal-${halscript}
93.endfor 93.endfor
94 94
95HAL_USER?= haldaemon 95HAL_USER?= haldaemon
96HAL_GROUP?= haldaemon 96HAL_GROUP?= haldaemon
97CONFIGURE_ARGS+= --with-hal-user=${HAL_USER} 97CONFIGURE_ARGS+= --with-hal-user=${HAL_USER}
98CONFIGURE_ARGS+= --with-hal-group=${HAL_GROUP} 98CONFIGURE_ARGS+= --with-hal-group=${HAL_GROUP}
99CONFIGURE_ARGS+= --disable-pmu 99CONFIGURE_ARGS+= --disable-pmu
100 100
101RCD_SCRIPTS= hal 101RCD_SCRIPTS= hal
102SMF_METHODS= hal 102SMF_METHODS= hal
103 103
104.if ${HAL_GROUP} != "operator" 104.if ${HAL_GROUP} != "operator"
105PKG_GROUPS= ${HAL_GROUP} 105PKG_GROUPS= ${HAL_GROUP}
106.endif 106.endif
107PKG_USERS= ${HAL_USER}:${HAL_GROUP} 107PKG_USERS= ${HAL_USER}:${HAL_GROUP}
108PKG_HOME.haldaemon= ${VARBASE}/run/hald 108PKG_HOME.haldaemon= ${VARBASE}/run/hald
109 109
110FILES_SUBST+= HAL_USER=${HAL_USER} 110FILES_SUBST+= HAL_USER=${HAL_USER}
111FILES_SUBST+= HAL_GROUP=${HAL_GROUP} 111FILES_SUBST+= HAL_GROUP=${HAL_GROUP}
112FILES_SUBST+= PKG_HOME.haldaemon=${PKG_HOME.haldaemon} 112FILES_SUBST+= PKG_HOME.haldaemon=${PKG_HOME.haldaemon}
113 113
114PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} 114PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
115 115
116TEST_TARGET= check 116TEST_TARGET= check
117 117
118post-extract: 118post-extract:
119 ${CP} -r ${FILESDIR}/hald-netbsd ${WRKSRC}/hald/netbsd 119 ${CP} -r ${FILESDIR}/hald-netbsd ${WRKSRC}/hald/netbsd
120 ${CP} -r ${FILESDIR}/tools-netbsd ${WRKSRC}/tools/netbsd 120 ${CP} -r ${FILESDIR}/tools-netbsd ${WRKSRC}/tools/netbsd
121 121
122pre-configure: 122pre-configure:
123 cd ${WRKSRC} && autoreconf -vi ${AUTORECONF_ARGS} 123 cd ${WRKSRC} && autoreconf -vi ${AUTORECONF_ARGS}
124 124
125.include "../../devel/GConf/schemas.mk" 
126.include "../../devel/glib2/buildlink3.mk" 125.include "../../devel/glib2/buildlink3.mk"
127.include "../../misc/usbids/buildlink3.mk" 126.include "../../misc/usbids/buildlink3.mk"
128.include "../../security/policykit/buildlink3.mk" 127.include "../../security/policykit/buildlink3.mk"
129.include "../../sysutils/dbus/buildlink3.mk" 128.include "../../sysutils/dbus/buildlink3.mk"
130.include "../../sysutils/dbus-glib/buildlink3.mk" 129.include "../../sysutils/dbus-glib/buildlink3.mk"
131.include "../../sysutils/hal-info/buildlink3.mk" 130.include "../../sysutils/hal-info/buildlink3.mk"
132.include "../../textproc/expat/buildlink3.mk" 131.include "../../textproc/expat/buildlink3.mk"
133.include "../../mk/bsd.pkg.mk" 132.include "../../mk/bsd.pkg.mk"