Wed Apr 29 19:50:02 2020 UTC ()
hal: avoid version checking that would've benefitted netbsd<5

(And hurt netbsd>=10)


(maya)
diff -r1.88 -r1.89 pkgsrc/sysutils/hal/Makefile
cvs diff -r1.88 -r1.89 pkgsrc/sysutils/hal/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/hal/Makefile 2020/03/08 16:48:11 1.88
+++ pkgsrc/sysutils/hal/Makefile 2020/04/29 19:50:02 1.89
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.88 2020/03/08 16:48:11 wiz Exp $ 1# $NetBSD: Makefile,v 1.89 2020/04/29 19:50:02 maya Exp $
2 2
3DISTNAME= hal-0.5.14 3DISTNAME= hal-0.5.14
4PKGREVISION= 23 4PKGREVISION= 23
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
@@ -39,27 +39,27 @@ CONFIGURE_ARGS+= --without-os-type @@ -39,27 +39,27 @@ CONFIGURE_ARGS+= --without-os-type
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 ${OPSYS} == "NetBSD"
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