diff options
author | wiz <wiz@pkgsrc.org> | 2010-06-13 22:43:46 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2010-06-13 22:43:46 +0000 |
commit | 1c3f6b6c2cf3f63b145d6432ec954fd675323060 (patch) | |
tree | 4a9b97c2969a25f1eeb6596ee96fc25429cef7d5 /www/amaya | |
parent | 5db65af1585863fee1adec6a430a04af777f8c9d (diff) | |
download | pkgsrc-1c3f6b6c2cf3f63b145d6432ec954fd675323060.tar.gz |
Bump PKGREVISION for libpng shlib name change.
Also add some patches to remove use of deprecated symbols and fix other
problems when looking for or compiling against libpng-1.4.x.
Diffstat (limited to 'www/amaya')
-rw-r--r-- | www/amaya/Makefile | 4 | ||||
-rw-r--r-- | www/amaya/distinfo | 4 | ||||
-rw-r--r-- | www/amaya/patches/patch-ap | 59 |
3 files changed, 60 insertions, 7 deletions
diff --git a/www/amaya/Makefile b/www/amaya/Makefile index 5fe6a9bdf4b..50efea94e15 100644 --- a/www/amaya/Makefile +++ b/www/amaya/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.57 2010/01/18 09:59:30 wiz Exp $ +# $NetBSD: Makefile,v 1.58 2010/06/13 22:45:32 wiz Exp $ DISTNAME= amaya-fullsrc-10.0.1 PKGNAME= ${DISTNAME:S/-fullsrc//} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= www MASTER_SITES= http://www.w3.org/Amaya/Distribution/ \ ftp://ftp.w3.org/pub/amaya/ \ diff --git a/www/amaya/distinfo b/www/amaya/distinfo index 0e1bec0f2d1..1dbcb5c35d7 100644 --- a/www/amaya/distinfo +++ b/www/amaya/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2008/09/11 04:22:50 dholland Exp $ +$NetBSD: distinfo,v 1.20 2010/06/13 22:45:32 wiz Exp $ SHA1 (amaya-fullsrc-10.0.1.tgz) = a2dcceedaa2c0256f04aaa86e3dc319d4ff26ade RMD160 (amaya-fullsrc-10.0.1.tgz) = d1a20a03a18ef3b06cf9dcbab907fb412de0ad6b @@ -15,5 +15,5 @@ SHA1 (patch-al) = 172ab5106ecdc8fac825bcca8e57202010c980a3 SHA1 (patch-am) = 152800baf4b750dbfe1bfa731313222b471d28ab SHA1 (patch-an) = 5d2e98d7046394960d7c172ed7d491ecb0f0992e SHA1 (patch-ao) = 34f6b0fe289d966c2a7553799be8bf59426091b4 -SHA1 (patch-ap) = d4ba3426bbeffc5f9f8f30002d4bb75e0c3816c6 +SHA1 (patch-ap) = 9d0eaa0bc05dc61f5d29cd78644fb854076590ce SHA1 (patch-aq) = 3885a77d86fa1c3892a6aab7c9538d119951cd4a diff --git a/www/amaya/patches/patch-ap b/www/amaya/patches/patch-ap index 4d3543350ed..d55dc7b901f 100644 --- a/www/amaya/patches/patch-ap +++ b/www/amaya/patches/patch-ap @@ -1,7 +1,7 @@ -$NetBSD: patch-ap,v 1.1 2008/09/11 04:22:50 dholland Exp $ +$NetBSD: patch-ap,v 1.2 2010/06/13 22:45:32 wiz Exp $ ---- ../../wxWidgets/configure.orig 2007-05-14 05:08:25.000000000 -0400 -+++ ../../wxWidgets/configure 2008-09-08 06:27:09.000000000 -0400 +--- ../../wxWidgets/configure.orig 2007-05-14 09:08:25.000000000 +0000 ++++ ../../wxWidgets/configure @@ -23470,43 +23470,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -78,6 +78,59 @@ $NetBSD: patch-ap,v 1.1 2008/09/11 04:22:50 dholland Exp $ do if test -f "$ac_dir/X11/Intrinsic.h"; then ac_find_includes=$ac_dir +@@ -24916,9 +24881,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 +@@ -24936,11 +24901,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; + } +@@ -24966,20 +24931,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 + @@ -30134,7 +30099,7 @@ echo "$as_me: error: Unicode configurati echo $ECHO_N "checking for Motif/Lesstif headers... $ECHO_C" >&6 |