summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchristos <christos>1999-06-03 20:55:55 +0000
committerchristos <christos>1999-06-03 20:55:55 +0000
commitfa9e3122376049f0e67d724c3eda3ad56ae3093c (patch)
tree632af122fe91be8acdb9246e3cc4f981237626e6
parent6356138fea0525bac7534a245f9bf5664f0d8d48 (diff)
downloadpkgsrc-fa9e3122376049f0e67d724c3eda3ad56ae3093c.tar.gz
This has been broken forever. In order to compile other pbm programs
using the includes and the libraries in the pkg you need to include pbmplus.h... fix the Makefile to install it and add it to the plist.
-rw-r--r--graphics/netpbm/patches/patch-aa11
-rw-r--r--graphics/netpbm/pkg/PLIST3
2 files changed, 8 insertions, 6 deletions
diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa
index d2a025e598d..f564091c27d 100644
--- a/graphics/netpbm/patches/patch-aa
+++ b/graphics/netpbm/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.5 1999/01/10 23:52:15 tron Exp $
+$NetBSD: patch-aa,v 1.6 1999/06/03 20:55:55 christos Exp $
---- Makefile.orig Wed Jan 26 12:47:35 1994
-+++ Makefile Mon Jan 11 00:17:07 1999
+--- Makefile.orig Wed Jan 26 06:47:35 1994
++++ Makefile Tue May 4 16:51:11 1999
@@ -21,7 +21,7 @@
#CC = gcc -ansi -pedantic -fcombine-regs -fpcc-struct-return
@@ -84,7 +84,7 @@ $NetBSD: patch-aa,v 1.5 1999/01/10 23:52:15 tron Exp $
done
merge:
-@@ -113,15 +116,19 @@
+@@ -113,15 +116,20 @@
done
install.bin:
@@ -92,6 +92,7 @@ $NetBSD: patch-aa,v 1.5 1999/01/10 23:52:15 tron Exp $
+# -mkdir $(INSTALLBINARIES)
+# -mkdir $(INSTALLLIBS)
+# -mkdir $(INSTALLDEFS)
++ $(MANCP) pbmplus.h $(INSTALLDEFS)
for i in $(SUBDIRS) ; do \
- ( echo $$i ; cd $$i ; $(MAKE) $(MFLAGS) 'CC=$(CC)' 'CFLAGS=$(CFLAGS)' 'TIFFDEF=$(TIFFDEF)' 'TIFFINC=$(TIFFINC)' 'TIFFLIB=$(TIFFLIB)' 'TIFFBINARIES=$(TIFFBINARIES)' 'TIFFOBJECTS=$(TIFFOBJECTS)' 'LDFLAGS=$(LDFLAGS)' 'INSTALLBINARIES=$(INSTALLBINARIES)' 'INSTALLSCRIPTS=$(INSTALLSCRIPTS)' install.bin ); \
+ ( echo $$i ; cd $$i ; $(MAKE) $(MFLAGS) 'CC=$(CC)' 'CFLAGS=$(CFLAGS)' 'TIFFDEF=$(TIFFDEF)' 'TIFFINC=$(TIFFINC)' 'TIFFLIB=$(TIFFLIB)' 'TIFFBINARIES=$(TIFFBINARIES)' 'TIFFOBJECTS=$(TIFFOBJECTS)' 'LDFLAGS=$(LDFLAGS)' 'INSTALLBINARIES=$(INSTALLBINARIES)' 'INSTALLSCRIPTS=$(INSTALLSCRIPTS)' 'INSTALLLIBS=$(INSTALLLIBS)' 'INSTALLDEFS=$(INSTALLDEFS)' install.bin ); \
@@ -108,7 +109,7 @@ $NetBSD: patch-aa,v 1.5 1999/01/10 23:52:15 tron Exp $
done
install.man:
-@@ -131,7 +138,7 @@
+@@ -131,7 +139,7 @@
clean:
rm -f *.shar *.shar? art.* *~
diff --git a/graphics/netpbm/pkg/PLIST b/graphics/netpbm/pkg/PLIST
index 1946543d0d4..24df753a439 100644
--- a/graphics/netpbm/pkg/PLIST
+++ b/graphics/netpbm/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 1998/11/12 23:26:58 tron Exp $
+@comment $NetBSD: PLIST,v 1.6 1999/06/03 20:55:56 christos Exp $
bin/anytopnm
bin/asciitopgm
bin/atktopbm
@@ -179,6 +179,7 @@ bin/ybmtopbm
bin/yuvsplittoppm
bin/yuvtoppm
bin/zeisstopnm
+include/pbmplus.h
include/pbm.h
include/pgm.h
include/pnm.h