From 92e0cb52cb783546e352182244f761180817e141 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 13 Jun 2010 22:43:46 +0000 Subject: 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. --- converters/qrencode/Makefile | 3 +- converters/qrencode/distinfo | 3 +- converters/qrencode/patches/patch-aa | 63 ++++++++++++++++++++++++++++++++++++ converters/tex2rtf/Makefile | 4 +-- converters/wv/Makefile | 4 +-- converters/wv/buildlink3.mk | 4 +-- 6 files changed, 73 insertions(+), 8 deletions(-) create mode 100644 converters/qrencode/patches/patch-aa (limited to 'converters') diff --git a/converters/qrencode/Makefile b/converters/qrencode/Makefile index 8adf123484a..b11572c175b 100644 --- a/converters/qrencode/Makefile +++ b/converters/qrencode/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2008/10/22 02:35:45 obache Exp $ +# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:00 wiz Exp $ # DISTNAME= qrencode-3.0.3 +PKGREVISION= 1 CATEGORIES= converters MASTER_SITES= http://megaui.net/fukuchi/works/qrencode/ diff --git a/converters/qrencode/distinfo b/converters/qrencode/distinfo index 0fde84c9376..7d6ff731d33 100644 --- a/converters/qrencode/distinfo +++ b/converters/qrencode/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1 2008/06/15 10:33:38 gavan Exp $ +$NetBSD: distinfo,v 1.2 2010/06/13 22:44:00 wiz Exp $ SHA1 (qrencode-3.0.3.tar.gz) = 818924a8b648ddee3cd2df556455a3d468ab87c5 RMD160 (qrencode-3.0.3.tar.gz) = 7e94883cdc8434e1511eef319af01d9733e8960a Size (qrencode-3.0.3.tar.gz) = 399547 bytes +SHA1 (patch-aa) = e4241ea1c7443f9dd748e4df0e8aa1777b734c72 diff --git a/converters/qrencode/patches/patch-aa b/converters/qrencode/patches/patch-aa new file mode 100644 index 00000000000..1d3d3defedb --- /dev/null +++ b/converters/qrencode/patches/patch-aa @@ -0,0 +1,63 @@ +$NetBSD: patch-aa,v 1.1 2010/06/13 22:44:00 wiz Exp $ + +--- configure.orig 2008-05-26 18:01:17.000000000 +0000 ++++ configure +@@ -21145,12 +21145,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_png_CFLAGS="$png_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\"") >&5 +- ($PKG_CONFIG --exists --print-errors ""libpng12"") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"libpng\"\"") >&5 ++ ($PKG_CONFIG --exists --print-errors ""libpng"") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_png_CFLAGS=`$PKG_CONFIG --cflags ""libpng12"" 2>/dev/null` ++ pkg_cv_png_CFLAGS=`$PKG_CONFIG --cflags ""libpng"" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -21163,12 +21163,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_png_LIBS="$png_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"libpng12\"\"") >&5 +- ($PKG_CONFIG --exists --print-errors ""libpng12"") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"libpng\"\"") >&5 ++ ($PKG_CONFIG --exists --print-errors ""libpng"") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_png_LIBS=`$PKG_CONFIG --libs ""libpng12"" 2>/dev/null` ++ pkg_cv_png_LIBS=`$PKG_CONFIG --libs ""libpng"" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -21187,14 +21187,14 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- png_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libpng12""` ++ png_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""libpng""` + else +- png_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libpng12""` ++ png_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""libpng""` + fi + # Put the nasty error message in config.log where it belongs + echo "$png_PKG_ERRORS" >&5 + +- { { echo "$as_me:$LINENO: error: Package requirements (\"libpng12\") were not met: ++ { { echo "$as_me:$LINENO: error: Package requirements (\"libpng\") were not met: + + $png_PKG_ERRORS + +@@ -21205,7 +21205,7 @@ Alternatively, you may set the environme + and png_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-echo "$as_me: error: Package requirements (\"libpng12\") were not met: ++echo "$as_me: error: Package requirements (\"libpng\") were not met: + + $png_PKG_ERRORS + diff --git a/converters/tex2rtf/Makefile b/converters/tex2rtf/Makefile index c388c7e9f4e..e01395fb9f6 100644 --- a/converters/tex2rtf/Makefile +++ b/converters/tex2rtf/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.25 2010/01/18 09:58:42 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2010/06/13 22:44:00 wiz Exp $ DISTNAME= tex2rtf-2.01-source PKGNAME= tex2rtf-2.01 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= converters textproc MASTER_SITES= ftp://biolpc22.york.ac.uk/pub/tex2rtf/ EXTRACT_SUFX= .tar.bz2 diff --git a/converters/wv/Makefile b/converters/wv/Makefile index e24a7d5f634..c9ec05cdcb5 100644 --- a/converters/wv/Makefile +++ b/converters/wv/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.66 2010/01/18 09:58:42 wiz Exp $ +# $NetBSD: Makefile,v 1.67 2010/06/13 22:44:00 wiz Exp $ DISTNAME= wv-1.2.5 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= converters MASTER_SITES= http://www.abiword.com/downloads/wv/1.2.5/ diff --git a/converters/wv/buildlink3.mk b/converters/wv/buildlink3.mk index 1a763c40552..53efe39809f 100644 --- a/converters/wv/buildlink3.mk +++ b/converters/wv/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2010/01/18 09:58:42 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2010/06/13 22:44:00 wiz Exp $ BUILDLINK_TREE+= wv @@ -6,7 +6,7 @@ BUILDLINK_TREE+= wv WV_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.wv+= wv>=1.0.0 -BUILDLINK_ABI_DEPENDS.wv+= wv>=1.2.5nb2 +BUILDLINK_ABI_DEPENDS.wv+= wv>=1.2.5nb3 BUILDLINK_PKGSRCDIR.wv?= ../../converters/wv .include "../../converters/libiconv/buildlink3.mk" -- cgit v1.2.3