diff options
| author | jmcneill <jmcneill> | 2008-12-23 21:46:14 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill> | 2008-12-23 21:46:14 +0000 |
| commit | 442e0a4a595583e5cd252fba1a8196981e98caa8 (patch) | |
| tree | 14858b87bd43b21de600802907fda283f37362d3 /sysutils | |
| parent | 26948dfcd9dc7f323e24e9062872b4211ddd4106 (diff) | |
| download | pkgsrc-442e0a4a595583e5cd252fba1a8196981e98caa8.tar.gz | |
Fix build on NetBSD 4.0 with XFree86.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/consolekit/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/consolekit/patches/patch-aa | 33 |
2 files changed, 30 insertions, 7 deletions
diff --git a/sysutils/consolekit/distinfo b/sysutils/consolekit/distinfo index 7ece488a58b..7c52c196217 100644 --- a/sysutils/consolekit/distinfo +++ b/sysutils/consolekit/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.4 2008/11/25 13:40:05 hasso Exp $ +$NetBSD: distinfo,v 1.5 2008/12/23 21:46:14 jmcneill Exp $ SHA1 (ConsoleKit-0.3.0.tar.bz2) = e3b6156622cc14ebca7382a55b8ed15f2f2bad98 RMD160 (ConsoleKit-0.3.0.tar.bz2) = 7a1ebd2f4bfb65690e70138c9923c3fd2fcaf671 Size (ConsoleKit-0.3.0.tar.bz2) = 393694 bytes -SHA1 (patch-aa) = 881a105efecdb123a8df306c5bf3adeb60be6613 +SHA1 (patch-aa) = a1589faf05d5358a0820da6d7da20f09ce4cec1b SHA1 (patch-ab) = 2e9fe9de1f27c635a4eefa77af8322cb8a02ab35 SHA1 (patch-ac) = 0595a9cd1c4013eb4761e044b4b4b01b613f7d2b SHA1 (patch-ad) = a1c1a1d0452945550065da3eac2390318c1eb7be diff --git a/sysutils/consolekit/patches/patch-aa b/sysutils/consolekit/patches/patch-aa index 9a22664b5f2..2e8cbc0433b 100644 --- a/sysutils/consolekit/patches/patch-aa +++ b/sysutils/consolekit/patches/patch-aa @@ -1,8 +1,31 @@ -$NetBSD: patch-aa,v 1.2 2008/11/25 13:40:05 hasso Exp $ +$NetBSD: patch-aa,v 1.3 2008/12/23 21:46:14 jmcneill Exp $ ---- configure.ac.orig 2008-07-31 03:35:53 +0300 -+++ configure.ac 2008-11-25 14:57:21 +0200 -@@ -190,12 +190,20 @@ case "$host" in +--- 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 @@ *-*-solaris*) CK_BACKEND="solaris" ;; @@ -23,7 +46,7 @@ $NetBSD: patch-aa,v 1.2 2008/11/25 13:40:05 hasso Exp $ AM_CONDITIONAL(CK_COMPILE_SOLARIS, test x$CK_BACKEND = xsolaris, [Compiling for Solaris]) AC_SUBST(CK_BACKEND) -@@ -441,4 +449,4 @@ if test x${have_polkit} = xno -a x${msg_ +@@ -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 "" |