Update to 9.4.

PR:		19149
Submitted by:	pseudo-maintainer

4 files changed, 16 insertions, 59 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index e715663640e2..2bd9b787bde5 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	netpbm
-PORTVERSION=	9.3
+PORTVERSION=	9.4
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.sourceforge.net/netpbm/
 EXTRACT_SUFX=	.tgz
@@ -22,7 +22,9 @@ MAKEFILE=	GNUmakefile
 ALL_TARGET=	merge
 INSTALL_TARGET=	install-merge install-dev
 
-.include "files/manpages"
+.include <bsd.port.pre.mk>
+
+.include "${FILESDIR}/manpages"
 
 post-patch:
 	@${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/pbmplus.h
@@ -30,4 +32,4 @@ post-patch:
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 38a3f0ee1e53..d812350a1e01 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1 +1 @@
-MD5 (netpbm-9.3.tgz) = bd50468014c62cdf5f1fdd48ffb9a10c
+MD5 (netpbm-9.4.tgz) = 18ce92e1b0b9fd4cea374eccc90abc8a
diff --git a/graphics/netpbm/files/patch-ba b/graphics/netpbm/files/patch-ba
index ef2f9c1fa8bc..0463400c2675 100644
--- a/graphics/netpbm/files/patch-ba
+++ b/graphics/netpbm/files/patch-ba
@@ -1,57 +1,12 @@
---- GNUmakefile.orig	Thu May 25 02:00:10 2000
-+++ GNUmakefile	Sat Jun  3 00:00:00 2000
-@@ -79,21 +79,21 @@
- 
- .PHONY: install.bin
- install.bin:
--	mkinstalldirs $(INSTALLBINARIES)
-+	-mkdir -p $(INSTALLBINARIES)
- 	for i in $(SUBDIRS) ; do \
- 	    ( echo install.bin.$$i ; cd $$i ; $(MAKE) install.bin ); \
- 	done
- 
- .PHONY: install-merge
- install.merge:
--	mkinstalldirs $(INSTALLBINARIES)
-+	-mkdir -p $(INSTALLBINARIES)
- 	for i in $(SUBDIRS) ; do \
- 	    ( echo install.merge.$$i ; cd $$i ; $(MAKE) install.merge ); \
- 	done
- 
- .PHONY: install.lib
- install.lib:
--	mkinstalldirs $(INSTALLLIBS)
-+	-mkdir -p $(INSTALLLIBS)
- 	for i in $(SUBDIRS) ; do \
- 	    ( echo install.lib.$$i ; cd $$i ; $(MAKE) install.lib ); \
- 	done
-@@ -104,7 +104,7 @@
- 
- .PHONY: install.man
- install.man:
--	mkinstalldirs \
-+	-mkdir -p \
- 	    $(INSTALLMANUALS1) $(INSTALLMANUALS3) $(INSTALLMANUALS5)
- 	for i in $(SUBDIRS) ; do \
- 	    ( echo install.man.$$i ; cd $$i ; $(MAKE) install.man ); \
-@@ -115,9 +115,8 @@
- 
+--- GNUmakefile.orig	Mon Jun  5 13:30:53 2000
++++ GNUmakefile	Sat Jun 10 00:00:00 2000
+@@ -116,8 +116,7 @@
  .PHONY: install.hdr
  install.hdr:
--	mkinstalldirs $(INSTALLHDRS)
+ 	./mkinstalldirs $(INSTALLHDRS)
 -	$(INSTALL) -c -m$(INSTALL_PERM_HDR) pbmplus.h $(INSTALLHDRS)
 -	$(INSTALL) -c -m$(INSTALL_PERM_HDR) shhopt/shhopt.h $(INSTALLHDRS)
-+	-mkdir -p $(INSTALLHDRS)
 +	${BSD_INSTALL_DATA} pbmplus.h $(INSTALLHDRS)
  	for i in $(SUBDIRS) ; do \
- 	    ( echo install.hdr.$$i ; cd $$i ; $(MAKE) install.hdr ); \
- 	done
-@@ -128,7 +127,7 @@
- 
- .PHONY: install.staticlib
- install.staticlib:
--	mkinstalldirs $(INSTALLLIBS)
-+	-mkdir -p $(INSTALLLIBS)
- 	for i in $(SUBDIRS) ; do \
- 	    (echo install.staticlib.$$i; cd $$i; $(MAKE) install.staticlib ); \
+ 	    $(MAKE) -C $$i install.hdr ; \
  	done
diff --git a/graphics/netpbm/files/patch-bc b/graphics/netpbm/files/patch-bc
index 3bdf5ff179ba..d109dcf2d5b9 100644
--- a/graphics/netpbm/files/patch-bc
+++ b/graphics/netpbm/files/patch-bc
@@ -1,5 +1,5 @@
---- Makefile.config.orig	Fri Jun  2 02:17:32 2000
-+++ Makefile.config	Sat Jun  3 00:00:00 2000
+--- Makefile.config.orig	Mon Jun  5 08:08:43 2000
++++ Makefile.config	Sat Jun 10 00:00:00 2000
 @@ -39,7 +39,7 @@
  #Tru64:
  #CC =		cc
@@ -27,15 +27,15 @@
  # On DEC Tru64 4.0F (at least), you need -DLONG_32 for ppmtompeg.
  #Tru64:
  #CFLAGS = -O2 -std1 DLONG_32 $(CDEBUG)
-@@ -124,7 +124,7 @@
+@@ -123,7 +123,7 @@
+ # independent code, so you need -fpic or fPIC here.  (The rule is: if 
  # -fpic works, use it.  If it bombs, go to fPIC).
- # SunOS and NetBSD require this.
  
 -CFLAGS_SHLIB = 
 +CFLAGS_SHLIB = -fPIC -DPIC
+ # Solaris, SunOS, and NetBSD:
  #CFLAGS_SHLIB = -fpic
  #CFLAGS_SHLIB = -fPIC
- 
 @@ -142,8 +142,8 @@
  TIFFHDR_DIR = $(SRCDIR)/libtiff
  TIFFLIB_DIR = $(SRCDIR)/libtiff