Thu Mar 10 19:45:03 2011 UTC ()
Readd --without-os-type configure arg, accidentally dropped when merging
the 0.5.14 changes.  PR#44703


(markd)
diff -r1.52 -r1.53 pkgsrc/sysutils/hal/Makefile
cvs diff -r1.52 -r1.53 pkgsrc/sysutils/hal/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/hal/Makefile 2011/02/17 12:11:57 1.52
+++ pkgsrc/sysutils/hal/Makefile 2011/03/10 19:45:03 1.53
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.52 2011/02/17 12:11:57 jmcneill Exp $ 1# $NetBSD: Makefile,v 1.53 2011/03/10 19:45:03 markd Exp $
2 2
3DISTNAME= hal-0.5.14 3DISTNAME= hal-0.5.14
4PKGREVISION= 2 4PKGREVISION= 2
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= netbsd-desktop@NetBSD.org 9MAINTAINER= netbsd-desktop@NetBSD.org
10HOMEPAGE= http://hal.freedesktop.org/ 10HOMEPAGE= http://hal.freedesktop.org/
11COMMENT= FreeDesktop hardware abstraction layer 11COMMENT= FreeDesktop hardware abstraction layer
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14BUILD_DEFS+= VARBASE PKG_SYSCONFBASE 14BUILD_DEFS+= VARBASE PKG_SYSCONFBASE
@@ -22,26 +22,27 @@ USE_LIBTOOL= YES @@ -22,26 +22,27 @@ USE_LIBTOOL= YES
22 22
23MAKE_DIRS+= /media 23MAKE_DIRS+= /media
24MAKE_DIRS+= ${VARBASE}/cache/hald 24MAKE_DIRS+= ${VARBASE}/cache/hald
25SPECIAL_PERMS+= ${VARBASE}/cache/hald ${HAL_USER} ${HAL_GROUP} 0644 25SPECIAL_PERMS+= ${VARBASE}/cache/hald ${HAL_USER} ${HAL_GROUP} 0644
26 26
27EGDIR= ${PREFIX}/share/examples/hal 27EGDIR= ${PREFIX}/share/examples/hal
28 28
29CONF_FILES= ${EGDIR}/hal.conf ${PKG_SYSCONFBASE}/dbus-1/system.d/hal.conf 29CONF_FILES= ${EGDIR}/hal.conf ${PKG_SYSCONFBASE}/dbus-1/system.d/hal.conf
30 30
31CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} 31CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
32CONFIGURE_ARGS+= --localstatedir=${VARBASE} 32CONFIGURE_ARGS+= --localstatedir=${VARBASE}
33CONFIGURE_ARGS+= --with-pci-ids=${PREFIX}/share/pciids 33CONFIGURE_ARGS+= --with-pci-ids=${PREFIX}/share/pciids
34CONFIGURE_ARGS+= --with-usb-ids=${PREFIX}/share/usbids 34CONFIGURE_ARGS+= --with-usb-ids=${PREFIX}/share/usbids
 35CONFIGURE_ARGS+= --without-os-type
35 36
36.include "../../mk/bsd.prefs.mk" 37.include "../../mk/bsd.prefs.mk"
37 38
38.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" 39.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
39.include "../../devel/libvolume_id/buildlink3.mk" 40.include "../../devel/libvolume_id/buildlink3.mk"
40CONFIGURE_ARGS+= --with-eject=/usr/sbin/cdcontrol 41CONFIGURE_ARGS+= --with-eject=/usr/sbin/cdcontrol
41CONFIGURE_ARGS+= --with-backend=freebsd 42CONFIGURE_ARGS+= --with-backend=freebsd
42PLIST_SRC= PLIST.FreeBSD PLIST 43PLIST_SRC= PLIST.FreeBSD PLIST
43 44
44.elif !empty(MACHINE_PLATFORM:MNetBSD-[5-9]*) 45.elif !empty(MACHINE_PLATFORM:MNetBSD-[5-9]*)
45.include "../../devel/libvolume_id/buildlink3.mk" 46.include "../../devel/libvolume_id/buildlink3.mk"
46CONFIGURE_ARGS+= --with-backend=netbsd 47CONFIGURE_ARGS+= --with-backend=netbsd
47HAL_GROUP= operator 48HAL_GROUP= operator