Import of pkgsrc-2015Q1

2016-01-21 23:40:00 +01:00
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870539 additions and 795424 deletions
@@ -1,31 +1,10 @@
-$NetBSD: patch-aa,v 1.3 2008/12/23 21:46:14 jmcneill Exp $
+$NetBSD: patch-aa,v 1.5 2014/08/17 15:59:07 wiz Exp $

--- configure.ac.orig	2008-07-30 20:35:53.000000000 -0400
-+++ configure.ac	2008-12-23 16:40:06.000000000 -0500
-@@ -68,10 +68,21 @@
- PKG_CHECK_MODULES(LIBDBUS,
-   dbus-1 >= $DBUS_REQUIRED_VERSION
- )
-+PKG_CHECK_MODULES(X11, x11 >= $X11_REQUIRED_VERSION, [HAVE_X11=yes], [HAVE_X11=no])
-+if test x$HAVE_X11 = xno; then
-+  AC_PATH_XTRA
-+  if test "x$no_x" = xyes; then
-+    AC_MSG_ERROR(X11 and Xrandr development libraries not found);
-+  else
-+    XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
-+    XLIB_CFLAGS=$X_CFLAGS
-+  fi
-+fi
- PKG_CHECK_MODULES(TOOLS,
-  x11 >= $X11_REQUIRED_VERSION
-   glib-2.0 >= $GLIB_REQUIRED_VERSION
- )
-+TOOLS_CFLAGS="$TOOLS_CFLAGS $X11_CFLAGS $XLIB_CFLAGS"
-+TOOLS_LIBS="$TOOLS_LIBS $X11_LIBS $XLIB_LIBS"
- 
- PKG_CHECK_MODULES(HISTORY,
-   glib-2.0 >= $GLIB_REQUIRED_VERSION
-@@ -190,12 +201,20 @@
+Add backends for NetBSD, Dragonfly, and OpenBSD.
+
+--- configure.ac.orig	2011-02-17 00:37:16.000000000 +0000
+++ configure.ac
+@@ -190,6 +201,21 @@ case "$host" in
         *-*-solaris*)
         CK_BACKEND="solaris"
         ;;
@@ -36,20 +15,24 @@ $NetBSD: patch-aa,v 1.3 2008/12/23 21:46:14 jmcneill Exp $
 +        CK_BACKEND="freebsd"
 +        KVM_LIBS="-lkvm"
 +        ;;
- esac
- 
- AC_SUBST(KVM_LIBS)
+	*-*-openbsd*)
+	CK_BACKEND="openbsd"
+	AC_CHECK_LIB(kvm, kvm_openfiles, have_kvm=yes,
+		AC_MSG_ERROR([Unable to find libkvm which is needed on OpenBSD]))
+	if test "x$have_kvm" = "xyes"; then
+		KVM_LIBS="-lkvm"
+	fi
+	;;
+ 	*)
+ 	AC_MSG_ERROR([No sysdeps back-end implemented for host $host])
+ 	;;
+@@ -199,7 +225,9 @@ AC_SUBST(KVM_LIBS)
 
 AM_CONDITIONAL(CK_COMPILE_LINUX, test x$CK_BACKEND = xlinux, [Compiling for Linux])
 AM_CONDITIONAL(CK_COMPILE_FREEBSD, test x$CK_BACKEND = xfreebsd, [Compiling for FreeBSD])
 +AM_CONDITIONAL(CK_COMPILE_NETBSD, test x$CK_BACKEND = xnetbsd, [Compiling for NetBSD])
 AM_CONDITIONAL(CK_COMPILE_SOLARIS, test x$CK_BACKEND = xsolaris, [Compiling for Solaris])
+AM_CONDITIONAL(CK_COMPILE_OPENBSD, test x$CK_BACKEND = xopenbsd, [Compiling for OpenBSD])
 AC_SUBST(CK_BACKEND)
 
-@@ -441,4 +460,4 @@
-    echo "         a huge SECURITY HOLE. I repeat: YOU NEED TO EDIT THE FILE"
-    echo "         ConsoleKit.conf to match your distro/site to avoid NASTY SECURITY HOLES."
-    echo ""
-fi
-\ No newline at end of file
-+fi
+ dnl ---------------------------------------------------------------------------