diff options
| author | wiz <wiz> | 2002-03-20 12:42:11 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2002-03-20 12:42:11 +0000 |
| commit | 0e32a5b470724e03d6b7bc67eff70c5aaa16fc8a (patch) | |
| tree | ef814bb054e305f68531eb61c763bdc2e85b644e | |
| parent | 30ce897e2be3527fc734bb85c8152c06062d5483 (diff) | |
| download | pkgsrc-0e32a5b470724e03d6b7bc67eff70c5aaa16fc8a.tar.gz | |
Fix compilation on 1.4.x, and remove a patch that was still referencing
libtool.
| -rw-r--r-- | graphics/netpbm/distinfo | 5 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-aa | 6 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-ac | 13 |
3 files changed, 5 insertions, 19 deletions
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index e35c937eba8..9f930b1f925 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.6 2002/03/15 11:04:29 wiz Exp $ +$NetBSD: distinfo,v 1.7 2002/03/20 12:42:11 wiz Exp $ SHA1 (netpbm-9.25.tgz) = 9c7f6a98348a5f3d6e908b514f33498b2a9c359a Size (netpbm-9.25.tgz) = 2052922 bytes -SHA1 (patch-aa) = b2102349b79b3575ae1f7f85e89b717ea169f8e3 -SHA1 (patch-ac) = c598c7c81d903ccfd0d95af6aa8b9ab72a16a56e +SHA1 (patch-aa) = b8e3b12a2bc9f65c08b0836e8bc384db1ef66b9f diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa index 0f8c4c434d0..84483483834 100644 --- a/graphics/netpbm/patches/patch-aa +++ b/graphics/netpbm/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.16 2002/03/15 11:04:30 wiz Exp $ +$NetBSD: patch-aa,v 1.17 2002/03/20 12:42:12 wiz Exp $ --- Makefile.config.in.orig Thu Mar 14 16:25:54 2002 +++ Makefile.config.in @@ -39,7 +39,7 @@ $NetBSD: patch-aa,v 1.16 2002/03/15 11:04:30 wiz Exp $ ifeq ($(NEED_RUNTIME_PATH),Y) #If the linker is gcc (e.g. NetBSD): -#LDFLAGS += -Wl,--rpath,$(INSTALLLIBS) -+LDFLAGS += -Wl,--rpath,$(INSTALLLIBS) ++LDFLAGS += -Wl,-R$(INSTALLLIBS) #Any other linker: -LDFLAGS += -R$(INSTALLLIBS) +#LDFLAGS += -R$(INSTALLLIBS) @@ -51,7 +51,7 @@ $NetBSD: patch-aa,v 1.16 2002/03/15 11:04:30 wiz Exp $ ifeq ($(NEED_RUNTIME_PATH),Y) #If the linker is gcc (e.g. NetBSD): -#LDSHLIB += -Wl,--rpath,$(INSTALLLIBS) -+LDSHLIB += -Wl,--rpath,$(INSTALLLIBS) ++LDSHLIB += -Wl,-R$(INSTALLLIBS) #Any other linker: -LDSHLIB += -R$(INSTALLLIBS) +#LDSHLIB += -R$(INSTALLLIBS) diff --git a/graphics/netpbm/patches/patch-ac b/graphics/netpbm/patches/patch-ac deleted file mode 100644 index d0162692a2a..00000000000 --- a/graphics/netpbm/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.9 2002/03/15 11:04:30 wiz Exp $ - ---- shhopt/Makefile.orig Tue Jan 29 04:49:21 2002 -+++ shhopt/Makefile -@@ -58,7 +58,7 @@ - -L. -I. -L$(INSTLIBDIR) -I$(INSTINCDIR) -lshhopt - - .c.o: -- $(CC) $(CCSHRD) -o $@ -c $(CCOPT) $< -+ $(LIBTOOL) $(CC) $(CCSHRD) -c $(CCOPT) $< - - depend dep: - $(CC) $(INCDIR) -MM *.c >depend |