Tue Nov 25 23:56:30 2008 UTC ()
Revert previous; automake doesn't like the symlink.


(jmcneill)
diff -r1.6 -r1.7 pkgsrc/sysutils/hal/Makefile
cvs diff -r1.6 -r1.7 pkgsrc/sysutils/hal/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/hal/Makefile 2008/11/25 23:40:59 1.6
+++ pkgsrc/sysutils/hal/Makefile 2008/11/25 23:56:30 1.7
@@ -1,30 +1,28 @@ @@ -1,30 +1,28 @@
1# $NetBSD: Makefile,v 1.6 2008/11/25 23:40:59 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.7 2008/11/25 23:56:30 jmcneill Exp $
2# 2#
3 3
4DISTNAME= hal-0.5.11 4DISTNAME= hal-0.5.11
5PKGREVISION= 4 5PKGREVISION= 4
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= http://hal.freedesktop.org/releases/ 7MASTER_SITES= http://hal.freedesktop.org/releases/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= jmcneill@NetBSD.org 10MAINTAINER= jmcneill@NetBSD.org
11HOMEPAGE= http://hal.freedesktop.org/ 11HOMEPAGE= http://hal.freedesktop.org/
12COMMENT= FreeDesktop hardware abstraction layer 12COMMENT= FreeDesktop hardware abstraction layer
13 13
14BUILD_DEFS+= VARBASE 14BUILD_DEFS+= VARBASE
15 15
16HAL_DEVELOPER?= no 
17 
18HAL_USER?= haldaemon 16HAL_USER?= haldaemon
19HAL_GROUP?= haldaemon 17HAL_GROUP?= haldaemon
20 18
21GNU_CONFIGURE= YES 19GNU_CONFIGURE= YES
22USE_DIRS+= xdg-1.4 20USE_DIRS+= xdg-1.4
23USE_PKGLOCALEDIR= YES 21USE_PKGLOCALEDIR= YES
24USE_TOOLS+= gmake intltool msgfmt perl pkg-config 22USE_TOOLS+= gmake intltool msgfmt perl pkg-config
25USE_TOOLS+= autoconf automake autoreconf 23USE_TOOLS+= autoconf automake autoreconf
26USE_LIBTOOL= YES 24USE_LIBTOOL= YES
27 25
28MAKE_DIRS= ${VARBASE}/cache/hald 26MAKE_DIRS= ${VARBASE}/cache/hald
29SPECIAL_PERMS+= ${VARBASE}/cache/hald ${HAL_USER} ${HAL_GROUP} 0644 27SPECIAL_PERMS+= ${VARBASE}/cache/hald ${HAL_USER} ${HAL_GROUP} 0644
30 28
@@ -64,31 +62,27 @@ REPLACE.bash.new= ${SH} @@ -64,31 +62,27 @@ REPLACE.bash.new= ${SH}
64REPLACE_FILES.bash+= tools/hal-${halscript} 62REPLACE_FILES.bash+= tools/hal-${halscript}
65.endfor 63.endfor
66 64
67RCD_SCRIPTS= hal 65RCD_SCRIPTS= hal
68 66
69PKG_GROUPS= ${HAL_GROUP} 67PKG_GROUPS= ${HAL_GROUP}
70PKG_USERS= ${HAL_USER}:${HAL_GROUP} 68PKG_USERS= ${HAL_USER}:${HAL_GROUP}
71PKG_HOME.haldaemon= ${VARBASE}/run/hal 69PKG_HOME.haldaemon= ${VARBASE}/run/hal
72 70
73FILES_SUBST+= HAL_USER=${HAL_USER} 71FILES_SUBST+= HAL_USER=${HAL_USER}
74FILES_SUBST+= HAL_GROUP=${HAL_GROUP} 72FILES_SUBST+= HAL_GROUP=${HAL_GROUP}
75 73
76post-extract: 74post-extract:
77.if !empty(HAL_DEVELOPER:Myes) 
78 ${LN} -sf ${FILESDIR}/hald-netbsd ${WRKSRC}/hald/netbsd 
79.else 
80 ${CP} -r ${FILESDIR}/hald-netbsd ${WRKSRC}/hald/netbsd 75 ${CP} -r ${FILESDIR}/hald-netbsd ${WRKSRC}/hald/netbsd
81.endif 
82 76
83pre-configure: 77pre-configure:
84 cd ${WRKSRC} && autoreconf -vi 78 cd ${WRKSRC} && autoreconf -vi
85 79
86.include "../../devel/GConf/schemas.mk" 80.include "../../devel/GConf/schemas.mk"
87.include "../../devel/glib2/buildlink3.mk" 81.include "../../devel/glib2/buildlink3.mk"
88.include "../../devel/libvolume_id/buildlink3.mk" 82.include "../../devel/libvolume_id/buildlink3.mk"
89.include "../../misc/pciids/buildlink3.mk" 83.include "../../misc/pciids/buildlink3.mk"
90.include "../../misc/usbids/buildlink3.mk" 84.include "../../misc/usbids/buildlink3.mk"
91.include "../../security/policykit/buildlink3.mk" 85.include "../../security/policykit/buildlink3.mk"
92.include "../../sysutils/dbus/buildlink3.mk" 86.include "../../sysutils/dbus/buildlink3.mk"
93.include "../../sysutils/dbus-glib/buildlink3.mk" 87.include "../../sysutils/dbus-glib/buildlink3.mk"
94.include "../../sysutils/hal-info/buildlink3.mk" 88.include "../../sysutils/hal-info/buildlink3.mk"