Update to 9.16.

PR:		29178
Submitted by:	Ports Fury

6 files changed, 47 insertions, 31 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 2bf7afae292e..bac21ae38450 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	netpbm
-PORTVERSION=	9.15
+PORTVERSION=	9.16
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,7 +19,7 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		png.4:${PORTSDIR}/graphics/png
 
 USE_GMAKE=	yes
-MAKE_ENV=	LN="${LN}"
+MAKE_ENV=	LN="${LN}" RANLIB="${RANLIB}"
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	merge
 INSTALL_TARGET=	install-merge install-dev
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 952acdee0b79..e31eec000b8d 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1 +1 @@
-MD5 (netpbm-9.15.tgz) = 198ab871d4093777a8825459ce181e05
+MD5 (netpbm-9.16.tgz) = c023bfb5d2cc7c1675b91588b27f4463
diff --git a/graphics/netpbm/files/Makefile.config.FreeBSD b/graphics/netpbm/files/Makefile.config.FreeBSD
index 453e30a6f44c..54d44255d049 100644
--- a/graphics/netpbm/files/Makefile.config.FreeBSD
+++ b/graphics/netpbm/files/Makefile.config.FreeBSD
@@ -12,6 +12,8 @@ JPEGLIB_DIR = ${LOCALBASE}/lib
 JPEGHDR_DIR = ${LOCALBASE}/include
 PNGLIB_DIR = ${LOCALBASE}/lib
 PNGHDR_DIR = ${LOCALBASE}/include
+ZLIB_DIR = /usr/lib
+ZHDR_DIR = /usr/include
 URTLIB_DIR = NONE
 URTHDR_DIR = NONE
 INSTALL_PREFIX = ${PREFIX}
@@ -26,5 +28,7 @@ INSTALLMANUALS5 = $(INSTALL_PREFIX)/man/man5
 SUFFIXMANUALS5 = 5
 INSTALLHDRS = $(INSTALL_PREFIX)/include
 INSTALLDATA = $(INSTALL_PREFIX)/share/netpbm
+LIB_SUFFIX = a
+NETPBMLIBTYPE = unixshared
 NETPBMLIBSUFFIX = so
 SOVER = 1
diff --git a/graphics/netpbm/files/manpages b/graphics/netpbm/files/manpages
index 529328c27b91..394297ea28bd 100644
--- a/graphics/netpbm/files/manpages
+++ b/graphics/netpbm/files/manpages
@@ -32,6 +32,7 @@ MAN1+=	palmtopnm.1
 MAN1+=	pamchannel.1
 MAN1+=	pamcut.1
 MAN1+=	pamfile.1
+MAN1+=	pamoil.1
 MAN1+=	pamtopnm.1
 MAN1+=	pbmclean.1
 MAN1+=	pbmlife.1
@@ -59,10 +60,12 @@ MAN1+=	pbmtolps.1
 MAN1+=	pbmtomacp.1
 MAN1+=	pbmtomda.1
 MAN1+=	pbmtomgr.1
+MAN1+=	pbmtonokia.1
 MAN1+=	pbmtopgm.1
 MAN1+=	pbmtopi3.1
 MAN1+=	pbmtopk.1
 MAN1+=	pbmtoplot.1
+MAN1+=	pbmtopsg3.1
 MAN1+=	pbmtoptx.1
 MAN1+=	pbmtowbmp.1
 MAN1+=	pbmtox10bm.1
@@ -80,7 +83,6 @@ MAN1+=	pgmhist.1
 MAN1+=	pgmkernel.1
 MAN1+=	pgmnoise.1
 MAN1+=	pgmnorm.1
-MAN1+=	pgmoil.1
 MAN1+=	pgmramp.1
 MAN1+=	pgmslice.1
 MAN1+=	pgmtexture.1
@@ -160,6 +162,7 @@ MAN1+=	ppmpat.1
 MAN1+=	ppmquant.1
 MAN1+=	ppmquantall.1
 MAN1+=	ppmqvga.1
+MAN1+=	ppmrainbow.1
 MAN1+=	ppmrelief.1
 MAN1+=	ppmshadow.1
 MAN1+=	ppmshift.1
diff --git a/graphics/netpbm/files/patch-bb b/graphics/netpbm/files/patch-bb
index e020136d8d95..5d6bc74a915f 100644
--- a/graphics/netpbm/files/patch-bb
+++ b/graphics/netpbm/files/patch-bb
@@ -1,6 +1,6 @@
---- Makefile.common.orig	Sun Jun 17 09:58:41 2001
-+++ Makefile.common	Tue Jun 26 00:00:00 2001
-@@ -157,24 +157,21 @@
+--- Makefile.common.orig	Thu Jul 12 14:27:12 2001
++++ Makefile.common	Tue Jul 24 00:00:00 2001
+@@ -157,28 +157,23 @@
  
  $(LIBOBJECTS): %.o: $(SRCSUBDIR)/%.c $(HEADERLINKS)
  # Note that the user may have configured -I options into CFLAGS.
@@ -12,28 +12,33 @@
 -SONAME = lib$(LIBROOT).so.$(MAJ)
 +SONAME = lib$(LIBROOT).so.$(SOVER)
  
+ ifeq ($(NETPBMLIBTYPE),unixshared)
  # The libxxx.so link is needed to link the executables.
- lib$(LIBROOT).so: $(SONAME)
+ lib$(LIBROOT).$(NETPBMLIBSUFFIX): $(SONAME)
  	rm -f $@
  	$(SYMLINK) $< $@
 -# The $(SONAME) link is only needed to test the programs without
 -# installing the libraries (in that case, you also need to direct the 
 -# dynamic linker to the source directories, e.g. set LD_LIBRARY_PATH).
--$(SONAME): lib$(LIBROOT).so.$(MAJ).$(MIN)
+-$(SONAME): lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ).$(MIN)
 -	rm -f $@
 -	$(SYMLINK) $< $@
--lib$(LIBROOT).so.$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) \
--                                $(LIBOPT)
+-lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): \
+-    $(LIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT)
 -	$(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
 -          `$(LIBOPT) $(LIBLIBS)` -lc $(CDEBUG)
-+$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) \
-+                                $(LIBOPT) lib$(LIBROOT).a
+-endif
+-ifeq ($(NETPBMLIBTYPE),unixstatic)
+-lib$(LIBROOT).$(NETPBMLIBSUFFIX): $(LIBOBJECTS) $(LIBOBJECTS_X)
++$(SONAME): lib$(LIBROOT).$(LIB_SUFFIX) \
++    $(SHLIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT)
 +	$(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \
 +          `$(LIBOPT) $(LIBLIBS)` $(LDFLAGS) $(CDEBUG)
- 
- # Static library. 
- lib$(LIBROOT).a: $(LIBOBJECTS) $(LIBOBJECTS_X)
-@@ -215,7 +212,7 @@
++lib$(LIBROOT).$(LIB_SUFFIX): $(LIBOBJECTS) $(LIBOBJECTS_X)
+ 	-rm -f $@
+ 	ar rc $@ $(LIBOBJECTS) $(LIBOBJECTS_X)
+ ifneq ($(RANLIB)x,x)
+@@ -238,7 +233,7 @@
  install.merge.common: $(MERGENAME) $(NOMERGEBINARIES) install.script
  	cd $(INSTALLBINARIES) ; rm -f $(BINARIES) $(MERGE_ALIASES)
  ifneq ($(MERGENAME)x,x)
@@ -42,7 +47,7 @@
              $(MERGENAME) $(INSTALLBINARIES)
  	cd $(INSTALLBINARIES) ; \
  	   for i in $(MERGEBINARIES) $(MERGE_ALIASES) ; \
-@@ -225,7 +222,7 @@
+@@ -248,7 +243,7 @@
  ifneq ($(NOMERGEBINARIES)x,x)
  	for x in $(NOMERGEBINARIES); \
          do \
@@ -51,7 +56,7 @@
                 $$x $(INSTALLBINARIES); \
  	done
  endif
-@@ -236,7 +233,7 @@
+@@ -259,7 +254,7 @@
  # Make and Install know that pbmmake.exe counts as pbmmake.
  	for x in $(BINARIES); \
  	do \
@@ -60,7 +65,7 @@
                 $$x $(INSTALLBINARIES); \
  	done
  
-@@ -245,7 +242,7 @@
+@@ -268,7 +263,7 @@
  ifneq ($(SCRIPTS)x,x)
  	for x in $(SCRIPTS); \
  	do \
@@ -69,7 +74,7 @@
                 $(INSTALLSCRIPTS); \
  	done
  endif
-@@ -282,7 +279,7 @@
+@@ -305,7 +300,7 @@
  # directory when you compile your programs.
  	for x in $(INTERFACE_HEADERS); \
  	do \
@@ -78,25 +83,26 @@
                 $(INSTALLHDRS); \
  	done
  
-@@ -290,17 +287,16 @@
+@@ -313,17 +308,17 @@
  #
  .PHONY: install.staticlib
- install.staticlib: lib$(LIBROOT).a
+ install.staticlib: lib$(LIBROOT).$(LIB_SUFFIX)
 -	$(INSTALL) -c -m $(INSTALL_PERM_LIBS) $< $(INSTALLLIBS)/$<
 +	${BSD_INSTALL_DATA} $< $(INSTALLLIBS)/$<
  
  .PHONY: install.lib.common
- ifeq ($(NETPBMLIBSUFFIX),so)
+ ifeq ($(NETPBMLIBTYPE),unixshared)
  # install a Unix-style shared library
--install.lib.common: lib$(LIBROOT).so.$(MAJ).$(MIN) 
--	cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so.$(MAJ).*
+-install.lib.common: lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) 
+-	cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ).*
 -	$(INSTALL) -c -m $(INSTALL_PERM_LIBD) $< $(INSTALLLIBS)
 +install.lib.common: $(SONAME)
-+	cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so.*
++	cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).$(NETPBMLIBSUFFIX).*
 +	${BSD_INSTALL_DATA} $< $(INSTALLLIBS)
  	cd $(INSTALLLIBS) ; \
-           rm -f lib$(LIBROOT).so; $(SYMLINK) $< lib$(LIBROOT).so
--	cd $(INSTALLLIBS) ; rm -f $(SONAME); $(SYMLINK) $< $(SONAME)
+           rm -f lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ); \
+-          $(SYMLINK) $< lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ)
++          $(SYMLINK) $< lib$(LIBROOT).$(NETPBMLIBSUFFIX)
  endif
- ifeq ($(NETPBMLIBSUFFIX),dll)
+ ifeq ($(NETPBMLIBTYPE),dll)
  #install a Windows DLL shared library
diff --git a/graphics/netpbm/pkg-plist b/graphics/netpbm/pkg-plist
index 03ca82e45497..e03b23dfc28b 100644
--- a/graphics/netpbm/pkg-plist
+++ b/graphics/netpbm/pkg-plist
@@ -32,6 +32,7 @@ bin/palmtopnm
 bin/pamchannel
 bin/pamcut
 bin/pamfile
+bin/pamoil
 bin/pamtopnm
 bin/pbmclean
 bin/pbmlife
@@ -60,10 +61,12 @@ bin/pbmtolps
 bin/pbmtomacp
 bin/pbmtomda
 bin/pbmtomgr
+bin/pbmtonokia
 bin/pbmtopgm
 bin/pbmtopi3
 bin/pbmtopk
 bin/pbmtoplot
+bin/pbmtopsg3
 bin/pbmtoptx
 bin/pbmtowbmp
 bin/pbmtox10bm
@@ -82,7 +85,6 @@ bin/pgmkernel
 bin/pgmmerge
 bin/pgmnoise
 bin/pgmnorm
-bin/pgmoil
 bin/pgmramp
 bin/pgmslice
 bin/pgmtexture
@@ -165,6 +167,7 @@ bin/ppmpat
 bin/ppmquant
 bin/ppmquantall
 bin/ppmqvga
+bin/ppmrainbow
 bin/ppmrelief
 bin/ppmshadow
 bin/ppmshift