diff options
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/hal/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/hal/patches/patch-na | 24 |
2 files changed, 16 insertions, 12 deletions
diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo index d98954d7dab..1eaf7a40f6a 100644 --- a/sysutils/hal/distinfo +++ b/sysutils/hal/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2010/12/26 23:52:07 markd Exp $ +$NetBSD: distinfo,v 1.18 2010/12/27 22:26:17 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) = c1e9fb799570886b73cdf14c209cc09eddcca861 +SHA1 (patch-na) = 3d6471d5183981763f1b834ca6cd4c300b8efd80 SHA1 (patch-nb) = 1693b7a2faa5bee20a594f0b60b8ff6caea0efdc SHA1 (patch-nc) = 32453e49734902749ce24eb4364fc7f531986227 diff --git a/sysutils/hal/patches/patch-na b/sysutils/hal/patches/patch-na index 40990d229e9..e70dfad7130 100644 --- a/sysutils/hal/patches/patch-na +++ b/sysutils/hal/patches/patch-na @@ -1,8 +1,8 @@ -$NetBSD: patch-na,v 1.6 2010/12/26 20:59:31 markd Exp $ +$NetBSD: patch-na,v 1.7 2010/12/27 22:26:17 tron Exp $ ---- configure.in.orig 2009-08-24 12:42:29.000000000 +0000 -+++ configure.in -@@ -484,7 +484,7 @@ USE_LIBUSB=no +--- configure.in.orig 2009-08-24 13:42:29.000000000 +0100 ++++ configure.in 2010-12-27 22:18:55.000000000 +0000 +@@ -484,7 +484,7 @@ LIBUSB20_LIBS="" AC_ARG_WITH([backend], AS_HELP_STRING([--with-backend=<name>], @@ -11,7 +11,7 @@ $NetBSD: patch-na,v 1.6 2010/12/26 20:59:31 markd Exp $ [backend=$withval]) if ! test -z "$with_backend" ; then HALD_BACKEND="$with_backend" -@@ -493,6 +493,9 @@ else +@@ -493,6 +493,9 @@ *-*-solaris*) HALD_BACKEND="solaris" ;; @@ -21,7 +21,7 @@ $NetBSD: patch-na,v 1.6 2010/12/26 20:59:31 markd Exp $ *-*-freebsd* | *-*-kfreebsd*-gnu) HALD_BACKEND="freebsd" ;; -@@ -508,6 +511,7 @@ AM_CONDITIONAL(HALD_COMPILE_DUMMY, [test +@@ -508,6 +511,7 @@ AM_CONDITIONAL(HALD_COMPILE_LINUX, [test x$HALD_BACKEND = xlinux], [Compiling for Linux]) AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compiling for FreeBSD]) AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris]) @@ -29,7 +29,7 @@ $NetBSD: patch-na,v 1.6 2010/12/26 20:59:31 markd Exp $ AC_SUBST(HALD_BACKEND) if test "x$HALD_BACKEND" = "xfreebsd"; then AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_LIBUSB20=yes], [USE_LIBUSB20=no]) -@@ -707,7 +711,7 @@ fi +@@ -707,7 +711,7 @@ AC_MSG_RESULT($have_glib_2_14) case "$host" in @@ -38,7 +38,7 @@ $NetBSD: patch-na,v 1.6 2010/12/26 20:59:31 markd Exp $ PKG_CHECK_MODULES(VOLUME_ID, [$volume_id_module]) AC_SUBST(VOLUME_ID_CFLAGS) AC_SUBST(VOLUME_ID_LIBS) -@@ -720,6 +724,8 @@ esac +@@ -720,8 +724,12 @@ case "$host" in *-*-freebsd*) ;; @@ -46,8 +46,12 @@ $NetBSD: patch-na,v 1.6 2010/12/26 20:59:31 markd Exp $ + ;; *-*-solaris*) ;; ++*-*-darwin*) ++ ;; *) -@@ -1086,6 +1092,9 @@ hald/linux/addons/Makefile + PKG_CHECK_MODULES(BLKID, [$blkid_module]) + AC_SUBST(BLKID_CFLAGS) +@@ -1086,6 +1094,9 @@ hald/solaris/Makefile hald/solaris/probing/Makefile hald/solaris/addons/Makefile @@ -57,7 +61,7 @@ $NetBSD: patch-na,v 1.6 2010/12/26 20:59:31 markd Exp $ hald/freebsd/Makefile hald/freebsd/probing/Makefile hald/freebsd/libprobe/Makefile -@@ -1096,6 +1105,7 @@ libhal-storage/Makefile +@@ -1096,6 +1107,7 @@ tools/Makefile tools/freebsd/Makefile tools/linux/Makefile |