diff options
| author | jlam <jlam> | 2001-06-16 19:50:57 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-06-16 19:50:57 +0000 |
| commit | e2f48cab96965233217f708959d8d75035e32594 (patch) | |
| tree | 99320549cecfb7f8c85c874987b3ac016e76f4b9 /graphics | |
| parent | ed14eff6fb73bff4701f2ec9968e4782db00e005 (diff) | |
| download | pkgsrc-e2f48cab96965233217f708959d8d75035e32594.tar.gz | |
Convrt to use buildlink.mk.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/netpbm/Makefile | 8 | ||||
| -rw-r--r-- | graphics/netpbm/distinfo | 4 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-aa | 18 |
3 files changed, 15 insertions, 15 deletions
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 2fcc1c8b20e..84fb5d33e0e 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2001/05/22 09:32:22 wiz Exp $ +# $NetBSD: Makefile,v 1.56 2001/06/16 19:50:57 jlam Exp $ DISTNAME= netpbm-9.7 CATEGORIES= graphics @@ -9,9 +9,6 @@ MAINTAINER= tron@netbsd.org HOMEPAGE= http://netpbm.sourceforge.net/ COMMENT= toolkit for conversion of images between different formats -DEPENDS+= tiff>=3.5.4:../../graphics/tiff -DEPENDS+= png>=1.0.11:../../graphics/png - USE_GMAKE= yes USE_LIBTOOL= yes @@ -25,6 +22,9 @@ MAKEFILE= GNUmakefile CFLAGS= .endif +.include "../../graphics/png/buildlink.mk" +.include "../../graphics/tiff/buildlink.mk" + .if (${OPSYS} == SunOS) MAKE_ENV+= NETWORKLD="-lsocket -lnsl" .else diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index ef046a4b9a4..47bd394ccbd 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 09:54:21 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/06/16 19:50:57 jlam Exp $ SHA1 (netpbm-9.7.tgz) = 81b42fc267970777b0062cc01edb09907930a1c7 Size (netpbm-9.7.tgz) = 1942307 bytes -SHA1 (patch-aa) = a3e6ae9cc8d7aa3457318bacc18ee329ef114498 +SHA1 (patch-aa) = 2f8010fd5b14be20ca5ba3187a59c43a14f99cfd SHA1 (patch-ab) = abc5ee8778d84a15d958014ed12a0fa56e649056 SHA1 (patch-ac) = c61bdaa9b7516b81ad02ab55a9113bac8fe99b62 SHA1 (patch-ad) = 2bb69d6408b76707d8501de88bb27df6da1fc0c7 diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa index 0a194df334e..7f29a6dc58b 100644 --- a/graphics/netpbm/patches/patch-aa +++ b/graphics/netpbm/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.12 2001/01/14 13:17:55 tron Exp $ +$NetBSD: patch-aa,v 1.13 2001/06/16 19:50:57 jlam Exp $ ---- Makefile.config~ Thu Jun 22 19:48:03 2000 -+++ Makefile.config Sun Jan 14 14:09:14 2001 +--- Makefile.config.orig Thu Jun 22 13:48:03 2000 ++++ Makefile.config Fri Jun 15 17:42:45 2001 @@ -29,8 +29,8 @@ # # For cygwin, only static libraries work, so set STATICLIB = Y . @@ -75,8 +75,8 @@ $NetBSD: patch-aa,v 1.12 2001/01/14 13:17:55 tron Exp $ #NetBSD: -#TIFFHDR_DIR = $(LOCALBASE)/include -#TIFFLIB_DIR = $(LOCALBASE)/lib -+TIFFHDR_DIR = $(LOCALBASE)/include -+TIFFLIB_DIR = $(LOCALBASE)/lib ++TIFFHDR_DIR = ${BUILDLINK_DIR}/include ++TIFFLIB_DIR = ${BUILDLINK_DIR}/lib # OSF, Tru64: #TIFFHDR_DIR = /usr/local1/DEC/include #TIFFLIB_DIR = /usr/local1/DEC/lib @@ -91,8 +91,8 @@ $NetBSD: patch-aa,v 1.12 2001/01/14 13:17:55 tron Exp $ # Netbsd: -#JPEGLIB_DIR = ${LOCALBASE}/lib -#JPEGHDR_DIR = ${LOCALBASE}/include -+JPEGLIB_DIR = ${LOCALBASE}/lib -+JPEGHDR_DIR = ${LOCALBASE}/include ++JPEGLIB_DIR = ${BUILDLINK_DIR}/lib ++JPEGHDR_DIR = ${BUILDLINK_DIR}/include # OSF, Tru64: #JPEGLIB_DIR = /usr/local1/DEC/lib #JPEGHDR_DIR = /usr/local1/DEC/include @@ -107,8 +107,8 @@ $NetBSD: patch-aa,v 1.12 2001/01/14 13:17:55 tron Exp $ # NetBSD: -#PNGLIB_DIR = $(LOCALBASE)/lib -#PNGHDR_DIR = $(LOCALBASE)/include -+PNGLIB_DIR = $(LOCALBASE)/lib -+PNGHDR_DIR = $(LOCALBASE)/include ++PNGLIB_DIR = ${BUILDLINK_LIBDIR}/lib ++PNGHDR_DIR = ${BUILDLINK_LIBDIR}/include # OSF/Tru64: #PNGLIB_DIR = /usr/local1/DEC/lib #PNGHDR_DIR = /usr/local1/DEC/include |