From b827288b1d7ee55c5f14488589434aec93cc6068 Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 8 Oct 1999 21:18:32 +0000 Subject: * Remove redundant dependency on jpeg * Update dependency on tiff * Fixes for paths to find libraries and includes --- graphics/netpbm/Makefile | 3 +-- graphics/netpbm/files/patch-sum | 6 +++--- graphics/netpbm/patches/patch-aa | 6 +++--- graphics/netpbm/patches/patch-aj | 25 +++++++++++++------------ graphics/netpbm/pkg/COMMENT | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) (limited to 'graphics/netpbm') diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index a77ed9b4e1b..72fbe058f85 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 1999/10/08 21:12:49 jlam Exp $ +# $NetBSD: Makefile,v 1.31 1999/10/08 21:18:32 jlam Exp $ # DISTNAME= netpbm @@ -15,7 +15,6 @@ DISTFILES= netpbm-1mar1994.tar.gz \ MAINTAINER= packages@netbsd.org DEPENDS+= tiff-*:../../graphics/tiff -DEPENDS+= jpeg-6b:../../graphics/jpeg DEPENDS+= png-1.0.3:../../graphics/png WRKSRC= ${WRKDIR}/netpbm diff --git a/graphics/netpbm/files/patch-sum b/graphics/netpbm/files/patch-sum index a78a4b7a3e4..e1085a06f61 100644 --- a/graphics/netpbm/files/patch-sum +++ b/graphics/netpbm/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.2 1999/07/25 21:17:32 tron Exp $ +$NetBSD: patch-sum,v 1.3 1999/10/08 21:18:33 jlam Exp $ -MD5 (patch-aa) = 9b69ff5a24720e77b0e6391a565e79ac +MD5 (patch-aa) = f9d1403693276cc13314f7f7a2983de2 MD5 (patch-ab) = a97db367123a6fbb1c6e0e1e2b46abcf MD5 (patch-ac) = d5dfa3451fa2f5edabbba9eb0793b628 MD5 (patch-ad) = cb226e447396525f9c3ae59d6bce38e7 @@ -9,7 +9,7 @@ MD5 (patch-af) = 6a85d0d1f1c5fa3fae589efb4631696a MD5 (patch-ag) = 6361f7edc2aa8cb00efb3c4103c8e069 MD5 (patch-ah) = 9ab8ef9eb515652495b37edeac873ab8 MD5 (patch-ai) = ef30cc44cbeed0b94734e1786c8254c9 -MD5 (patch-aj) = 59e12af0eaf6b4e2e8a1070a241d2e07 +MD5 (patch-aj) = da15e4b1c0978c8731d054f409de1317 MD5 (patch-ak) = ed5a8f598d7d2646a47d4db9c9a4f911 MD5 (patch-al) = f4173e292bbc8118042078328b345696 MD5 (patch-am) = 15df0b536fbb0b95cc124cd4dbf03ffa diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa index 0646f430216..15c628dbf33 100644 --- a/graphics/netpbm/patches/patch-aa +++ b/graphics/netpbm/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.7 1999/07/25 21:17:33 tron Exp $ +$NetBSD: patch-aa,v 1.8 1999/10/08 21:18:33 jlam Exp $ --- Makefile.orig Wed Jan 26 06:47:35 1994 +++ Makefile Tue May 4 16:51:11 1999 @@ -17,8 +17,8 @@ $NetBSD: patch-aa,v 1.7 1999/07/25 21:17:33 tron Exp $ TIFFDEF = -DLIBTIFF -TIFFINC = -I../libtiff -TIFFLIB = ../libtiff/libtiff.a -+TIFFINC = -I$(PREFIX)/include -+TIFFLIB = -Wl,-R$(PREFIX)/lib -L$(PREFIX)/lib -ltiff -ljpeg ++TIFFINC = -I$(LOCALBASE)/include ++TIFFLIB = -Wl,-R$(LOCALBASE)/lib -L$(LOCALBASE)/lib -ltiff -ljpeg -lz TIFFBINARIES = tifftopnm pnmtotiff TIFFOBJECTS = tifftopnm.o pnmtotiff.o diff --git a/graphics/netpbm/patches/patch-aj b/graphics/netpbm/patches/patch-aj index c589a682baa..a783b715f76 100644 --- a/graphics/netpbm/patches/patch-aj +++ b/graphics/netpbm/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.2 1999/07/25 21:17:33 tron Exp $ +$NetBSD: patch-aj,v 1.3 1999/10/08 21:18:34 jlam Exp $ ---- pnm/Makefile.orig Mon Jan 31 17:47:32 1994 -+++ pnm/Makefile Mon Jan 11 00:18:48 1999 -@@ -10,27 +10,29 @@ +--- pnm/Makefile.orig Mon Jan 31 11:47:32 1994 ++++ pnm/Makefile Fri Oct 8 13:33:59 1999 +@@ -10,27 +10,30 @@ # implied warranty. # Default values, usually overridden by top-level Makefile. @@ -17,13 +17,14 @@ $NetBSD: patch-aj,v 1.2 1999/07/25 21:17:33 tron Exp $ TIFFDEF = -DLIBTIFF -TIFFINC = -I../libtiff -TIFFLIB = ../libtiff/libtiff.a -+TIFFINC = -I$(PREFIX)/include -+TIFFLIB = -Wl,-R$(PREFIX)/lib -L$(PREFIX)/lib -ltiff -ljpeg ++TIFFINC = -I$(LOCALBASE)/include ++TIFFLIB = -Wl,-R$(LOCALBASE)/lib -L$(LOCALBASE)/lib -ltiff -ljpeg -lz TIFFBINARIES = tifftopnm pnmtotiff TIFFOBJECTS = tifftopnm.o pnmtotiff.o -#LDFLAGS = -s -LDFLAGS = -INSTALLBINARIES = /usr/new/pbm ++PNGLIB = -Wl,-R$(LOCALBASE)/lib -L$(LOCALBASE)/lib -lpng -lz +LDFLAGS = -s +#LDFLAGS = +INSTALLBINARIES = $(PREFIX)/bin @@ -44,7 +45,7 @@ $NetBSD: patch-aj,v 1.2 1999/07/25 21:17:33 tron Exp $ PPMDIR = ../ppm INCLUDEPPM = -I$(PPMDIR) -@@ -54,48 +56,52 @@ +@@ -54,48 +57,52 @@ INCLUDE = -I.. $(INCLUDEPPM) $(INCLUDEPGM) $(INCLUDEPBM) ALLCFLAGS = $(CFLAGS) $(INCLUDE) $(TIFFDEF) $(TIFFINC) LIBPNM = libpnm.a @@ -111,7 +112,7 @@ $NetBSD: patch-aj,v 1.2 1999/07/25 21:17:33 tron Exp $ merge: pnmmerge pnmmerge: pnmmerge.c $(OBJECTS) $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) -@@ -128,16 +134,22 @@ +@@ -128,16 +135,22 @@ # Rules for plain programs. @@ -121,10 +122,10 @@ $NetBSD: patch-aj,v 1.2 1999/07/25 21:17:33 tron Exp $ + $(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@ $@.c $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) + +$(PNGBINARIES): $(DEFPNM) $(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) -+ $(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@ $@.c $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -lpng -lz -lm ++ $(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@ $@.c $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) $(PNGLIB) -lm + +$(TIFFBINARIES): $(DEFPNM) $(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) -+ $(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@ $@.c $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) $(TIFFLIB) -lm -lz ++ $(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@ $@.c $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) $(TIFFLIB) -lm # Rule for math-dependent programs. -$(MATHBINARIES): pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPNM) \ @@ -138,7 +139,7 @@ $NetBSD: patch-aj,v 1.2 1999/07/25 21:17:33 tron Exp $ $(CC) $(ALLCFLAGS) "-Dmain=$*_main" -c $*.c # And libraries. -@@ -153,15 +165,15 @@ +@@ -153,15 +166,15 @@ ar rc $(LIBPNM) libpnm1.o libpnm2.o libpnm3.o libpnm4.o -ranlib $(LIBPNM) @@ -158,7 +159,7 @@ $NetBSD: patch-aj,v 1.2 1999/07/25 21:17:33 tron Exp $ $(CC) $(ALLCFLAGS) -c libpnm4.c # Other dependencies. -@@ -202,6 +214,8 @@ +@@ -202,6 +215,8 @@ tifftopnm tifftopnm.o: tifftopnm.c xwdtopnm xwdtopnm.o: xwdtopnm.c x10wd.h x11wd.h zeisstopnm zeisstopnm.o: zeisstopnm.c diff --git a/graphics/netpbm/pkg/COMMENT b/graphics/netpbm/pkg/COMMENT index 95feafd3b6e..7d5964fce11 100644 --- a/graphics/netpbm/pkg/COMMENT +++ b/graphics/netpbm/pkg/COMMENT @@ -1 +1 @@ -A toolkit for conversion of images between different formats +toolkit for conversion of images between different formats -- cgit v1.2.3