diff options
author | wiz <wiz@pkgsrc.org> | 2021-01-17 08:14:12 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2021-01-17 08:14:12 +0000 |
commit | 236c10de7ac02bff59320bc63a4974611646be61 (patch) | |
tree | fce5ffd737780d488a740a8551bfb329fb35d95c /sysutils/hal | |
parent | 8ef8a0a857ccac4ef0d116f44a348e7754f0cd48 (diff) | |
download | pkgsrc-236c10de7ac02bff59320bc63a4974611646be61.tar.gz |
hal: remove gtk-doc documentation to fix build with autoconf 2.70
Remove unconditional libblkid include, it is already included for Linux
and not needed on NetBSD.
Bump PKGREVISION.
Diffstat (limited to 'sysutils/hal')
-rw-r--r-- | sysutils/hal/Makefile | 6 | ||||
-rw-r--r-- | sysutils/hal/PLIST | 29 | ||||
-rw-r--r-- | sysutils/hal/distinfo | 12 | ||||
-rw-r--r-- | sysutils/hal/patches/patch-ae | 4 | ||||
-rw-r--r-- | sysutils/hal/patches/patch-af | 4 | ||||
-rw-r--r-- | sysutils/hal/patches/patch-doc_api_libhal-storage_Makefile.am | 15 | ||||
-rw-r--r-- | sysutils/hal/patches/patch-doc_api_libhal_Makefile.am | 15 | ||||
-rw-r--r-- | sysutils/hal/patches/patch-na | 35 | ||||
-rw-r--r-- | sysutils/hal/patches/patch-nc | 3 |
9 files changed, 69 insertions, 54 deletions
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index c286239d81d..b56db56d54f 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.95 2021/01/08 12:37:09 mef Exp $ +# $NetBSD: Makefile,v 1.96 2021/01/17 08:14:12 wiz Exp $ DISTNAME= hal-0.5.14 -PKGREVISION= 25 +PKGREVISION= 26 CATEGORIES= sysutils MASTER_SITES= http://hal.freedesktop.org/releases/ EXTRACT_SUFX= .tar.bz2 @@ -128,8 +128,6 @@ post-extract: pre-configure: cd ${WRKSRC} && autoreconf -vi ${AUTORECONF_ARGS} -.include "../../textproc/gtk-doc/buildlink3.mk" -.include "../../devel/libblkid/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../misc/usbids/buildlink3.mk" .include "../../security/policykit/buildlink3.mk" diff --git a/sysutils/hal/PLIST b/sysutils/hal/PLIST index da2aac99019..449fd6fa568 100644 --- a/sysutils/hal/PLIST +++ b/sysutils/hal/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2014/03/11 14:05:15 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.8 2021/01/17 08:14:12 wiz Exp $ bin/hal-device bin/hal-disable-polling bin/hal-find-by-capability @@ -62,33 +62,6 @@ share/PolicyKit/policy/org.freedesktop.hal.power-management.policy share/PolicyKit/policy/org.freedesktop.hal.storage.policy share/PolicyKit/policy/org.freedesktop.hal.wol.policy share/examples/hal/hal.conf -share/gtk-doc/html/libhal-storage/home.png -share/gtk-doc/html/libhal-storage/index.html -share/gtk-doc/html/libhal-storage/index.sgml -share/gtk-doc/html/libhal-storage/ix01.html -share/gtk-doc/html/libhal-storage/left.png -share/gtk-doc/html/libhal-storage/libhal-storage-libhal-storage.html -share/gtk-doc/html/libhal-storage/libhal-storage.devhelp -share/gtk-doc/html/libhal-storage/libhal-storage.devhelp2 -share/gtk-doc/html/libhal-storage/license.html -share/gtk-doc/html/libhal-storage/right.png -share/gtk-doc/html/libhal-storage/rn01.html -share/gtk-doc/html/libhal-storage/style.css -share/gtk-doc/html/libhal-storage/up.png -share/gtk-doc/html/libhal-storage/version.xml -share/gtk-doc/html/libhal/home.png -share/gtk-doc/html/libhal/index.html -share/gtk-doc/html/libhal/index.sgml -share/gtk-doc/html/libhal/ix01.html -share/gtk-doc/html/libhal/left.png -share/gtk-doc/html/libhal/libhal-libhal.html -share/gtk-doc/html/libhal/libhal.devhelp -share/gtk-doc/html/libhal/libhal.devhelp2 -share/gtk-doc/html/libhal/license.html -share/gtk-doc/html/libhal/right.png -share/gtk-doc/html/libhal/rn01.html -share/gtk-doc/html/libhal/style.css -share/gtk-doc/html/libhal/up.png share/hal/fdi/fdi.dtd share/hal/fdi/policy/10osvendor/10-dockstation.fdi share/hal/fdi/policy/10osvendor/10-input-policy.fdi diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo index 3bb6ebb6576..c6028996b68 100644 --- a/sysutils/hal/distinfo +++ b/sysutils/hal/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.29 2020/03/15 20:28:41 tnn Exp $ +$NetBSD: distinfo,v 1.30 2021/01/17 08:14:12 wiz Exp $ SHA1 (hal-0.5.14.tar.bz2) = a6ec098d78112e18e2773afa5f9ed642b00c4c59 RMD160 (hal-0.5.14.tar.bz2) = 0314dace9512bf49a62bd1556963fc60a6c9caf9 @@ -8,8 +8,8 @@ SHA1 (patch-aa) = 83d20e99943be5c4e9eaeff7a86d79a8912d9c99 SHA1 (patch-ab) = 03723893f9219967a0e3b48c1a03592688389234 SHA1 (patch-ac) = 5836bb68f4742bdccc9c61fbf8cc86020007a0a5 SHA1 (patch-ad) = d1ccd7c21008304998293031632f572f250033c1 -SHA1 (patch-ae) = ebc98ede0b6e9535825434f2dc6185193d837f36 -SHA1 (patch-af) = 161b59ee30d59dbc9e0c79f7f3162bcec5480d99 +SHA1 (patch-ae) = 8dc5637794f295a48f9efcc86679857828f4a102 +SHA1 (patch-af) = 29569f7f5508c580c57d0cd9c386aa9848105070 SHA1 (patch-ag) = 3fd8b7d10b1a43311541d2c6ad67a944e286c5ec SHA1 (patch-ah) = 6d801a2c30cee6199b25acf46d7e9866f6004182 SHA1 (patch-aj) = f20e4b1286d177e53a550b2ba1608d22e4b5c609 @@ -26,6 +26,8 @@ SHA1 (patch-at) = 040a018a7be5b28a0dc23dd66a0c10bbb0abc6bf SHA1 (patch-au) = c9e843f57b8a31f1bdc42478d450ea5606b4d7db SHA1 (patch-av) = 075ab5e265be4733d856a17184129d0b301bc0b8 SHA1 (patch-ax) = 278cbf10dd288f7a4aeedd7545b325c1a82715db +SHA1 (patch-doc_api_libhal-storage_Makefile.am) = 4d476f8d2609277b1dd3bdac1bc8fa8a9b9d28e4 +SHA1 (patch-doc_api_libhal_Makefile.am) = 5bfaea9e4cbd58ec8659e32c46a5cdd37474f9a8 SHA1 (patch-hald_freebsd_addons_addon-storage.c) = 0a9f63690224c11b38f2ad1c814e7b1433c5597d SHA1 (patch-hald_freebsd_hf-devd.c) = 37394dfd49e56659cfe5282f66781d4845f5ee97 SHA1 (patch-hald_freebsd_hf-usb2.c) = 9a1a612fe6f81078ea246fb49ec60157b8641e75 @@ -47,7 +49,7 @@ SHA1 (patch-hald_linux_addons_addon-storage.c) = 27c07d3a499aa9fa37938ff3f918dc0 SHA1 (patch-hald_linux_addons_addon-usb-csr.c) = 34b5be5ff308f9aafcf505b303d36cbc2483d015 SHA1 (patch-hald_linux_blockdev.c) = 5eeb8bff0461e9dd492764975d66764a3fafb14b SHA1 (patch-hald_netbsd_devinfo__mass.c) = be1c7bf311e21e9891199d67c0ebf87978bd735f -SHA1 (patch-na) = 2786db8149a55dbd5ea11419d789f420bac1993c +SHA1 (patch-na) = 7fc8e71fccef624fbd5a86b5e35f136fb1a36680 SHA1 (patch-nb) = 1693b7a2faa5bee20a594f0b60b8ff6caea0efdc -SHA1 (patch-nc) = 6ced27d1a8e4529f86afc4c18064687039d573eb +SHA1 (patch-nc) = f75c32cfd2940248f5642832a62505d66d78594b SHA1 (patch-nd) = 877dcbafaca0cebd3fdce74c5a622721823c153b diff --git a/sysutils/hal/patches/patch-ae b/sysutils/hal/patches/patch-ae index a4525b4eb87..6726f62d165 100644 --- a/sysutils/hal/patches/patch-ae +++ b/sysutils/hal/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.1.1.1 2008/11/22 15:20:51 jmcneill Exp $ +$NetBSD: patch-ae,v 1.2 2021/01/17 08:14:13 wiz Exp $ ---- tools/hal-luks-teardown.orig 2008-05-07 19:24:30.000000000 -0400 +--- tools/hal-luks-teardown.orig 2008-08-10 13:50:10.000000000 +0000 +++ tools/hal-luks-teardown @@ -47,9 +47,9 @@ fi # TODO: this is a little sketchy; we should check for hal-storage-crypto-teardown-others? diff --git a/sysutils/hal/patches/patch-af b/sysutils/hal/patches/patch-af index 3f7e7f162a7..1bd62639ada 100644 --- a/sysutils/hal/patches/patch-af +++ b/sysutils/hal/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.1.1.1 2008/11/22 15:20:51 jmcneill Exp $ +$NetBSD: patch-af,v 1.2 2021/01/17 08:14:13 wiz Exp $ ---- tools/hal-luks-setup.orig 2008-05-07 19:24:29.000000000 -0400 +--- tools/hal-luks-setup.orig 2008-08-10 13:50:10.000000000 +0000 +++ tools/hal-luks-setup @@ -44,9 +44,9 @@ if [ -n "$HAL_METHOD_INVOKED_BY_SYSTEMBU fi diff --git a/sysutils/hal/patches/patch-doc_api_libhal-storage_Makefile.am b/sysutils/hal/patches/patch-doc_api_libhal-storage_Makefile.am new file mode 100644 index 00000000000..1c6bd4caee8 --- /dev/null +++ b/sysutils/hal/patches/patch-doc_api_libhal-storage_Makefile.am @@ -0,0 +1,15 @@ +$NetBSD: patch-doc_api_libhal-storage_Makefile.am,v 1.1 2021/01/17 08:14:13 wiz Exp $ + +Remove gtk-doc support to unbreak build with autoconf 2.70. + +--- doc/api/libhal-storage/Makefile.am.orig 2008-08-10 13:50:10.000000000 +0000 ++++ doc/api/libhal-storage/Makefile.am +@@ -61,7 +61,5 @@ MAINTAINERCLEANFILES = \ + libhal-storage-*.txt \ + $(NULL) + +-include $(top_srcdir)/gtk-doc.make +- + # Version information for marking the documentation +-EXTRA_DIST += version.xml.in ++EXTRA_DIST = version.xml.in diff --git a/sysutils/hal/patches/patch-doc_api_libhal_Makefile.am b/sysutils/hal/patches/patch-doc_api_libhal_Makefile.am new file mode 100644 index 00000000000..f13f28a0129 --- /dev/null +++ b/sysutils/hal/patches/patch-doc_api_libhal_Makefile.am @@ -0,0 +1,15 @@ +$NetBSD: patch-doc_api_libhal_Makefile.am,v 1.1 2021/01/17 08:14:13 wiz Exp $ + +Remove gtk-doc support to unbreak build with autoconf 2.70. + +--- doc/api/libhal/Makefile.am.orig 2008-08-10 13:50:10.000000000 +0000 ++++ doc/api/libhal/Makefile.am +@@ -61,7 +61,5 @@ MAINTAINERCLEANFILES = \ + libhal-*.txt \ + $(NULL) + +-include $(top_srcdir)/gtk-doc.make +- + # Version information for marking the documentation +-EXTRA_DIST += version.xml.in ++EXTRA_DIST = version.xml.in diff --git a/sysutils/hal/patches/patch-na b/sysutils/hal/patches/patch-na index f1a585dca92..4fbf35a383d 100644 --- a/sysutils/hal/patches/patch-na +++ b/sysutils/hal/patches/patch-na @@ -1,12 +1,23 @@ -$NetBSD: patch-na,v 1.11 2011/10/04 10:31:37 dsainty Exp $ +$NetBSD: patch-na,v 1.12 2021/01/17 08:14:13 wiz Exp $ -Includes upstream patch to build on Linux systems without V4L1 support. +* Remove gtk-doc support to fix build with autoconf 2.70. + +* Includes upstream patch to build on Linux systems without V4L1 support. http://cgit.freedesktop.org/hal/commit/?id=8f624253f0135ca77a893ad4e8168f51ef90d4da ---- configure.in.orig 2009-08-25 00:42:29.000000000 +1200 -+++ configure.in 2011-10-04 22:56:25.700308098 +1300 -@@ -479,12 +479,16 @@ +--- configure.in.orig 2009-08-24 12:42:29.000000000 +0000 ++++ configure.in +@@ -197,7 +197,7 @@ fi + AC_SUBST(EJECT_PROGRAM) + AC_DEFINE_UNQUOTED(EJECT_PROGRAM, "$EJECT_PROGRAM", [Eject program to use]) + +-GTK_DOC_CHECK([1.3]) ++AM_CONDITIONAL([HAVE_GTK_DOC], false) + + # ACPI event source + AC_ARG_ENABLE([acpi-acpid], +@@ -479,12 +479,16 @@ if test "x$with_libpci" != xno ; then fi AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"]) @@ -24,7 +35,7 @@ http://cgit.freedesktop.org/hal/commit/?id=8f624253f0135ca77a893ad4e8168f51ef90d [backend=$withval]) if ! test -z "$with_backend" ; then HALD_BACKEND="$with_backend" -@@ -493,6 +497,9 @@ +@@ -493,6 +497,9 @@ else *-*-solaris*) HALD_BACKEND="solaris" ;; @@ -34,7 +45,7 @@ http://cgit.freedesktop.org/hal/commit/?id=8f624253f0135ca77a893ad4e8168f51ef90d *-*-freebsd* | *-*-kfreebsd*-gnu) HALD_BACKEND="freebsd" ;; -@@ -508,8 +515,10 @@ +@@ -508,8 +515,10 @@ AM_CONDITIONAL(HALD_COMPILE_DUMMY, [test 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]) @@ -45,7 +56,7 @@ http://cgit.freedesktop.org/hal/commit/?id=8f624253f0135ca77a893ad4e8168f51ef90d AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_LIBUSB20=yes], [USE_LIBUSB20=no]) fi if test "x$USE_LIBUSB20" = "xno"; then -@@ -526,6 +535,8 @@ +@@ -526,6 +535,8 @@ elif test "x$USE_LIBUSB" = "xyes"; then fi AC_SUBST(LIBUSB20_LIBS) @@ -54,7 +65,7 @@ http://cgit.freedesktop.org/hal/commit/?id=8f624253f0135ca77a893ad4e8168f51ef90d dnl DBUS API is subject to changes AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change]) -@@ -706,8 +717,8 @@ +@@ -706,8 +717,8 @@ else fi AC_MSG_RESULT($have_glib_2_14) @@ -65,7 +76,7 @@ http://cgit.freedesktop.org/hal/commit/?id=8f624253f0135ca77a893ad4e8168f51ef90d PKG_CHECK_MODULES(VOLUME_ID, [$volume_id_module]) AC_SUBST(VOLUME_ID_CFLAGS) AC_SUBST(VOLUME_ID_LIBS) -@@ -718,14 +729,13 @@ +@@ -718,14 +729,13 @@ esac # blkid (util-linux-ng) case "$host" in @@ -84,7 +95,7 @@ http://cgit.freedesktop.org/hal/commit/?id=8f624253f0135ca77a893ad4e8168f51ef90d esac # OS specific libs -@@ -1086,6 +1096,9 @@ +@@ -1086,6 +1096,9 @@ hald/linux/addons/Makefile hald/solaris/Makefile hald/solaris/probing/Makefile hald/solaris/addons/Makefile @@ -94,7 +105,7 @@ http://cgit.freedesktop.org/hal/commit/?id=8f624253f0135ca77a893ad4e8168f51ef90d hald/freebsd/Makefile hald/freebsd/probing/Makefile hald/freebsd/libprobe/Makefile -@@ -1096,6 +1109,7 @@ +@@ -1096,6 +1109,7 @@ libhal-storage/Makefile tools/Makefile tools/freebsd/Makefile tools/linux/Makefile diff --git a/sysutils/hal/patches/patch-nc b/sysutils/hal/patches/patch-nc index 47dbeaffb0c..66360a71f6c 100644 --- a/sysutils/hal/patches/patch-nc +++ b/sysutils/hal/patches/patch-nc @@ -1,7 +1,8 @@ -$NetBSD: patch-nc,v 1.2 2016/09/17 15:33:59 richard Exp $ +$NetBSD: patch-nc,v 1.3 2021/01/17 08:14:13 wiz Exp $ key event codes have migrated from linux/input.h to linux/input-event-codes .h so update to support generating gperf hash from either. + --- tools/Makefile.am.orig 2009-11-09 15:33:53.000000000 +0000 +++ tools/Makefile.am @@ -8,8 +8,11 @@ endif |