diff options
| author | tron <tron@pkgsrc.org> | 1999-07-25 21:17:32 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 1999-07-25 21:17:32 +0000 |
| commit | 04e96e931d4169cf264f5e233ebedba915f9ef94 (patch) | |
| tree | 986e83b2da35b8f1e990f25ab8c3db9733a839b8 | |
| parent | f4925f502b897fe7983b39166a9c5896ec5f96c8 (diff) | |
| download | pkgsrc-04e96e931d4169cf264f5e233ebedba915f9ef94.tar.gz | |
Fix run time library path. Patches supplied by Dave Huang in PR pkg/8071.
| -rw-r--r-- | graphics/netpbm/files/patch-sum | 6 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-aa | 4 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-aj | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/graphics/netpbm/files/patch-sum b/graphics/netpbm/files/patch-sum index 0981bd10dae..a78a4b7a3e4 100644 --- a/graphics/netpbm/files/patch-sum +++ b/graphics/netpbm/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:10 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/07/25 21:17:32 tron Exp $ -MD5 (patch-aa) = 27a87f72d74f1eeb1a509e4be193c99f +MD5 (patch-aa) = 9b69ff5a24720e77b0e6391a565e79ac 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) = 925d80b4ac2c5699be41c2887c7d39f4 +MD5 (patch-aj) = 59e12af0eaf6b4e2e8a1070a241d2e07 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 f564091c27d..0646f430216 100644 --- a/graphics/netpbm/patches/patch-aa +++ b/graphics/netpbm/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.6 1999/06/03 20:55:55 christos Exp $ +$NetBSD: patch-aa,v 1.7 1999/07/25 21:17:33 tron Exp $ --- Makefile.orig Wed Jan 26 06:47:35 1994 +++ Makefile Tue May 4 16:51:11 1999 @@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.6 1999/06/03 20:55:55 christos Exp $ -TIFFINC = -I../libtiff -TIFFLIB = ../libtiff/libtiff.a +TIFFINC = -I$(PREFIX)/include -+TIFFLIB = -L$(PREFIX)/lib -ltiff -ljpeg ++TIFFLIB = -Wl,-R$(PREFIX)/lib -L$(PREFIX)/lib -ltiff -ljpeg TIFFBINARIES = tifftopnm pnmtotiff TIFFOBJECTS = tifftopnm.o pnmtotiff.o diff --git a/graphics/netpbm/patches/patch-aj b/graphics/netpbm/patches/patch-aj index 8ca3d6cfe41..c589a682baa 100644 --- a/graphics/netpbm/patches/patch-aj +++ b/graphics/netpbm/patches/patch-aj @@ -1,4 +1,4 @@ -$NetBSD: patch-aj,v 1.1 1999/01/10 23:52:16 tron Exp $ +$NetBSD: patch-aj,v 1.2 1999/07/25 21:17:33 tron Exp $ --- pnm/Makefile.orig Mon Jan 31 17:47:32 1994 +++ pnm/Makefile Mon Jan 11 00:18:48 1999 @@ -18,7 +18,7 @@ $NetBSD: patch-aj,v 1.1 1999/01/10 23:52:16 tron Exp $ -TIFFINC = -I../libtiff -TIFFLIB = ../libtiff/libtiff.a +TIFFINC = -I$(PREFIX)/include -+TIFFLIB = -L$(PREFIX)/lib -ltiff -ljpeg ++TIFFLIB = -Wl,-R$(PREFIX)/lib -L$(PREFIX)/lib -ltiff -ljpeg TIFFBINARIES = tifftopnm pnmtotiff TIFFOBJECTS = tifftopnm.o pnmtotiff.o -#LDFLAGS = -s @@ -121,7 +121,7 @@ $NetBSD: patch-aj,v 1.1 1999/01/10 23:52:16 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) -L${LOCALBASE}/lib -lpng -lz -lm ++ $(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@ $@.c $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -lpng -lz -lm + +$(TIFFBINARIES): $(DEFPNM) $(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) + $(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@ $@.c $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) $(TIFFLIB) -lm -lz |