[BACK]Return to patch-na CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / sysutils / hal / patches

File: [cvs.NetBSD.org] / pkgsrc / sysutils / hal / patches / Attic / patch-na (download)

Revision 1.9, Sat Jan 8 13:00:13 2011 UTC (13 years, 2 months ago) by obache
Branch: MAIN
CVS Tags: pkgsrc-2010Q4-base, pkgsrc-2010Q4
Changes since 1.8: +26 -11 lines

Bring back DragonFly BSD support.
Based on PR#44338 from Rumko, also fixes PLIST.FreeBSD and self-tests by me.

$NetBSD: patch-na,v 1.9 2011/01/08 13:00:13 obache Exp $

--- configure.in.orig	2009-08-24 12:42:29.000000000 +0000
+++ configure.in
@@ -482,9 +482,10 @@ AM_CONDITIONAL([HAVE_LIBPCI], [test "x$U
 USE_LIBUSB20=no
 USE_LIBUSB=no
 LIBUSB20_LIBS=""
+LIBUFS_LIBS=""
 AC_ARG_WITH([backend],
 	    AS_HELP_STRING([--with-backend=<name>],
-	                   [backend to use (linux/solaris/freebsd/dummy)]),
+	                   [backend to use (linux/solaris/netbsd/freebsd/dummy)]),
 	    [backend=$withval])
 if ! test -z "$with_backend" ; then
     HALD_BACKEND="$with_backend"
@@ -493,6 +494,9 @@ else
         *-*-solaris*)
 		   HALD_BACKEND="solaris"
 		   ;;
+        *-*-netbsd*)
+		   HALD_BACKEND="netbsd"
+		   ;;
         *-*-freebsd* | *-*-kfreebsd*-gnu)
                    HALD_BACKEND="freebsd"
                    ;;
@@ -508,8 +512,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])
+AM_CONDITIONAL(HALD_COMPILE_NETBSD, [test x$HALD_BACKEND = xnetbsd], [Compiling for NetBSD])
 AC_SUBST(HALD_BACKEND)
 if test "x$HALD_BACKEND" = "xfreebsd"; then
+    AC_SEARCH_LIBS([ufs_disk_fillout], [ufs], [LIBUFS_LIBS="-lufs"], [])
     AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_LIBUSB20=yes], [USE_LIBUSB20=no])
 fi
 if test "x$USE_LIBUSB20" = "xno"; then
@@ -526,6 +532,8 @@ elif test "x$USE_LIBUSB" = "xyes"; then
 fi
 AC_SUBST(LIBUSB20_LIBS)
 
+AC_SUBST(LIBUFS_LIBS)
+
 dnl DBUS API is subject to changes
 AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change])
 
@@ -707,7 +715,7 @@ fi
 AC_MSG_RESULT($have_glib_2_14)
 
 case "$host" in
-    *-*-freebsd*)
+    *-*-freebsd* | *-*-netbsd* | *-*-dragonfly*)
         PKG_CHECK_MODULES(VOLUME_ID, [$volume_id_module])
 	AC_SUBST(VOLUME_ID_CFLAGS)
 	AC_SUBST(VOLUME_ID_LIBS)
@@ -718,14 +726,13 @@ esac
 
 # blkid (util-linux-ng)
 case "$host" in
-*-*-freebsd*)
-        ;;
-*-*-solaris*)
-	;;
-*)
+*linux*)
 	PKG_CHECK_MODULES(BLKID, [$blkid_module])
 	AC_SUBST(BLKID_CFLAGS)
 	AC_SUBST(BLKID_LIBS)
+	;;
+*)
+	;;
 esac
 
 # OS specific libs
@@ -1086,6 +1093,9 @@ hald/linux/addons/Makefile
 hald/solaris/Makefile
 hald/solaris/probing/Makefile
 hald/solaris/addons/Makefile
+hald/netbsd/Makefile
+hald/netbsd/probing/Makefile
+hald/netbsd/addons/Makefile
 hald/freebsd/Makefile
 hald/freebsd/probing/Makefile
 hald/freebsd/libprobe/Makefile
@@ -1096,6 +1106,7 @@ libhal-storage/Makefile
 tools/Makefile
 tools/freebsd/Makefile
 tools/linux/Makefile
+tools/netbsd/Makefile
 partutil/Makefile
 policy/Makefile
 fdi/Makefile