diff options
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/png/Makefile | 17 | ||||
| -rw-r--r-- | graphics/png/PLIST | 3 | ||||
| -rw-r--r-- | graphics/png/distinfo | 11 | ||||
| -rw-r--r-- | graphics/png/patches/patch-aa | 14 | ||||
| -rw-r--r-- | graphics/png/patches/patch-ae | 17 |
5 files changed, 28 insertions, 34 deletions
diff --git a/graphics/png/Makefile b/graphics/png/Makefile index 3e24064632b..16ae026bad6 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.79 2006/05/09 22:28:18 wiz Exp $ +# $NetBSD: Makefile,v 1.80 2006/05/17 21:48:57 wiz Exp $ -DISTNAME= libpng-1.2.9 +DISTNAME= libpng-1.2.10 PKGNAME= ${DISTNAME:S/lib//} -PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/} \ http://www.libpng.org/pub/png/src/ \ @@ -31,18 +30,8 @@ CPPFLAGS+= -DPNG_NO_ASSEMBLER_CODE SUBST_CLASSES+= rpathfix SUBST_FILES.rpathfix= scripts/libpng-config.in SUBST_MESSAGE.rpathfix= Adding rpath to libpng-config. -SUBST_SED.rpathfix= '/^L_opts=/s|-L\([ ]*[^ ]*\)"|${COMPILER_RPATH_FLAG}\1 -L\1"|g' +SUBST_SED.rpathfix= -e '/^L_opts=/s|-L\([ ]*[^ ]*\)"|${COMPILER_RPATH_FLAG}\1 -L\1"|g' SUBST_STAGE.rpathfix= pre-configure -# highly version dependent -- fix up libtool .la file contents, since -# just copying a .la file to a new filename is not enough -# PLIST breakage will show when it needs updating :) -post-install: - cd ${PREFIX}/lib && \ - ${SED} -e 's/png12/png/g' -e 's/0.9.0/3.9.0/' -e 's/so\.0/so\.3/g' \ - -e 's/libpng.0.dylib/libpng.3.dylib/g' \ - libpng.la > libpng.la.out && \ - ${MV} libpng.la.out libpng.la - .include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/png/PLIST b/graphics/png/PLIST index 66ccc2fef59..77524eda5f8 100644 --- a/graphics/png/PLIST +++ b/graphics/png/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2006/04/16 23:19:15 wiz Exp $ +@comment $NetBSD: PLIST,v 1.10 2006/05/17 21:48:57 wiz Exp $ bin/libpng-config bin/libpng12-config include/libpng12/png.h @@ -7,6 +7,7 @@ include/png.h include/pngconf.h lib/libpng.la lib/libpng12.la +lib/libpngcompat.la lib/pkgconfig/libpng.pc lib/pkgconfig/libpng12.pc man/man3/libpng.3 diff --git a/graphics/png/distinfo b/graphics/png/distinfo index f7a6eb95dac..2801fb7e49b 100644 --- a/graphics/png/distinfo +++ b/graphics/png/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.28 2006/04/17 13:44:46 wiz Exp $ +$NetBSD: distinfo,v 1.29 2006/05/17 21:48:57 wiz Exp $ -SHA1 (libpng-1.2.9.tar.bz2) = ee9b8b1d42b855561a6fddd1b98963f345c40254 -RMD160 (libpng-1.2.9.tar.bz2) = fb00f7776639bf55446a0be87d38261859825efb -Size (libpng-1.2.9.tar.bz2) = 618689 bytes +SHA1 (libpng-1.2.10.tar.bz2) = 075fe05e25012470d0351187b57e8256b95d2e89 +RMD160 (libpng-1.2.10.tar.bz2) = 8dbbf8ef709e6b35cc715302a7d3a50bef1a88c8 +Size (libpng-1.2.10.tar.bz2) = 625176 bytes +SHA1 (patch-aa) = 3191c0781894d16be1c914f378f5be221dbc4960 SHA1 (patch-ab) = 979175c65587686b339a5556e8bcae3be95a07ca -SHA1 (patch-ae) = a1edc8ea4eb892b67ecc0a96ee1263c532f7d0f2 +SHA1 (patch-ae) = b9bf9de3caa32ac78a17685cdd5df5b80d1ccbbf diff --git a/graphics/png/patches/patch-aa b/graphics/png/patches/patch-aa new file mode 100644 index 00000000000..148466187fb --- /dev/null +++ b/graphics/png/patches/patch-aa @@ -0,0 +1,14 @@ +$NetBSD: patch-aa,v 1.25 2006/05/17 21:48:57 wiz Exp $ + +Install old library .la file so that PLIST is correct. + +--- Makefile.in.orig 2006-04-23 18:46:00.000000000 +0000 ++++ Makefile.in +@@ -1264,6 +1264,7 @@ install-exec-hook: + 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; do\ + rm -f libpng.$$ext;\ + $(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\ diff --git a/graphics/png/patches/patch-ae b/graphics/png/patches/patch-ae index f19ae138797..0fcedffddb1 100644 --- a/graphics/png/patches/patch-ae +++ b/graphics/png/patches/patch-ae @@ -1,19 +1,8 @@ -$NetBSD: patch-ae,v 1.6 2006/04/16 23:19:15 wiz Exp $ +$NetBSD: patch-ae,v 1.7 2006/05/17 21:48:57 wiz Exp $ ---- pngconf.h.orig 2006-04-14 11:22:24.000000000 +0000 +--- pngconf.h.orig 2006-04-23 18:45:34.000000000 +0000 +++ pngconf.h -@@ -30,10 +30,6 @@ - #include "pngusr.h" - #endif - --#ifdef HAVE_CONFIG_H --#include "config.h" --#endif -- - /* - * Added at libpng-1.2.8 - * -@@ -311,8 +307,8 @@ +@@ -314,8 +314,8 @@ /* If you encounter a compiler error here, see the explanation * near the end of INSTALL. */ |