Sun Jan 25 16:20:37 2009 UTC ()
Fix (de-)installation if "PKG_SYSCONFBASE" is set. Bump package revision
because of this package list change.

Reviewed by Jared McNeill.


(tron)
diff -r1.32 -r1.33 pkgsrc/sysutils/hal/Makefile
diff -r1.3 -r1.4 pkgsrc/sysutils/hal/PLIST
cvs diff -r1.32 -r1.33 pkgsrc/sysutils/hal/Makefile (switch to unified diff)

--- pkgsrc/sysutils/hal/Makefile 2009/01/23 11:13:38 1.32
+++ pkgsrc/sysutils/hal/Makefile 2009/01/25 16:20:36 1.33
@@ -1,109 +1,108 @@ @@ -1,109 +1,108 @@
1# $NetBSD: Makefile,v 1.32 2009/01/23 11:13:38 sketch Exp $ 1# $NetBSD: Makefile,v 1.33 2009/01/25 16:20:36 tron Exp $
2# 
3 2
4DISTNAME= hal-0.5.11 3DISTNAME= hal-0.5.11
5PKGREVISION= 19 4PKGREVISION= 20
6CATEGORIES= sysutils 5CATEGORIES= sysutils
7MASTER_SITES= http://hal.freedesktop.org/releases/ 6MASTER_SITES= http://hal.freedesktop.org/releases/
8EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
9 8
10MAINTAINER= jmcneill@NetBSD.org 9MAINTAINER= jmcneill@NetBSD.org
11HOMEPAGE= http://hal.freedesktop.org/ 10HOMEPAGE= http://hal.freedesktop.org/
12COMMENT= FreeDesktop hardware abstraction layer 11COMMENT= FreeDesktop hardware abstraction layer
13 12
14BUILD_DEFS+= VARBASE PKG_SYSCONFBASE 13BUILD_DEFS+= VARBASE PKG_SYSCONFBASE
15PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
16 15
17GNU_CONFIGURE= YES 16GNU_CONFIGURE= YES
18USE_DIRS+= xdg-1.4 17USE_DIRS+= xdg-1.4
19USE_PKGLOCALEDIR= YES 18USE_PKGLOCALEDIR= YES
20USE_TOOLS+= gmake intltool msgfmt perl pkg-config 19USE_TOOLS+= gmake intltool msgfmt perl pkg-config
21USE_TOOLS+= autoconf automake autoreconf 20USE_TOOLS+= autoconf automake autoreconf
22USE_LIBTOOL= YES 21USE_LIBTOOL= YES
23 22
24MAKE_DIRS= ${VARBASE}/cache/hald 23MAKE_DIRS= ${VARBASE}/cache/hald
25SPECIAL_PERMS+= ${VARBASE}/cache/hald ${HAL_USER} ${HAL_GROUP} 0644 24SPECIAL_PERMS+= ${VARBASE}/cache/hald ${HAL_USER} ${HAL_GROUP} 0644
26 25
27EGDIR= ${PREFIX}/share/examples/hal 26EGDIR= ${PREFIX}/share/examples/hal
28 27
29CONF_FILES= ${EGDIR}/hal.conf ${PKG_SYSCONFBASE}/dbus-1/system.d/hal.conf 28CONF_FILES= ${EGDIR}/hal.conf ${PKG_SYSCONFBASE}/dbus-1/system.d/hal.conf
30 29
31CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} 30CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
32CONFIGURE_ARGS+= --localstatedir=${VARBASE} 31CONFIGURE_ARGS+= --localstatedir=${VARBASE}
33CONFIGURE_ARGS+= --with-pci-ids=${PREFIX}/share/pciids 32CONFIGURE_ARGS+= --with-pci-ids=${PREFIX}/share/pciids
34CONFIGURE_ARGS+= --with-usb-ids=${PREFIX}/share/usbids 33CONFIGURE_ARGS+= --with-usb-ids=${PREFIX}/share/usbids
35 34
36.include "../../mk/bsd.prefs.mk" 35.include "../../mk/bsd.prefs.mk"
37 36
38.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" 37.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
39.include "../../devel/libvolume_id/buildlink3.mk" 38.include "../../devel/libvolume_id/buildlink3.mk"
40CONFIGURE_ARGS+= --with-eject=/usr/sbin/cdcontrol 39CONFIGURE_ARGS+= --with-eject=/usr/sbin/cdcontrol
41CONFIGURE_ARGS+= --with-backend=freebsd 40CONFIGURE_ARGS+= --with-backend=freebsd
42PLIST_SRC= PLIST.FreeBSD PLIST 41PLIST_SRC= PLIST.FreeBSD PLIST
43 42
44.elif !empty(MACHINE_PLATFORM:MNetBSD-[5-9]*) 43.elif !empty(MACHINE_PLATFORM:MNetBSD-[5-9]*)
45.include "../../devel/libvolume_id/buildlink3.mk" 44.include "../../devel/libvolume_id/buildlink3.mk"
46CONFIGURE_ARGS+= --with-backend=netbsd 45CONFIGURE_ARGS+= --with-backend=netbsd
47HAL_GROUP= operator 46HAL_GROUP= operator
48 47
49.elif ${OPSYS} == "Linux" 48.elif ${OPSYS} == "Linux"
50.include "../../devel/libusb/buildlink3.mk" 49.include "../../devel/libusb/buildlink3.mk"
51.include "../../devel/libvolume_id/buildlink3.mk" 50.include "../../devel/libvolume_id/buildlink3.mk"
52.include "../../sysutils/pciutils/buildlink3.mk" 51.include "../../sysutils/pciutils/buildlink3.mk"
53CONFIGURE_ARGS+= --with-backend=linux 52CONFIGURE_ARGS+= --with-backend=linux
54CONF_FILES+= ${EGDIR}/90-hal.rules \ 53CONF_FILES+= ${EGDIR}/90-hal.rules \
55 ${PKG_SYSCONFBASE}/udev/rules.d/90-hal.rules 54 ${PKG_SYSCONFBASE}/udev/rules.d/90-hal.rules
56 55
57.else # Unsupported systems 56.else # Unsupported systems
58# Pull in the dummy backend 57# Pull in the dummy backend
59CONFIGURE_ARGS+= --with-backend=dummy 58CONFIGURE_ARGS+= --with-backend=dummy
60PLIST_SRC= PLIST 59PLIST_SRC= PLIST
61.endif 60.endif
62 61
63CFLAGS.SunOS+= -Du_int32_t=uint32_t 62CFLAGS.SunOS+= -Du_int32_t=uint32_t
64 63
65.if ${OPSYS} == "Darwin" 64.if ${OPSYS} == "Darwin"
66BUILDLINK_TRANSFORM+= rm:-Wl,--as-needed 65BUILDLINK_TRANSFORM+= rm:-Wl,--as-needed
67.endif 66.endif
68 67
69REPLACE_INTERPRETER+= bash 68REPLACE_INTERPRETER+= bash
70REPLACE.bash.old= /bin/bash 69REPLACE.bash.old= /bin/bash
71REPLACE.bash.new= ${SH} 70REPLACE.bash.new= ${SH}
72.for halscript in luks-remove luks-setup luks-teardown system-wol-enable system-wol-enabled system-wol-supported 71.for halscript in luks-remove luks-setup luks-teardown system-wol-enable system-wol-enabled system-wol-supported
73REPLACE_FILES.bash+= tools/hal-${halscript} 72REPLACE_FILES.bash+= tools/hal-${halscript}
74.endfor 73.endfor
75 74
76HAL_USER?= haldaemon 75HAL_USER?= haldaemon
77HAL_GROUP?= haldaemon 76HAL_GROUP?= haldaemon
78CONFIGURE_ARGS+= --with-hal-user=${HAL_USER} 77CONFIGURE_ARGS+= --with-hal-user=${HAL_USER}
79CONFIGURE_ARGS+= --with-hal-group=${HAL_GROUP} 78CONFIGURE_ARGS+= --with-hal-group=${HAL_GROUP}
80CONFIGURE_ARGS+= --disable-pmu 79CONFIGURE_ARGS+= --disable-pmu
81 80
82RCD_SCRIPTS= hal 81RCD_SCRIPTS= hal
83 82
84.if ${HAL_GROUP} != "operator" 83.if ${HAL_GROUP} != "operator"
85PKG_GROUPS= ${HAL_GROUP} 84PKG_GROUPS= ${HAL_GROUP}
86.endif 85.endif
87PKG_USERS= ${HAL_USER}:${HAL_GROUP} 86PKG_USERS= ${HAL_USER}:${HAL_GROUP}
88PKG_HOME.haldaemon= ${VARBASE}/run/hal 87PKG_HOME.haldaemon= ${VARBASE}/run/hal
89 88
90FILES_SUBST+= HAL_USER=${HAL_USER} 89FILES_SUBST+= HAL_USER=${HAL_USER}
91FILES_SUBST+= HAL_GROUP=${HAL_GROUP} 90FILES_SUBST+= HAL_GROUP=${HAL_GROUP}
92 91
93post-extract: 92post-extract:
94 ${CP} -r ${FILESDIR}/hald-netbsd ${WRKSRC}/hald/netbsd 93 ${CP} -r ${FILESDIR}/hald-netbsd ${WRKSRC}/hald/netbsd
95 ${CP} -r ${FILESDIR}/tools-netbsd ${WRKSRC}/tools/netbsd 94 ${CP} -r ${FILESDIR}/tools-netbsd ${WRKSRC}/tools/netbsd
96 95
97pre-configure: 96pre-configure:
98 cd ${WRKSRC} && autoreconf -vi 97 cd ${WRKSRC} && autoreconf -vi
99 98
100.include "../../devel/GConf/schemas.mk" 99.include "../../devel/GConf/schemas.mk"
101.include "../../devel/glib2/buildlink3.mk" 100.include "../../devel/glib2/buildlink3.mk"
102.include "../../misc/pciids/buildlink3.mk" 101.include "../../misc/pciids/buildlink3.mk"
103.include "../../misc/usbids/buildlink3.mk" 102.include "../../misc/usbids/buildlink3.mk"
104.include "../../security/policykit/buildlink3.mk" 103.include "../../security/policykit/buildlink3.mk"
105.include "../../sysutils/dbus/buildlink3.mk" 104.include "../../sysutils/dbus/buildlink3.mk"
106.include "../../sysutils/dbus-glib/buildlink3.mk" 105.include "../../sysutils/dbus-glib/buildlink3.mk"
107.include "../../sysutils/hal-info/buildlink3.mk" 106.include "../../sysutils/hal-info/buildlink3.mk"
108.include "../../textproc/expat/buildlink3.mk" 107.include "../../textproc/expat/buildlink3.mk"
109.include "../../mk/bsd.pkg.mk" 108.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/hal/PLIST (switch to unified diff)

--- pkgsrc/sysutils/hal/PLIST 2008/12/20 21:11:05 1.3
+++ pkgsrc/sysutils/hal/PLIST 2009/01/25 16:20:36 1.4
@@ -1,115 +1,115 @@ @@ -1,115 +1,115 @@
1@comment $NetBSD: PLIST,v 1.3 2008/12/20 21:11:05 jmcneill Exp $ 1@comment $NetBSD: PLIST,v 1.4 2009/01/25 16:20:36 tron Exp $
2bin/hal-device 2bin/hal-device
3bin/hal-disable-polling 3bin/hal-disable-polling
4bin/hal-find-by-capability 4bin/hal-find-by-capability
5bin/hal-find-by-property 5bin/hal-find-by-property
6bin/hal-get-property 6bin/hal-get-property
7bin/hal-is-caller-locked-out 7bin/hal-is-caller-locked-out
8bin/hal-is-caller-privileged 8bin/hal-is-caller-privileged
9bin/hal-lock 9bin/hal-lock
10bin/hal-set-property 10bin/hal-set-property
11bin/lshal 11bin/lshal
12include/hal/libhal-storage.h 12include/hal/libhal-storage.h
13include/hal/libhal.h 13include/hal/libhal.h
14lib/hal/scripts/hal-dockstation-undock 14lib/hal/scripts/hal-dockstation-undock
15lib/hal/scripts/hal-functions 15lib/hal/scripts/hal-functions
16lib/hal/scripts/hal-luks-remove 16lib/hal/scripts/hal-luks-remove
17lib/hal/scripts/hal-luks-setup 17lib/hal/scripts/hal-luks-setup
18lib/hal/scripts/hal-luks-teardown 18lib/hal/scripts/hal-luks-teardown
19lib/hal/scripts/hal-system-killswitch-get-power 19lib/hal/scripts/hal-system-killswitch-get-power
20lib/hal/scripts/hal-system-killswitch-set-power 20lib/hal/scripts/hal-system-killswitch-set-power
21lib/hal/scripts/hal-system-lcd-get-brightness 21lib/hal/scripts/hal-system-lcd-get-brightness
22lib/hal/scripts/hal-system-lcd-set-brightness 22lib/hal/scripts/hal-system-lcd-set-brightness
23lib/hal/scripts/hal-system-power-hibernate 23lib/hal/scripts/hal-system-power-hibernate
24lib/hal/scripts/hal-system-power-reboot 24lib/hal/scripts/hal-system-power-reboot
25lib/hal/scripts/hal-system-power-set-power-save 25lib/hal/scripts/hal-system-power-set-power-save
26lib/hal/scripts/hal-system-power-shutdown 26lib/hal/scripts/hal-system-power-shutdown
27lib/hal/scripts/hal-system-power-suspend 27lib/hal/scripts/hal-system-power-suspend
28lib/hal/scripts/hal-system-power-suspend-hybrid 28lib/hal/scripts/hal-system-power-suspend-hybrid
29lib/hal/scripts/hal-system-wol-enable 29lib/hal/scripts/hal-system-wol-enable
30lib/hal/scripts/hal-system-wol-enabled 30lib/hal/scripts/hal-system-wol-enabled
31lib/hal/scripts/hal-system-wol-supported 31lib/hal/scripts/hal-system-wol-supported
32lib/libhal-storage.la 32lib/libhal-storage.la
33lib/libhal.la 33lib/libhal.la
34lib/pkgconfig/hal-storage.pc 34lib/pkgconfig/hal-storage.pc
35lib/pkgconfig/hal.pc 35lib/pkgconfig/hal.pc
36libexec/hal-storage-cleanup-all-mountpoints 36libexec/hal-storage-cleanup-all-mountpoints
37libexec/hal-storage-cleanup-mountpoint 37libexec/hal-storage-cleanup-mountpoint
38libexec/hal-storage-closetray 38libexec/hal-storage-closetray
39libexec/hal-storage-eject 39libexec/hal-storage-eject
40libexec/hal-storage-mount 40libexec/hal-storage-mount
41libexec/hal-storage-unmount 41libexec/hal-storage-unmount
42libexec/hal-system-power-pm-is-supported 42libexec/hal-system-power-pm-is-supported
43libexec/hal-system-setserial 43libexec/hal-system-setserial
44libexec/hald-generate-fdi-cache 44libexec/hald-generate-fdi-cache
45libexec/hald-runner 45libexec/hald-runner
46man/man1/hal-disable-polling.1 46man/man1/hal-disable-polling.1
47man/man1/hal-find-by-capability.1 47man/man1/hal-find-by-capability.1
48man/man1/hal-find-by-property.1 48man/man1/hal-find-by-property.1
49man/man1/hal-get-property.1 49man/man1/hal-get-property.1
50man/man1/hal-is-caller-locked-out.1 50man/man1/hal-is-caller-locked-out.1
51man/man1/hal-is-caller-privileged.1 51man/man1/hal-is-caller-privileged.1
52man/man1/hal-lock.1 52man/man1/hal-lock.1
53man/man1/hal-set-property.1 53man/man1/hal-set-property.1
54man/man1/lshal.1 54man/man1/lshal.1
55man/man8/hald.8 55man/man8/hald.8
56sbin/hald 56sbin/hald
57share/examples/hal/hal.conf 57share/examples/hal/hal.conf
58share/examples/rc.d/hal 58share/examples/rc.d/hal
59share/gtk-doc/html/libhal-storage/home.png 59share/gtk-doc/html/libhal-storage/home.png
60share/gtk-doc/html/libhal-storage/index.html 60share/gtk-doc/html/libhal-storage/index.html
61share/gtk-doc/html/libhal-storage/index.sgml 61share/gtk-doc/html/libhal-storage/index.sgml
62share/gtk-doc/html/libhal-storage/ix01.html 62share/gtk-doc/html/libhal-storage/ix01.html
63share/gtk-doc/html/libhal-storage/left.png 63share/gtk-doc/html/libhal-storage/left.png
64share/gtk-doc/html/libhal-storage/libhal-storage-libhal-storage.html 64share/gtk-doc/html/libhal-storage/libhal-storage-libhal-storage.html
65share/gtk-doc/html/libhal-storage/libhal-storage.devhelp 65share/gtk-doc/html/libhal-storage/libhal-storage.devhelp
66share/gtk-doc/html/libhal-storage/libhal-storage.devhelp2 66share/gtk-doc/html/libhal-storage/libhal-storage.devhelp2
67share/gtk-doc/html/libhal-storage/license.html 67share/gtk-doc/html/libhal-storage/license.html
68share/gtk-doc/html/libhal-storage/right.png 68share/gtk-doc/html/libhal-storage/right.png
69share/gtk-doc/html/libhal-storage/rn01.html 69share/gtk-doc/html/libhal-storage/rn01.html
70share/gtk-doc/html/libhal-storage/style.css 70share/gtk-doc/html/libhal-storage/style.css
71share/gtk-doc/html/libhal-storage/up.png 71share/gtk-doc/html/libhal-storage/up.png
72share/gtk-doc/html/libhal-storage/version.xml 72share/gtk-doc/html/libhal-storage/version.xml
73share/gtk-doc/html/libhal/home.png 73share/gtk-doc/html/libhal/home.png
74share/gtk-doc/html/libhal/index.html 74share/gtk-doc/html/libhal/index.html
75share/gtk-doc/html/libhal/index.sgml 75share/gtk-doc/html/libhal/index.sgml
76share/gtk-doc/html/libhal/ix01.html 76share/gtk-doc/html/libhal/ix01.html
77share/gtk-doc/html/libhal/left.png 77share/gtk-doc/html/libhal/left.png
78share/gtk-doc/html/libhal/libhal-libhal.html 78share/gtk-doc/html/libhal/libhal-libhal.html
79share/gtk-doc/html/libhal/libhal.devhelp 79share/gtk-doc/html/libhal/libhal.devhelp
80share/gtk-doc/html/libhal/libhal.devhelp2 80share/gtk-doc/html/libhal/libhal.devhelp2
81share/gtk-doc/html/libhal/license.html 81share/gtk-doc/html/libhal/license.html
82share/gtk-doc/html/libhal/right.png 82share/gtk-doc/html/libhal/right.png
83share/gtk-doc/html/libhal/rn01.html 83share/gtk-doc/html/libhal/rn01.html
84share/gtk-doc/html/libhal/style.css 84share/gtk-doc/html/libhal/style.css
85share/gtk-doc/html/libhal/up.png 85share/gtk-doc/html/libhal/up.png
86share/hal/fdi/fdi.dtd 86share/hal/fdi/fdi.dtd
87share/hal/fdi/policy/10osvendor/10-dockstation.fdi 87share/hal/fdi/policy/10osvendor/10-dockstation.fdi
88share/hal/fdi/policy/10osvendor/10-input-policy.fdi 88share/hal/fdi/policy/10osvendor/10-input-policy.fdi
89share/hal/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi 89share/hal/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
90share/hal/fdi/policy/10osvendor/10-power-mgmt-policy.fdi 90share/hal/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
91share/hal/fdi/policy/10osvendor/10-rfkill-switch.fdi 91share/hal/fdi/policy/10osvendor/10-rfkill-switch.fdi
92share/hal/fdi/policy/10osvendor/10-tabletPCs.fdi 92share/hal/fdi/policy/10osvendor/10-tabletPCs.fdi
93share/hal/fdi/policy/10osvendor/10-x11-input.fdi 93share/hal/fdi/policy/10osvendor/10-x11-input.fdi
94share/hal/fdi/policy/10osvendor/15-storage-luks.fdi 94share/hal/fdi/policy/10osvendor/15-storage-luks.fdi
95share/hal/fdi/policy/10osvendor/20-storage-methods.fdi 95share/hal/fdi/policy/10osvendor/20-storage-methods.fdi
96share/hal/fdi/policy/10osvendor/30-wol.fdi 96share/hal/fdi/policy/10osvendor/30-wol.fdi
97share/PolicyKit/policy/org.freedesktop.hal.dockstation.policy 97share/PolicyKit/policy/org.freedesktop.hal.dockstation.policy
98share/PolicyKit/policy/org.freedesktop.hal.killswitch.policy 98share/PolicyKit/policy/org.freedesktop.hal.killswitch.policy
99share/PolicyKit/policy/org.freedesktop.hal.policy 99share/PolicyKit/policy/org.freedesktop.hal.policy
100share/PolicyKit/policy/org.freedesktop.hal.power-management.policy 100share/PolicyKit/policy/org.freedesktop.hal.power-management.policy
101share/PolicyKit/policy/org.freedesktop.hal.storage.policy 101share/PolicyKit/policy/org.freedesktop.hal.storage.policy
102share/PolicyKit/policy/org.freedesktop.hal.wol.policy 102share/PolicyKit/policy/org.freedesktop.hal.wol.policy
103@dirrm share/gtk-doc/html/libhal-storage 103@dirrm share/gtk-doc/html/libhal-storage
104@dirrm share/gtk-doc/html/libhal 104@dirrm share/gtk-doc/html/libhal
105@dirrm lib/hal/scripts 105@dirrm lib/hal/scripts
106@dirrm lib/hal 106@dirrm lib/hal
107@dirrm include/hal 107@dirrm include/hal
108@exec ${MKDIR} %D/etc/hal/fdi/preprobe 108@exec ${MKDIR} ${PKG_SYSCONFDIR}/hal/fdi/information
109@dirrm etc/hal/fdi/preprobe 109@exec ${MKDIR} ${PKG_SYSCONFDIR}/hal/fdi/policy
110@exec ${MKDIR} %D/etc/hal/fdi/policy 110@exec ${MKDIR} ${PKG_SYSCONFDIR}/hal/fdi/preprobe
111@dirrm etc/hal/fdi/policy 111@unexec ${RMDIR} ${PKG_SYSCONFDIR}/hal/fdi/preprobe 2>/dev/null || ${TRUE}
112@exec ${MKDIR} %D/etc/hal/fdi/information 112@unexec ${RMDIR} ${PKG_SYSCONFDIR}/hal/fdi/policy 2>/dev/null || ${TRUE}
113@dirrm etc/hal/fdi/information 113@unexec ${RMDIR} ${PKG_SYSCONFDIR}/hal/fdi/information 2>/dev/null || ${TRUE}
114@dirrm etc/hal/fdi 114@unexec ${RMDIR} ${PKG_SYSCONFDIR}/hal/fdi 2>/dev/null || ${TRUE}
115@dirrm etc/hal 115@unexec ${RMDIR} ${PKG_SYSCONFDIR}/hal 2>/dev/null || ${TRUE}