diff options
| -rw-r--r-- | sysutils/hal/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/hal/patches/patch-na | 34 |
2 files changed, 22 insertions, 16 deletions
diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo index 1eaf7a40f6a..be887d915ef 100644 --- a/sysutils/hal/distinfo +++ b/sysutils/hal/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2010/12/27 22:26:17 tron Exp $ +$NetBSD: distinfo,v 1.19 2010/12/29 00:12:15 tron Exp $ SHA1 (hal-0.5.14.tar.bz2) = a6ec098d78112e18e2773afa5f9ed642b00c4c59 RMD160 (hal-0.5.14.tar.bz2) = 0314dace9512bf49a62bd1556963fc60a6c9caf9 @@ -20,6 +20,6 @@ SHA1 (patch-ao) = e450f8d5fd4705cf9f4eb3e827a61179b4148646 SHA1 (patch-ap) = 9051ced9c00911b993198c98c6d02f5846c16728 SHA1 (patch-aq) = 7d0b224b4b1e6052983a6512217eee4f530e0720 SHA1 (patch-ax) = 278cbf10dd288f7a4aeedd7545b325c1a82715db -SHA1 (patch-na) = 3d6471d5183981763f1b834ca6cd4c300b8efd80 +SHA1 (patch-na) = 127bd8aa2c837a525685e4ab8ef0429059130b2b SHA1 (patch-nb) = 1693b7a2faa5bee20a594f0b60b8ff6caea0efdc SHA1 (patch-nc) = 32453e49734902749ce24eb4364fc7f531986227 diff --git a/sysutils/hal/patches/patch-na b/sysutils/hal/patches/patch-na index e70dfad7130..a487bd9dc04 100644 --- a/sysutils/hal/patches/patch-na +++ b/sysutils/hal/patches/patch-na @@ -1,7 +1,7 @@ -$NetBSD: patch-na,v 1.7 2010/12/27 22:26:17 tron Exp $ +$NetBSD: patch-na,v 1.8 2010/12/29 00:12:15 tron Exp $ --- configure.in.orig 2009-08-24 13:42:29.000000000 +0100 -+++ configure.in 2010-12-27 22:18:55.000000000 +0000 ++++ configure.in 2010-12-29 00:07:13.000000000 +0000 @@ -484,7 +484,7 @@ LIBUSB20_LIBS="" AC_ARG_WITH([backend], @@ -38,20 +38,26 @@ $NetBSD: patch-na,v 1.7 2010/12/27 22:26:17 tron Exp $ PKG_CHECK_MODULES(VOLUME_ID, [$volume_id_module]) AC_SUBST(VOLUME_ID_CFLAGS) AC_SUBST(VOLUME_ID_LIBS) -@@ -720,8 +724,12 @@ +@@ -718,14 +722,13 @@ + + # blkid (util-linux-ng) case "$host" in - *-*-freebsd*) - ;; -+*-*-netbsd*) -+ ;; - *-*-solaris*) - ;; -+*-*-darwin*) -+ ;; - *) +-*-*-freebsd*) +- ;; +-*-*-solaris*) +- ;; +-*) ++*linux*) PKG_CHECK_MODULES(BLKID, [$blkid_module]) AC_SUBST(BLKID_CFLAGS) -@@ -1086,6 +1094,9 @@ + AC_SUBST(BLKID_LIBS) ++ ;; ++*) ++ ;; + esac + + # OS specific libs +@@ -1086,6 +1089,9 @@ hald/solaris/Makefile hald/solaris/probing/Makefile hald/solaris/addons/Makefile @@ -61,7 +67,7 @@ $NetBSD: patch-na,v 1.7 2010/12/27 22:26:17 tron Exp $ hald/freebsd/Makefile hald/freebsd/probing/Makefile hald/freebsd/libprobe/Makefile -@@ -1096,6 +1107,7 @@ +@@ -1096,6 +1102,7 @@ tools/Makefile tools/freebsd/Makefile tools/linux/Makefile |