5 files changed, 21 insertions, 17 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index d32cff8161d0..62d6606a3c98 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	netpbm
-PORTVERSION=	10.17
+PORTVERSION=	10.19
 PORTREVISION?=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 1d4869eacd5f..ab2214d8701f 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1 +1 @@
-MD5 (netpbm-10.17.tgz) = 2d806c5a71eda87792a8e2754600deba
+MD5 (netpbm-10.19.tgz) = e6bf74f0cef5271041e0ee4842c8fcef
diff --git a/graphics/netpbm/files/patch-converter::other::pnmtopng.c b/graphics/netpbm/files/patch-converter-other-pnmtopng.c
index 9a5fbf3a7037..9a5fbf3a7037 100644
--- a/graphics/netpbm/files/patch-converter::other::pnmtopng.c
+++ b/graphics/netpbm/files/patch-converter-other-pnmtopng.c
diff --git a/graphics/netpbm/files/patch-lib::Makefile b/graphics/netpbm/files/patch-lib-Makefile
index 95d954d6ec69..2b480b273929 100644
--- a/graphics/netpbm/files/patch-lib::Makefile
+++ b/graphics/netpbm/files/patch-lib-Makefile
@@ -1,5 +1,5 @@
---- lib/Makefile.orig	Wed Oct  9 11:21:57 2002
-+++ lib/Makefile	Sat Oct 12 00:00:00 2002
+--- lib/Makefile.orig	Thu Sep 25 18:23:47 2003
++++ lib/Makefile	Mon Dec  1 14:28:48 2003
 @@ -32,12 +32,14 @@
  # Library objects to be linked but not built by Makefile.common:
  LIBOBJECTS_X = util/shhopt.o util/nstring.o
@@ -10,14 +10,12 @@
  MANUALS5 = pbm pgm ppm pnm pam
  
  INTERFACE_HEADERS =  pm.h pbm.h bitio.h pbmfont.h \
--	pgm.h ppm.h ppm.h ppmcmap.h ppmfloyd.h colorname.h \
--	pnm.h pam.h pammap.h util/shhopt.h util/nstring.h
-+	pgm.h ppm.h ppm.h ppmcmap.h ppmdraw.h ppmfloyd.h colorname.h \
-+	pnm.h pam.h pammap.h util/pm_shhopt.h util/pm_nstring.h
+ 	pgm.h ppm.h ppm.h ppmcmap.h ppmfloyd.h colorname.h \
+ 	pnm.h pam.h pammap.h util/shhopt.h util/nstring.h util/mallocvar.h
  
  DATAFILES = rgb.txt
  
-@@ -69,12 +71,15 @@
+@@ -71,12 +71,15 @@
  
  $(LIBOBJECTS): %.o: %.c $(HEADERLINKS)
  # Note that the user may have configured -I options into CFLAGS.
@@ -29,12 +27,12 @@
  MAJ = $(NETPBM_MAJOR_RELEASE)
  MIN = $(NETPBM_MINOR_RELEASE)
  
--SONAME = libnetpbm.so.$(MAJ)
-+SONAME = libnetpbm.so.$(SOVER)
+-SONAME = libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ)
++SONAME = libnetpbm.$(NETPBMLIBSUFFIX).$(SOVER)
  
  ifeq ($(NETPBMLIBTYPE),irixshared)
  # The libxxx.so link is needed to link the executables.
-@@ -98,11 +103,8 @@
+@@ -101,11 +104,8 @@
  # The $(SONAME) link is needed only 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).
@@ -48,7 +46,7 @@
            $(SHLIB_CLIB) $(LADD)
  endif
  
-@@ -180,13 +182,10 @@
+@@ -183,13 +183,10 @@
  .PHONY: install.lib
  ifeq ($(NETPBMLIBTYPE),unixshared)
  # install a Unix-style shared library
@@ -66,7 +64,7 @@
  endif
  ifeq ($(NETPBMLIBTYPE),dll)
  #install a Windows DLL shared library
-@@ -216,23 +215,23 @@
+@@ -219,23 +216,23 @@
  # directory when you compile your programs.
  
  %_installhdr: $(PKGDIR)/include
diff --git a/graphics/netpbm/pkg-plist b/graphics/netpbm/pkg-plist
index 41413aab3f36..4b70c739e9af 100644
--- a/graphics/netpbm/pkg-plist
+++ b/graphics/netpbm/pkg-plist
@@ -8,6 +8,8 @@ bin/bmptopnm
 bin/bmptoppm
 bin/brushtopbm
 bin/cmuwmtopbm
+bin/ddbugtopbm
+bin/escp2topbm
 bin/eyuvtoppm
 bin/fiascotopnm
 bin/fitstopnm
@@ -31,6 +33,7 @@ bin/macptopbm
 bin/manweb
 bin/mdatopbm
 bin/mgrtopbm
+bin/mrftopbm
 bin/mtvtoppm
 bin/neotoppm
 bin/palmtopnm
@@ -74,6 +77,7 @@ bin/pbmtobbnbg
 bin/pbmtocmuwm
 bin/pbmtoepsi
 bin/pbmtoepson
+bin/pbmtoescp2
 bin/pbmtog3
 bin/pbmtogem
 bin/pbmtogo
@@ -82,8 +86,10 @@ bin/pbmtolj
 bin/pbmtoln03
 bin/pbmtolps
 bin/pbmtomacp
+bin/pbmtomatrixorbital
 bin/pbmtomda
 bin/pbmtomgr
+bin/pbmtomrf
 bin/pbmtonokia
 bin/pbmtopgm
 bin/pbmtopi3
@@ -270,6 +276,9 @@ bin/yuvtoppm
 bin/zeisstopnm
 include/bitio.h
 include/colorname.h
+include/mallocvar.h
+include/nstring.h
+include/shhopt.h
 include/pam.h
 include/pammap.h
 include/pbm.h
@@ -277,12 +286,9 @@ include/pbmfont.h
 include/pgm.h
 include/pm.h
 include/pm_config.h
-include/pm_nstring.h
-include/pm_shhopt.h
 include/pnm.h
 include/ppm.h
 include/ppmcmap.h
-include/ppmdraw.h
 include/ppmfloyd.h
 lib/libnetpbm.a
 lib/libnetpbm.so