diff options
author | wiz <wiz> | 2006-04-16 23:19:15 +0000 |
---|---|---|
committer | wiz <wiz> | 2006-04-16 23:19:15 +0000 |
commit | 409aa012379ebe37602a80b0e2a033e27a3cd188 (patch) | |
tree | 34bfb180bedd5a6d67ad399da1bc00ab4e6c6617 /graphics | |
parent | 64fc5942505d1fa3ada785f19c8d5cdb92ea6e88 (diff) | |
download | pkgsrc-409aa012379ebe37602a80b0e2a033e27a3cd188.tar.gz |
Update to 1.2.9nb1:
. pngconf.h included "config.h" if HAVE_CONFIG_H is defined -- really not
a good idea, patch it out. broke at least libwmf, reported by veego@
. install some libpng12 files -- IIUC, libpng12* is the future and
libpng* is becoming obsolete -- at least according to the wishes of
the authors. Don't follow this completely yet, but still patch the
pkg-config file to link against -lpng instead of -lpng12, which
would require a recursive PKGREVISION bump. We should probably do this
at some future time.
. switch pkgconfig file to look for headers in include/libpng12 -- the
headers still exist in include/ for backwards compatibility.
. switch to using GNU_CONFIGURE and the included libtool handling instead
of patching in our own into a Makefile. Gets rid of patches and pkgsrc
Makefile code.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/png/Makefile | 39 | ||||
-rw-r--r-- | graphics/png/PLIST | 9 | ||||
-rw-r--r-- | graphics/png/distinfo | 7 | ||||
-rw-r--r-- | graphics/png/patches/patch-aa | 71 | ||||
-rw-r--r-- | graphics/png/patches/patch-ac (renamed from graphics/png/patches/patch-ad) | 10 | ||||
-rw-r--r-- | graphics/png/patches/patch-ae | 15 |
6 files changed, 38 insertions, 113 deletions
diff --git a/graphics/png/Makefile b/graphics/png/Makefile index fc2af969266..fefba15042a 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.74 2006/04/16 19:39:46 wiz Exp $ +# $NetBSD: Makefile,v 1.75 2006/04/16 23:19:15 wiz Exp $ -# On update, don't forget to increase shared library major/minor's in -# accordance with changes (patch-aa). DISTNAME= libpng-1.2.9 PKGNAME= ${DISTNAME:S/lib//} +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/} \ http://www.libpng.org/pub/png/src/ \ @@ -18,33 +17,19 @@ COMMENT= Library for manipulating PNG images PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_LIBTOOL= yes -TEST_TARGET= test - -LIBPNG_SO_MAJOR= 3 -LIBPNG_SO_MINOR= 3 - -MAKEFILE= scripts/makefile.std -MAKE_ENV+= REALCC=${CC:Q} -MAKE_ENV+= LIBPNG_SO_MAJOR=${LIBPNG_SO_MAJOR:Q} -MAKE_ENV+= LIBPNG_SO_MINOR=${LIBPNG_SO_MINOR:Q} - -INSTALLATION_DIRS= include lib/pkgconfig ${PKGMANDIR}/man3 ${PKGMANDIR}/man5 - +GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= scripts/libpng.pc.in +TEST_TARGET= test +USE_LIBTOOL= yes -SUBST_CLASSES+= pc -SUBST_STAGE.pc= post-patch -SUBST_FILES.pc= scripts/libpng.pc.in -SUBST_SED.pc= -e 's,@PREFIX@,${PREFIX},' -SUBST_MESSAGE.pc= Fixing libpng.pc.in. - +# 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: - ${INSTALL_MAN} ${WRKSRC}/libpng.3 ${PREFIX}/${PKGMANDIR}/man3 - ${INSTALL_MAN} ${WRKSRC}/libpngpf.3 ${PREFIX}/${PKGMANDIR}/man3 - ${INSTALL_MAN} ${WRKSRC}/png.5 ${PREFIX}/${PKGMANDIR}/man5 - ${INSTALL_DATA} ${WRKSRC}/scripts/libpng.pc.in \ - ${PREFIX}/lib/pkgconfig/libpng12.pc + cd ${PREFIX}/lib && \ + ${SED} -e 's/png12/png/g' -e 's/0.9.0/3.9.0/' -e 's/so\.0/so\.3/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 9268d8a7ba9..66ccc2fef59 100644 --- a/graphics/png/PLIST +++ b/graphics/png/PLIST @@ -1,8 +1,15 @@ -@comment $NetBSD: PLIST,v 1.8 2004/09/22 08:09:37 jlam Exp $ +@comment $NetBSD: PLIST,v 1.9 2006/04/16 23:19:15 wiz Exp $ +bin/libpng-config +bin/libpng12-config +include/libpng12/png.h +include/libpng12/pngconf.h include/png.h include/pngconf.h lib/libpng.la +lib/libpng12.la +lib/pkgconfig/libpng.pc lib/pkgconfig/libpng12.pc man/man3/libpng.3 man/man3/libpngpf.3 man/man5/png.5 +@dirrm include/libpng12 diff --git a/graphics/png/distinfo b/graphics/png/distinfo index d74825598ba..fb5523efe9a 100644 --- a/graphics/png/distinfo +++ b/graphics/png/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.26 2006/04/16 19:39:46 wiz Exp $ +$NetBSD: distinfo,v 1.27 2006/04/16 23:19:15 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 (patch-aa) = bdfc304e4113383d56f656772789e3774969169f SHA1 (patch-ab) = 979175c65587686b339a5556e8bcae3be95a07ca -SHA1 (patch-ad) = 0ad974fb163e2f8800b3501767b3fd26ffc129c5 -SHA1 (patch-ae) = 6e7b05808ffe1c0fb05569a0141f0d6a487eaed6 +SHA1 (patch-ac) = 430cb02096983563f14d59b056bea81974131524 +SHA1 (patch-ae) = a1edc8ea4eb892b67ecc0a96ee1263c532f7d0f2 diff --git a/graphics/png/patches/patch-aa b/graphics/png/patches/patch-aa deleted file mode 100644 index 3b960523098..00000000000 --- a/graphics/png/patches/patch-aa +++ /dev/null @@ -1,71 +0,0 @@ -$NetBSD: patch-aa,v 1.23 2006/04/16 19:39:46 wiz Exp $ - ---- scripts/makefile.std.orig 2006-03-06 17:06:28.000000000 +0000 -+++ scripts/makefile.std -@@ -4,7 +4,7 @@ - # For conditions of distribution and use, see copyright notice in png.h - - # where make install puts libpng.a and png.h --prefix=/usr/local -+prefix=${PREFIX} - INCPATH=$(prefix)/include - LIBPATH=$(prefix)/lib - -@@ -24,45 +24,34 @@ DESTDIR= - ZLIBLIB=../zlib - ZLIBINC=../zlib - --CC=cc -+CC=${LIBTOOL} --mode=compile ${REALCC} - AR_RC=ar rc - MKDIR_P=mkdir - LN_SF=ln -sf - RANLIB=ranlib - RM_F=rm -f - --CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 --LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm -+#CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5 -+#LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm - - OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ - pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ - pngwtran.o pngmem.o pngerror.o pngpread.o - --all: libpng.a pngtest -+all: libpng.la pngtest - --libpng.a: $(OBJS) -- $(AR_RC) $@ $(OBJS) -- $(RANLIB) $@ -- --pngtest: pngtest.o libpng.a -- $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) -+libpng.la: $(OBJS) -+ ${LIBTOOL} --mode=link $(REALCC) -o $@ ${OBJS:.o=.lo} -rpath $(LIBPATH) ${LDFLAGS} -lz -lm -version-info ${LIBPNG_SO_MAJOR}:${LIBPNG_SO_MINOR} -+ -+pngtest: pngtest.o libpng.la -+ ${LIBTOOL} --mode=link $(REALCC) -o pngtest $(CFLAGS) pngtest.o ${LDFLAGS} libpng.la -lz -lm - - test: pngtest - ./pngtest - --install: libpng.a -- -@$(MKDIR_P) $(DESTDIR)$(INCPATH) -- -@$(MKDIR_P) $(DESTDIR)$(INCPATH)/libpng -- -@$(MKDIR_P) $(DESTDIR)$(LIBPATH) -- -@$(RM_F) $(DESTDIR)$(INCPATH)/png.h -- -@$(RM_F) $(DESTDIR)$(INCPATH)/pngconf.h -- cp png.h $(DESTDIR)$(INCPATH)/libpng -- cp pngconf.h $(DESTDIR)$(INCPATH)/libpng -- chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h -- chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h -- (cd $(DESTDIR)$(INCPATH); ln -f -s libpng/* .) -- cp libpng.a $(DESTDIR)$(LIBPATH) -- chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a -+install: libpng.la -+ ${BSD_INSTALL_DATA} png.h pngconf.h $(INCPATH) -+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libpng.la $(LIBPATH) - - clean: - $(RM_F) *.o libpng.a pngtest pngout.png diff --git a/graphics/png/patches/patch-ad b/graphics/png/patches/patch-ac index 43f02c3c68e..60be3ccf037 100644 --- a/graphics/png/patches/patch-ad +++ b/graphics/png/patches/patch-ac @@ -1,14 +1,8 @@ -$NetBSD: patch-ad,v 1.7 2006/04/16 19:39:46 wiz Exp $ +$NetBSD: patch-ac,v 1.4 2006/04/16 23:19:15 wiz Exp $ --- scripts/libpng.pc.in.orig 2006-03-03 02:48:03.000000000 +0000 +++ scripts/libpng.pc.in -@@ -1,10 +1,10 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ --includedir=@includedir@/libpng@PNGLIB_MAJOR@ -+includedir=@includedir@ - +@@ -6,5 +6,5 @@ includedir=@includedir@/libpng@PNGLIB_MA Name: libpng Description: Loads and saves PNG files Version: @PNGLIB_VERSION@ diff --git a/graphics/png/patches/patch-ae b/graphics/png/patches/patch-ae index ba48990d710..f19ae138797 100644 --- a/graphics/png/patches/patch-ae +++ b/graphics/png/patches/patch-ae @@ -1,8 +1,19 @@ -$NetBSD: patch-ae,v 1.5 2006/04/16 19:39:46 wiz Exp $ +$NetBSD: patch-ae,v 1.6 2006/04/16 23:19:15 wiz Exp $ --- pngconf.h.orig 2006-04-14 11:22:24.000000000 +0000 +++ pngconf.h -@@ -311,8 +311,8 @@ +@@ -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 @@ /* If you encounter a compiler error here, see the explanation * near the end of INSTALL. */ |