diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2004-04-27 21:59:24 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2004-04-27 21:59:24 +0000 |
| commit | e98e7d0d45ec221f958b010ffb13554226635c9f (patch) | |
| tree | 30ba59d94992832eb4bf6863b5e953de9c1e02f5 /x11/wxGTK | |
| parent | 3cf021a86c4ac5b6b2f01fffb9ec8a53728bb10e (diff) | |
| download | pkgsrc-e98e7d0d45ec221f958b010ffb13554226635c9f.tar.gz | |
make this compile with xpkgwedge
Diffstat (limited to 'x11/wxGTK')
| -rw-r--r-- | x11/wxGTK/Makefile | 3 | ||||
| -rw-r--r-- | x11/wxGTK/distinfo | 4 | ||||
| -rw-r--r-- | x11/wxGTK/patches/patch-aa | 23 |
3 files changed, 22 insertions, 8 deletions
diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile index e85ac941d45..d47dd2fae77 100644 --- a/x11/wxGTK/Makefile +++ b/x11/wxGTK/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2004/03/03 22:25:58 minskim Exp $ +# $NetBSD: Makefile,v 1.31 2004/04/27 21:59:24 dmcmahill Exp $ # DISTNAME= wxGTK-2.4.2 @@ -21,6 +21,7 @@ CONFIGURE_ARGS+= --with-libjpeg=sys CONFIGURE_ARGS+= --with-zlib=sys CONFIGURE_ARGS+= --with-libpng=sys CONFIGURE_ARGS+= --with-libtiff=sys +CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR} CPPFLAGS+= -Dunix=1 # src/common/unzip.c needs this diff --git a/x11/wxGTK/distinfo b/x11/wxGTK/distinfo index 77a25a4cb9c..1b0cf4d6c53 100644 --- a/x11/wxGTK/distinfo +++ b/x11/wxGTK/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.12 2004/01/10 14:23:52 recht Exp $ +$NetBSD: distinfo,v 1.13 2004/04/27 21:59:24 dmcmahill Exp $ SHA1 (wxGTK-2.4.2.tar.bz2) = 3f1ebacaaf8eb5510c14ee10bafbc5f225be842c Size (wxGTK-2.4.2.tar.bz2) = 5381935 bytes -SHA1 (patch-aa) = 57e598262c8bf14c7d854fc1e569c9d6aaeca88b +SHA1 (patch-aa) = 82b31569686773cbdc2200417bed6a376fb12b29 SHA1 (patch-ab) = 5327ac3b45e7bc1957a8482bd4d10652fe28c1a1 SHA1 (patch-ac) = 01aa0bea28f838680cce6326fa67700b12f75d86 SHA1 (patch-ad) = 809a12f89b018373910b31442dfd315276cafbdf diff --git a/x11/wxGTK/patches/patch-aa b/x11/wxGTK/patches/patch-aa index 36f5b608875..1d13477179e 100644 --- a/x11/wxGTK/patches/patch-aa +++ b/x11/wxGTK/patches/patch-aa @@ -1,8 +1,21 @@ -$NetBSD: patch-aa,v 1.4 2004/01/10 14:23:52 recht Exp $ +$NetBSD: patch-aa,v 1.5 2004/04/27 21:59:24 dmcmahill Exp $ ---- configure.orig 2003-09-21 13:31:30.000000000 +0200 -+++ configure 2003-09-27 23:10:17.000000000 +0200 -@@ -16104,8 +16104,8 @@ +--- configure.orig Sun Sep 21 11:31:30 2003 ++++ configure +@@ -11498,9 +11498,10 @@ SEARCH_INCLUDE="\ + /usr/local/x11r5/include \ + /usr/lpp/Xamples/include \ + \ +- /usr/openwin/share/include" ++ /usr/openwin/share/include\ ++ ${BUILDLINK_DIR}/include" + +-SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` " ++SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g`" + + + cat > confcache <<\EOF +@@ -16104,8 +16105,8 @@ esac WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a" WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a" @@ -13,7 +26,7 @@ $NetBSD: patch-aa,v 1.4 2004/01/10 14:23:52 recht Exp $ if test "$wxUSE_OPENGL" = "yes"; then WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} ${OPENGL_LIBS}" -@@ -22777,6 +22777,7 @@ +@@ -22777,6 +22778,7 @@ s%@WX_RELEASE_NUMBER@%$WX_RELEASE_NUMBER s%@WX_LIBRARY_NAME_STATIC@%$WX_LIBRARY_NAME_STATIC%g s%@WX_LIBRARY_NAME_SHARED@%$WX_LIBRARY_NAME_SHARED%g s%@WX_LIBRARY_BASENAME@%$WX_LIBRARY_BASENAME%g |