diff options
| author | jmcneill <jmcneill@pkgsrc.org> | 2008-12-25 00:14:42 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill@pkgsrc.org> | 2008-12-25 00:14:42 +0000 |
| commit | 2c4195270a2a0467c9807421b4a2c3d404aec1a6 (patch) | |
| tree | 4a16368e306ca8a1e624c57fae120bf7a193eb51 /x11/libXevie | |
| parent | 98faf4c6ab7cb8e528e15b9bd3197e1e9b9c29dc (diff) | |
| download | pkgsrc-2c4195270a2a0467c9807421b4a2c3d404aec1a6.tar.gz | |
Fix build with XFree86.
Diffstat (limited to 'x11/libXevie')
| -rw-r--r-- | x11/libXevie/Makefile | 7 | ||||
| -rw-r--r-- | x11/libXevie/distinfo | 3 | ||||
| -rw-r--r-- | x11/libXevie/patches/patch-aa | 30 |
3 files changed, 37 insertions, 3 deletions
diff --git a/x11/libXevie/Makefile b/x11/libXevie/Makefile index 2237cdf0b16..311e720e993 100644 --- a/x11/libXevie/Makefile +++ b/x11/libXevie/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:15 tnn Exp $ +# $NetBSD: Makefile,v 1.4 2008/12/25 00:14:42 jmcneill Exp $ # DISTNAME= libXevie-1.0.2 @@ -15,7 +15,7 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_LIBTOOL= yes GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config +USE_TOOLS+= pkg-config autoconf PKGCONFIG_OVERRIDE+= xevie.pc.in @@ -25,6 +25,9 @@ PKGCONFIG_OVERRIDE+= xevie.pc.in CONFIGURE_ARGS+= --disable-malloc0returnsnull .endif +pre-configure: + cd ${WRKSRC} && autoconf -f + .include "../../x11/evieext/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/x11/libXevie/distinfo b/x11/libXevie/distinfo index d758933cd60..e069bab129c 100644 --- a/x11/libXevie/distinfo +++ b/x11/libXevie/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2006/11/03 21:50:18 joerg Exp $ +$NetBSD: distinfo,v 1.2 2008/12/25 00:14:42 jmcneill Exp $ SHA1 (libXevie-1.0.2.tar.bz2) = d22fd24d8f096fdff54d303d63fea1422f0cfeea RMD160 (libXevie-1.0.2.tar.bz2) = 9edd76129097691259e07c972a90378ecabe2c00 Size (libXevie-1.0.2.tar.bz2) = 227721 bytes +SHA1 (patch-aa) = 140edf9033452e4153bcb777be97030a371174a7 diff --git a/x11/libXevie/patches/patch-aa b/x11/libXevie/patches/patch-aa new file mode 100644 index 00000000000..24633559834 --- /dev/null +++ b/x11/libXevie/patches/patch-aa @@ -0,0 +1,30 @@ +$NetBSD: patch-aa,v 1.1 2008/12/25 00:14:42 jmcneill Exp $ + +--- configure.ac.orig 2008-12-24 19:09:47.000000000 -0500 ++++ configure.ac 2008-12-24 19:12:24.000000000 -0500 +@@ -15,10 +15,24 @@ + AC_PROG_LIBTOOL + + # Checks for pkg-config packages +-PKG_CHECK_MODULES(XEVIE, xproto x11 xextproto xext evieproto) ++PKG_CHECK_MODULES(XEVIE, xextproto evieproto) + AC_SUBST(XEVIE_CFLAGS) + AC_SUBST(XEVIE_LIBS) + ++PKG_CHECK_MODULES(X11, xproto x11 xextproto xext, [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 development libraries not found); ++ else ++ XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS" ++ XLIB_CFLAGS="$X_CFLAGS -D_REENTRANT" ++ fi ++fi ++XEVIE_CFLAGS="$XEVIE_CFLAGS $X11_CFLAGS $XLIB_CFLAGS" ++XEVIE_LIBS="$XEVIE_LIBS $X11_LIBS $XLIB_LIBS" ++ ++ + XORG_CHECK_MALLOC_ZERO + XORG_MANPAGE_SECTIONS + XORG_RELEASE_VERSION |