From edd0a975057e0c73ab8d6c31c56d91d587da53bb Mon Sep 17 00:00:00 2001 From: marcus Date: Sun, 19 Jul 2009 01:59:33 +0000 Subject: * Update to 0.5.13. * Add support for ufsids in an attempt to prevent duplicate file system mounting git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12460 df743ca5-7f9a-e211-a948-0013205c9059 --- sysutils/hal/Makefile | 14 +- sysutils/hal/distinfo | 6 +- sysutils/hal/files/patch-configure | 156 +-------------------- .../patch-fdi_policy_10osvendor_10-x11-input.fdi | 13 +- .../hal/files/patch-hald_freebsd_hf-computer.c | 26 ++++ .../files/patch-hald_freebsd_probing_Makefile.am | 10 +- .../files/patch-hald_freebsd_probing_Makefile.in | 22 ++- .../patch-hald_freebsd_probing_probe-volume.c | 60 +++++++- 8 files changed, 133 insertions(+), 174 deletions(-) create mode 100644 sysutils/hal/files/patch-hald_freebsd_hf-computer.c diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index 8361ee026..56fd03c2e 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -3,12 +3,11 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/sysutils/hal/Makefile,v 1.57 2009/05/23 21:27:00 marcus Exp $ +# $MCom: ports/sysutils/hal/Makefile,v 1.58 2009/05/23 22:56:04 marcus Exp $ # PORTNAME= hal -DISTVERSION= 0.5.12 -PORTREVISION= 2 +DISTVERSION= 0.5.13 CATEGORIES= sysutils MASTER_SITES= http://hal.freedesktop.org/releases/ @@ -23,7 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomehack intlhack ltverhack -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_PYTHON= yes CONFIGURE_ARGS= --disable-gtk-doc \ @@ -86,11 +85,12 @@ PLIST_SUB+= USB2="@comment " .endif post-patch: - @${REINPLACE_CMD} -e '/^scriptdir = /s|libdir|libexecdir|' \ + @${REINPLACE_CMD} -e '/^scriptdir = /s|[(]libexecdir[)]/scripts|(libexecdir)/hal/scripts|' \ ${WRKSRC}/tools/Makefile.in \ ${WRKSRC}/tools/freebsd/Makefile.in - @${REINPLACE_CMD} -e 's|[(]libdir[)]/hal/scripts|(libexecdir)/hal/scripts|' \ - ${WRKSRC}/hald/Makefile.in + @${REINPLACE_CMD} -e 's|[(]libexecdir[)]/scripts|(libexecdir)/hal/scripts|' \ + ${WRKSRC}/hald/Makefile.in \ + ${WRKSRC}/tools/Makefile.in @${REINPLACE_CMD} -e 's|user="0"|group="operator"|g' \ ${WRKSRC}/hal.conf.in @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo index 585b1483a..5885af28a 100644 --- a/sysutils/hal/distinfo +++ b/sysutils/hal/distinfo @@ -1,3 +1,3 @@ -MD5 (hal-0.5.12.tar.gz) = bb7c36e142437f7363f9a80ae8391926 -SHA256 (hal-0.5.12.tar.gz) = c444e0485e4361eec0e6f06580c45b9fcf6f20a119634a5f0a5c13218cfdfd02 -SIZE (hal-0.5.12.tar.gz) = 1197445 +MD5 (hal-0.5.13.tar.gz) = 46ecc5d2e5bd964fb78099688f01bb6a +SHA256 (hal-0.5.13.tar.gz) = ebcf22a373761530920643add1a791af40954dc7349f027d1c35b0e0f7f9c8af +SIZE (hal-0.5.13.tar.gz) = 1199224 diff --git a/sysutils/hal/files/patch-configure b/sysutils/hal/files/patch-configure index fec2eb698..bc4df6d96 100644 --- a/sysutils/hal/files/patch-configure +++ b/sysutils/hal/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig 2009-05-17 00:54:41.000000000 -0400 -+++ configure 2009-05-17 00:56:13.000000000 -0400 +--- configure.orig 2009-07-18 21:14:47.000000000 -0400 ++++ configure 2009-07-18 21:14:47.000000000 -0400 @@ -818,6 +818,8 @@ XMLTO HALD_OS_LIBS BLKID_LIBS @@ -39,7 +39,7 @@ BLKID_CFLAGS C compiler flags for BLKID, overriding pkg-config BLKID_LIBS linker flags for BLKID, overriding pkg-config -@@ -2793,6 +2804,7 @@ fi +@@ -2794,6 +2805,7 @@ fi glib_module="glib-2.0 >= 2.10.0 gobject-2.0 > 2.10.0 dbus-glib-1 >= 0.61" dbus_module="dbus-1 >= 0.61" blkid_module="blkid >= 1.43" @@ -47,149 +47,7 @@ polkit_module="polkit >= 0.5" # libtool versioning - this applies to libhal and libhal-storage -@@ -6517,13 +6529,13 @@ if test "${lt_cv_nm_interface+set}" = se - else - lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext -- (eval echo "\"\$as_me:6520: $ac_compile\"" >&5) -+ (eval echo "\"\$as_me:6532: $ac_compile\"" >&5) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&5 -- (eval echo "\"\$as_me:6523: $NM \\\"conftest.$ac_objext\\\"\"" >&5) -+ (eval echo "\"\$as_me:6535: $NM \\\"conftest.$ac_objext\\\"\"" >&5) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&5 -- (eval echo "\"\$as_me:6526: output\"" >&5) -+ (eval echo "\"\$as_me:6538: output\"" >&5) - cat conftest.out >&5 - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" -@@ -7728,7 +7740,7 @@ ia64-*-hpux*) - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 7731 "configure"' > conftest.$ac_ext -+ echo '#line 7743 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -9885,11 +9897,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:9888: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:9900: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:9892: \$? = $ac_status" >&5 -+ echo "$as_me:9904: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -10224,11 +10236,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:10227: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:10239: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:10231: \$? = $ac_status" >&5 -+ echo "$as_me:10243: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -10329,11 +10341,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:10332: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:10344: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:10336: \$? = $ac_status" >&5 -+ echo "$as_me:10348: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -10384,11 +10396,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:10387: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:10399: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:10391: \$? = $ac_status" >&5 -+ echo "$as_me:10403: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -13200,7 +13212,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 13203 "configure" -+#line 13215 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -13296,7 +13308,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 13299 "configure" -+#line 13311 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -15316,11 +15328,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:15319: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15331: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:15323: \$? = $ac_status" >&5 -+ echo "$as_me:15335: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -15415,11 +15427,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:15418: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15430: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:15422: \$? = $ac_status" >&5 -+ echo "$as_me:15434: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -15467,11 +15479,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:15470: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15482: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:15474: \$? = $ac_status" >&5 -+ echo "$as_me:15486: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -19128,6 +19140,9 @@ else +@@ -19129,6 +19141,9 @@ else fi @@ -199,7 +57,7 @@ # Check whether --with-backend was given. if test "${with_backend+set}" = set; then -@@ -19185,6 +19200,184 @@ else +@@ -19186,6 +19201,184 @@ else fi @@ -384,7 +242,7 @@ cat >>confdefs.h <<_ACEOF -@@ -19942,8 +20135,132 @@ fi +@@ -19943,8 +20136,132 @@ fi { $as_echo "$as_me:$LINENO: result: $have_glib_2_14" >&5 $as_echo "$have_glib_2_14" >&6; } @@ -517,7 +375,7 @@ *-*-solaris*) ;; *) -@@ -21440,6 +21757,20 @@ $as_echo "$as_me: error: conditional \"H +@@ -21441,6 +21758,20 @@ $as_echo "$as_me: error: conditional \"H Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi diff --git a/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi b/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi index f3c0c6186..bb18f3310 100644 --- a/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi +++ b/sysutils/hal/files/patch-fdi_policy_10osvendor_10-x11-input.fdi @@ -1,6 +1,6 @@ ---- fdi/policy/10osvendor/10-x11-input.fdi.orig 2009-03-23 03:18:33.000000000 -0400 -+++ fdi/policy/10osvendor/10-x11-input.fdi 2009-05-17 00:41:26.000000000 -0400 -@@ -7,19 +7,10 @@ +--- fdi/policy/10osvendor/10-x11-input.fdi.orig 2009-06-26 03:28:39.000000000 -0400 ++++ fdi/policy/10osvendor/10-x11-input.fdi 2009-07-18 21:19:15.000000000 -0400 +@@ -7,15 +7,6 @@ evdev @@ -13,6 +13,13 @@ - - - + + +@@ -23,10 +14,10 @@ + + + - +