diff options
| -rw-r--r-- | graphics/png/Makefile | 10 | ||||
| -rw-r--r-- | graphics/png/PLIST | 14 | ||||
| -rw-r--r-- | graphics/png/buildlink3.mk | 22 | ||||
| -rw-r--r-- | graphics/png/distinfo | 11 | ||||
| -rw-r--r-- | graphics/png/hacks.mk | 12 | ||||
| -rw-r--r-- | graphics/png/patches/patch-aa | 25 | ||||
| -rw-r--r-- | graphics/png/patches/patch-af | 13 |
7 files changed, 40 insertions, 67 deletions
diff --git a/graphics/png/Makefile b/graphics/png/Makefile index 6b2b3263f11..9b816b2261d 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.122 2010/03/09 08:41:15 wiz Exp $ +# $NetBSD: Makefile,v 1.123 2010/06/13 22:42:10 wiz Exp $ -DISTNAME= libpng-1.2.43 +DISTNAME= libpng-1.4.2 PKGNAME= ${DISTNAME:S/lib//} CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/} \ @@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE= scripts/libpng.pc.in +PKGCONFIG_OVERRIDE= scripts/libpng.pc.in libpng.pc.in TEST_TARGET= check USE_LIBTOOL= yes @@ -26,8 +26,8 @@ CPPFLAGS+= -DPNG_NO_ASSEMBLER_CODE .endif SUBST_CLASSES+= rpathfix -SUBST_FILES.rpathfix= scripts/libpng-config.in scripts/libpng.pc-configure.in -SUBST_MESSAGE.rpathfix= Adding rpath to libpng-config and libpng.pc +SUBST_FILES.rpathfix= libpng-config.in +SUBST_MESSAGE.rpathfix= Adding rpath to libpng-config SUBST_SED.rpathfix= -e 's/-L$${libdir}/${COMPILER_RPATH_FLAG}$${libdir} -L$${libdir}/g' SUBST_STAGE.rpathfix= pre-configure diff --git a/graphics/png/PLIST b/graphics/png/PLIST index e821e8850b1..91008096236 100644 --- a/graphics/png/PLIST +++ b/graphics/png/PLIST @@ -1,15 +1,13 @@ -@comment $NetBSD: PLIST,v 1.11 2009/06/14 17:59:25 joerg Exp $ +@comment $NetBSD: PLIST,v 1.12 2010/06/13 22:42:10 wiz Exp $ bin/libpng-config -bin/libpng12-config -include/libpng12/png.h -include/libpng12/pngconf.h +bin/libpng14-config +include/libpng14/png.h +include/libpng14/pngconf.h include/png.h include/pngconf.h -lib/libpng.la -lib/libpng12.la -lib/libpngcompat.la +lib/libpng14.la lib/pkgconfig/libpng.pc -lib/pkgconfig/libpng12.pc +lib/pkgconfig/libpng14.pc man/man3/libpng.3 man/man3/libpngpf.3 man/man5/png.5 diff --git a/graphics/png/buildlink3.mk b/graphics/png/buildlink3.mk index c55386c555e..62ab8d70afd 100644 --- a/graphics/png/buildlink3.mk +++ b/graphics/png/buildlink3.mk @@ -1,18 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.23 2009/03/20 19:24:44 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2010/06/13 22:42:10 wiz Exp $ BUILDLINK_TREE+= png .if !defined(PNG_BUILDLINK3_MK) PNG_BUILDLINK3_MK:= -# XXX tv - remove this OPSYS block the next time ABI_DEPENDS is bumped: -. include "../../mk/bsd.fast.prefs.mk" -. if ${OPSYS} == "Interix" -BUILDLINK_ABI_DEPENDS.png+= png>=1.2.14nb1 # fixes linkage bug -. endif - BUILDLINK_API_DEPENDS.png+= png>=1.2.4 -BUILDLINK_ABI_DEPENDS.png+= png>=1.2.9nb2 +BUILDLINK_ABI_DEPENDS.png+= png>=1.4.2 BUILDLINK_PKGSRCDIR.png?= ../../graphics/png # keep this in sync with the same code in Makefile @@ -20,12 +14,12 @@ BUILDLINK_PKGSRCDIR.png?= ../../graphics/png CPPFLAGS+= -DPNG_NO_ASSEMBLER_CODE . endif -# Work around broken libtool archive "/usr/X11/lib/libpng12.la" under -# Mac OS 10.5.4 or newer which references a non-existing version of the -# PNG shared library. -.if !empty(MACHINE_PLATFORM:MDarwin-9.*-*) -BUILDLINK_TRANSFORM+= rename:-lpng12.0.26.0:-lpng -.endif +# Some software directly tries to link against -lpng instead of +# using pkg-config or libpng-config to find the proper arguments +# instead of installing symlinks. Work around this with buildlink +# magic: packages outside pkgsrc will need to be converted to +# one of the proper methods or fail. +BUILDLINK_TRANSFORM+= l:png:png14 .include "../../devel/zlib/buildlink3.mk" .endif # PNG_BUILDLINK3_MK diff --git a/graphics/png/distinfo b/graphics/png/distinfo index 275488f0620..a6f3f8a502f 100644 --- a/graphics/png/distinfo +++ b/graphics/png/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.67 2010/03/09 08:41:15 wiz Exp $ +$NetBSD: distinfo,v 1.68 2010/06/13 22:42:10 wiz Exp $ -SHA1 (libpng-1.2.43.tar.bz2) = 28ea29305d233669ce565894a95151e4427d1f34 -RMD160 (libpng-1.2.43.tar.bz2) = 6c108f06ae32a86ddd8571e9031f143932f19531 -Size (libpng-1.2.43.tar.bz2) = 678799 bytes -SHA1 (patch-aa) = 27df7893fc54f7e87790850eb9f047155c73f7d3 +SHA1 (libpng-1.4.2.tar.bz2) = 2670d702bbeee7b28bd7e4814e460524731354c3 +RMD160 (libpng-1.4.2.tar.bz2) = a7bbad2394d93d57cea4ae26f870466bb553449e +Size (libpng-1.4.2.tar.bz2) = 655710 bytes +SHA1 (patch-aa) = fc7f010f347cb77d8b478395a59ba4c4c1abd4b9 SHA1 (patch-ac) = 44b167433e066556022d9b43fa33a7f887f83617 SHA1 (patch-ae) = e9700e7d3dd536d80e47cffa20b412a6c69660be -SHA1 (patch-af) = 1998c2faf616666ad8b975e8ffbacdb9c594a714 diff --git a/graphics/png/hacks.mk b/graphics/png/hacks.mk deleted file mode 100644 index 6040628f2d0..00000000000 --- a/graphics/png/hacks.mk +++ /dev/null @@ -1,12 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2007/08/31 15:35:08 minskim Exp $ - -.if !defined(PNG_HACKS_MK) -PNG_HACKS_MK= defined - -# A workaround for libpng bug #1777158. -.if !empty(MACHINE_PLATFORM:MDarwin-*-i386) -PKG_HACKS+= darwin-read_only_relocs -LDFLAGS+= -Wl,-read_only_relocs -Wl,suppress -.endif - -.endif # PNG_HACKS_MK diff --git a/graphics/png/patches/patch-aa b/graphics/png/patches/patch-aa index dd8c99a68a8..87dd1cd6bd7 100644 --- a/graphics/png/patches/patch-aa +++ b/graphics/png/patches/patch-aa @@ -1,12 +1,19 @@ -$NetBSD: patch-aa,v 1.27 2007/08/29 20:58:26 wiz Exp $ +$NetBSD: patch-aa,v 1.28 2010/06/13 22:42:10 wiz Exp $ ---- Makefile.in.orig 2007-08-18 10:34:04.000000000 +0000 +--- Makefile.in.orig 2010-05-06 10:30:19.000000000 +0000 +++ Makefile.in -@@ -1275,6 +1275,7 @@ install-exec-hook: +@@ -1243,14 +1243,6 @@ install-data-hook: + install-exec-hook: + cd $(DESTDIR)$(bindir); rm -f libpng-config cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng-config - @set -x;\ - cd $(DESTDIR)$(libdir);\ -+ mv libpng.la libpngcompat.la;\ - for ext in a la so sl dylib; do\ - rm -f libpng.$$ext;\ - if test -f $(PNGLIB_BASENAME).$$ext; then\ +- @set -x;\ +- cd $(DESTDIR)$(libdir);\ +- for ext in a la so so.@PNGLIB_MAJOR@@PNGLIB_MINOR@.@PNGLIB_RELEASE@ sl dylib; do\ +- rm -f libpng.$$ext;\ +- if test -f $(PNGLIB_BASENAME).$$ext; then\ +- $(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\ +- fi;\ +- done + + uninstall-hook: + cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h diff --git a/graphics/png/patches/patch-af b/graphics/png/patches/patch-af deleted file mode 100644 index 5e5947cd232..00000000000 --- a/graphics/png/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.3 2010/03/04 10:13:16 tnn Exp $ - ---- scripts/libpng-config.in.orig 2009-12-03 01:46:02.000000000 +0000 -+++ scripts/libpng-config.in -@@ -16,7 +16,7 @@ prefix="@prefix@" - exec_prefix="@exec_prefix@" - libdir="@libdir@" - includedir="@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@" --libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@" -+libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@" - all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@" - I_opts="-I${includedir}" - L_opts="-L${libdir}" |