diff options
Diffstat (limited to 'x11/wxGTK28')
| -rw-r--r-- | x11/wxGTK28/Makefile | 4 | ||||
| -rw-r--r-- | x11/wxGTK28/buildlink3.mk | 4 | ||||
| -rw-r--r-- | x11/wxGTK28/distinfo | 4 | ||||
| -rw-r--r-- | x11/wxGTK28/patches/patch-aa | 57 |
4 files changed, 61 insertions, 8 deletions
diff --git a/x11/wxGTK28/Makefile b/x11/wxGTK28/Makefile index b5be9cef99c..94deddf7ac8 100644 --- a/x11/wxGTK28/Makefile +++ b/x11/wxGTK28/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.9 2010/02/19 17:34:41 sno Exp $ +# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:54 wiz Exp $ # .include "../../x11/wxGTK28/Makefile.common" -PKGREVISION= 6 +PKGREVISION= 7 PKGNAME= ${DISTNAME:S/wxGTK/wxGTK28/} COMMENT= GTK-based implementation of the wxWidgets GUI library diff --git a/x11/wxGTK28/buildlink3.mk b/x11/wxGTK28/buildlink3.mk index c61c80258b9..81a777d47e4 100644 --- a/x11/wxGTK28/buildlink3.mk +++ b/x11/wxGTK28/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2010/01/18 09:59:45 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2010/06/13 22:45:54 wiz Exp $ BUILDLINK_TREE+= wxGTK28 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= wxGTK28 WXGTK28_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.wxGTK28+= wxGTK28>=2.8.10 -BUILDLINK_ABI_DEPENDS.wxGTK28?= wxGTK28>=2.8.10nb4 +BUILDLINK_ABI_DEPENDS.wxGTK28?= wxGTK28>=2.8.10nb7 BUILDLINK_PKGSRCDIR.wxGTK28?= ../../x11/wxGTK28 .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/x11/wxGTK28/distinfo b/x11/wxGTK28/distinfo index 2c8863243a4..794d0e516ad 100644 --- a/x11/wxGTK28/distinfo +++ b/x11/wxGTK28/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2010/02/16 17:38:14 taca Exp $ +$NetBSD: distinfo,v 1.9 2010/06/13 22:45:54 wiz Exp $ SHA1 (wxGTK-2.8.10-libtool.diff.bz2) = 62ff30c26efdd73252bed2d07b82a9b9d3ef890f RMD160 (wxGTK-2.8.10-libtool.diff.bz2) = 64e1c32caa4bd6a0503bce4764e3ddc1cba68f8a @@ -6,7 +6,7 @@ Size (wxGTK-2.8.10-libtool.diff.bz2) = 154573 bytes SHA1 (wxGTK-2.8.10.tar.bz2) = 1e4bee16a423efeef665ed70e82b6e7dc5468cf4 RMD160 (wxGTK-2.8.10.tar.bz2) = b007de9b19ef4830d9f484c0d12595a14e66d432 Size (wxGTK-2.8.10.tar.bz2) = 9365627 bytes -SHA1 (patch-aa) = 1a30c79f07ea8ea5dff02fad9b5e1ba8dadde01a +SHA1 (patch-aa) = fbcfd8e6abaabab393f24dc368c1c6b8447a75be SHA1 (patch-ab) = 82960daef0616824718f3c04929871aeb0e258a2 SHA1 (patch-ac) = 50cf253797f2dee8b9dab08d138d0070e25e7a8c SHA1 (patch-ad) = b07a55257347633edb8997201c82f83619d1d650 diff --git a/x11/wxGTK28/patches/patch-aa b/x11/wxGTK28/patches/patch-aa index 27b2277c308..0379533ebc8 100644 --- a/x11/wxGTK28/patches/patch-aa +++ b/x11/wxGTK28/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.2 2009/05/15 07:09:00 adam Exp $ +$NetBSD: patch-aa,v 1.3 2010/06/13 22:45:54 wiz Exp $ ---- configure.orig 2009-03-06 13:17:38.000000000 +0100 +--- configure.orig 2009-03-06 12:17:38.000000000 +0000 +++ configure @@ -1962,7 +1962,7 @@ _ACEOF @@ -37,6 +37,59 @@ $NetBSD: patch-aa,v 1.2 2009/05/15 07:09:00 adam Exp $ /usr/X11R6/include \ /usr/X11R6.4/include \ \ +@@ -26379,9 +26380,9 @@ echo "${ECHO_T}$ac_cv_header_png_h" >&6 + + + if test "$ac_cv_header_png_h" = "yes"; then +- echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5 +-echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6 +-if test "${ac_cv_lib_png_png_check_sig+set}" = set; then ++ echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5 ++echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6 ++if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -26399,11 +26400,11 @@ extern "C" + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char png_check_sig (); ++char png_sig_cmp (); + int + main () + { +-png_check_sig (); ++png_sig_cmp (); + ; + return 0; + } +@@ -26429,20 +26430,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_lib_png_png_check_sig=yes ++ ac_cv_lib_png_png_sig_cmp=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_png_png_check_sig=no ++ac_cv_lib_png_png_sig_cmp=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5 +-echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6 +-if test $ac_cv_lib_png_png_check_sig = yes; then ++echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5 ++echo "${ECHO_T}$ac_cv_lib_png_png_sig_cmp" >&6 ++if test $ac_cv_lib_png_png_sig_cmp = yes; then + PNG_LINK=" -lpng -lz" + fi + @@ -39478,6 +39479,9 @@ echo "$as_me: WARNING: BeOS threads are THREAD_OPTS="-mt $THREAD_OPTS" fi |