diff options
| -rw-r--r-- | graphics/png/Makefile | 9 | ||||
| -rw-r--r-- | graphics/png/buildlink.mk | 4 | ||||
| -rw-r--r-- | graphics/png/distinfo | 4 | ||||
| -rw-r--r-- | graphics/png/patches/patch-aa | 12 |
4 files changed, 19 insertions, 10 deletions
diff --git a/graphics/png/Makefile b/graphics/png/Makefile index 0ff880a45b7..f471066c2d7 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2001/05/21 21:39:13 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2001/05/28 02:41:54 jlam Exp $ # On update, don't forget to increase shared library major/minor's in # accordance with changes (patch-aa). @@ -19,6 +19,13 @@ USE_LIBTOOL= yes MAKEFILE= scripts/makefile.std MAKE_ENV+= REALCC="${CC}" +.include "../../devel/zlib/buildlink.mk" + +CFLAGS+= -I${BUILDLINK_INCDIR} +LDFLAGS+= -L${BUILDLINK_LIBDIR} + +pre-configure: ${BUILDLINK_TARGETS} + post-install: ${INSTALL_MAN} ${WRKSRC}/libpng.3 ${PREFIX}/man/man3 ${INSTALL_MAN} ${WRKSRC}/libpngpf.3 ${PREFIX}/man/man3 diff --git a/graphics/png/buildlink.mk b/graphics/png/buildlink.mk index 4718c44c1b1..caebe8d8f0b 100644 --- a/graphics/png/buildlink.mk +++ b/graphics/png/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.1 2001/05/26 08:10:42 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.2 2001/05/28 02:41:54 jlam Exp $ # # This Makefile fragment is included by packages that use libpng. # @@ -16,6 +16,8 @@ .if !defined(PNG_BUILDLINK_MK) PNG_BUILDLINK_MK= # defined +.include "../../devel/zlib/buildlink.mk" + PNG_REQD?= 1.0.11 DEPENDS+= png>=${PNG_REQD}:../../graphics/png diff --git a/graphics/png/distinfo b/graphics/png/distinfo index 1ce1fa6ffd1..fa237b5baee 100644 --- a/graphics/png/distinfo +++ b/graphics/png/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2001/05/21 21:39:14 wiz Exp $ +$NetBSD: distinfo,v 1.4 2001/05/28 02:41:54 jlam Exp $ SHA1 (libpng-1.0.11.tar.gz) = 4064bebe256b1b0b5092162c74287b5a2d5a6166 Size (libpng-1.0.11.tar.gz) = 529290 bytes -SHA1 (patch-aa) = 6a6d3ca79ed5bccd0431342f69e5faf25043178e +SHA1 (patch-aa) = d363c81a720831a8ff9e4e23457ec55a36ed045e diff --git a/graphics/png/patches/patch-aa b/graphics/png/patches/patch-aa index f837f4df3fd..47e4bae1cab 100644 --- a/graphics/png/patches/patch-aa +++ b/graphics/png/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.15 2001/05/21 21:39:14 wiz Exp $ +$NetBSD: patch-aa,v 1.16 2001/05/28 02:41:55 jlam Exp $ ---- scripts/makefile.std.orig Wed Dec 8 18:44:40 1999 -+++ scripts/makefile.std +--- scripts/makefile.std.orig Fri Jan 5 19:25:50 2001 ++++ scripts/makefile.std Sun May 27 22:36:02 2001 @@ -3,7 +3,7 @@ # For conditions of distribution and use, see copyright notice in png.h @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.15 2001/05/21 21:39:14 wiz Exp $ -LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm +CC=${LIBTOOL} --mode=compile $(REALCC) +#CFLAGS+=-O # -g -DPNG_DEBUG=5 -+LDFLAGS=libpng.la -lz -lm ++#LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm #RANLIB=echo RANLIB=ranlib @@ -35,12 +35,12 @@ $NetBSD: patch-aa,v 1.15 2001/05/21 21:39:14 wiz Exp $ - ar rc $@ $(OBJS) - $(RANLIB) $@ +libpng.la: $(OBJS) -+ ${LIBTOOL} --mode=link $(REALCC) -o $@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -lz -lm -version-info 2:0 ++ ${LIBTOOL} --mode=link $(REALCC) -o $@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib ${LDFLAGS} -lz -lm -version-info 2:0 -pngtest: pngtest.o libpng.a - $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) +pngtest: pngtest.o libpng.la -+ ${LIBTOOL} --mode=link $(REALCC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) ++ ${LIBTOOL} --mode=link $(REALCC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) libpng.la -lz -lm test: pngtest ./pngtest |