pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/hal Rework platform logic to fall back proper...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/502fe4bcd208
branches:  trunk
changeset: 551957:502fe4bcd208
user:      ahoka <ahoka%pkgsrc.org@localhost>
date:      Sun Dec 21 14:17:20 2008 +0000

description:
Rework platform logic to fall back properly to dummy backend.

diffstat:

 sysutils/hal/Makefile |  18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diffs (43 lines):

diff -r 99e5562ed99c -r 502fe4bcd208 sysutils/hal/Makefile
--- a/sysutils/hal/Makefile     Sun Dec 21 14:11:37 2008 +0000
+++ b/sysutils/hal/Makefile     Sun Dec 21 14:17:20 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2008/12/21 13:58:28 jmcneill Exp $
+# $NetBSD: Makefile,v 1.27 2008/12/21 14:17:20 ahoka Exp $
 #
 
 DISTNAME=              hal-0.5.11
@@ -39,25 +39,25 @@
 CONFIGURE_ARGS+=       --with-eject=/usr/sbin/cdcontrol
 CONFIGURE_ARGS+=       --with-backend=freebsd
 PLIST_SRC=             PLIST.FreeBSD PLIST
-.endif
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-[5-9]*)
+.elif !empty(MACHINE_PLATFORM:MNetBSD-[5-9]*)
 .include "../../devel/libvolume_id/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-backend=netbsd
 HAL_GROUP=             operator
-.elif ${OPSYS} == "NetBSD"
-# Pull in the dummy backend for older NetBSD
-CONFIGURE_ARGS+=       --with-backend=dummy
-PLIST_SRC=             PLIST
-.endif
 
-.if ${OPSYS} == "Linux"
+.elif ${OPSYS} == "Linux"
 .include "../../devel/libusb/buildlink3.mk"
 .include "../../devel/libvolume_id/buildlink3.mk"
 .include "../../sysutils/pciutils/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-backend=linux
 CONF_FILES+=           ${EGDIR}/90-hal.rules \
                        ${PKG_SYSCONFBASE}/udev/rules.d/90-hal.rules
+
+.else  # Unsupported systems
+# Pull in the dummy backend
+.include "../../devel/libvolume_id/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-backend=dummy
+PLIST_SRC=             PLIST
 .endif
 
 .if ${OPSYS} == "Darwin"



Home | Main Index | Thread Index | Old Index