Upgrade to 9.9

PR: 23386
Submitted by: Ports Fury

18 files changed, 347 insertions, 154 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 7b8023b..0c4f64c 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	netpbm
-PORTVERSION=	9.8
+PORTVERSION=	9.9
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 54b30cc..be8cc83 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1 +1 @@
-MD5 (netpbm-9.8.tgz) = 8aa1beded016f8dd9da13400d660ae68
+MD5 (netpbm-9.9.tgz) = dd80d319eaad3ad9930e9078dee20219
diff --git a/graphics/netpbm/files/manpages b/graphics/netpbm/files/manpages
index e0a0812..c7c0823 100644
--- a/graphics/netpbm/files/manpages
+++ b/graphics/netpbm/files/manpages
@@ -6,6 +6,7 @@ MAN1+=	bmptoppm.1
 MAN1+=	brushtopbm.1
 MAN1+=	cmuwmtopbm.1
 MAN1+=	eyuvtoppm.1
+MAN1+=	fiascotopnm.1
 MAN1+=	fitstopnm.1
 MAN1+=	fstopgm.1
 MAN1+=	g3topbm.1
@@ -17,6 +18,7 @@ MAN1+=	hpcdtoppm.1
 MAN1+=	icontopbm.1
 MAN1+=	ilbmtoppm.1
 MAN1+=	imgtoppm.1
+MAN1+=	jbigtopnm.1
 MAN1+=	jpegtopnm.1
 MAN1+=	leaftoppm.1
 MAN1+=	lispmtopgm.1
@@ -58,6 +60,7 @@ MAN1+=	pbmtopgm.1
 MAN1+=	pbmtopi3.1
 MAN1+=	pbmtopk.1
 MAN1+=	pbmtoplot.1
+MAN1+=	pbmtoppa.1
 MAN1+=	pbmtoptx.1
 MAN1+=	pbmtowbmp.1
 MAN1+=	pbmtox10bm.1
@@ -110,14 +113,18 @@ MAN1+=	pnmmargin.1
 MAN1+=	pnmnlfilt.1
 MAN1+=	pnmpad.1
 MAN1+=	pnmpaste.1
+MAN1+=	pnmpsnr.1
 MAN1+=	pnmrotate.1
 MAN1+=	pnmscale.1
+MAN1+=	pnmscalefixed.1
 MAN1+=	pnmshear.1
 MAN1+=	pnmsmooth.1
 MAN1+=	pnmsplit.1
 MAN1+=	pnmtile.1
 MAN1+=	pnmtoddif.1
+MAN1+=	pnmtofiasco.1
 MAN1+=	pnmtofits.1
+MAN1+=	pnmtojbig.1
 MAN1+=	pnmtoplainpnm.1
 MAN1+=	pnmtopng.1
 MAN1+=	pnmtops.1
@@ -160,8 +167,10 @@ MAN1+=	ppmtoicr.1
 MAN1+=	ppmtoilbm.1
 MAN1+=	ppmtojpeg.1
 MAN1+=	ppmtoleaf.1
+MAN1+=	ppmtolj.1
 MAN1+=	ppmtomap.1
 MAN1+=	ppmtomitsu.1
+MAN1+=	ppmtompeg.1
 MAN1+=	ppmtopcx.1
 MAN1+=	ppmtopgm.1
 MAN1+=	ppmtopi1.1
diff --git a/graphics/netpbm/files/patch-ay b/graphics/netpbm/files/patch-ay
index eb200a8..20fd64f 100644
--- a/graphics/netpbm/files/patch-ay
+++ b/graphics/netpbm/files/patch-ay
@@ -1,12 +1,15 @@
---- pnm/pnmtotiffcmyk.c.orig	Wed Apr 26 13:25:15 2000
-+++ pnm/pnmtotiffcmyk.c	Mon May  8 00:00:00 2000
-@@ -71,7 +71,9 @@
+--- pnm/pnmtotiffcmyk.c.orig	Sat May 13 09:29:45 2000
++++ pnm/pnmtotiffcmyk.c	Fri Dec  8 00:00:00 2000
+@@ -71,8 +71,12 @@
  #define VERSION 1.01
  
  /* beware - these evaluate more than once */
-+#undef MAX
++#ifndef MAX
  #define MAX(x, y) ( ( x ) > ( y ) ? ( x ) : ( y ) )
-+#undef MIN
++#endif
++#ifndef MIN
  #define MIN(x, y) ( ( x ) < ( y ) ? ( x ) : ( y ) )
++#endif
  
  /* only support 8 bit values */
+ #define MAXTIFFBITS 8
diff --git a/graphics/netpbm/files/patch-bb b/graphics/netpbm/files/patch-bb
index 3af78b7..5cab491 100644
--- a/graphics/netpbm/files/patch-bb
+++ b/graphics/netpbm/files/patch-bb
@@ -1,5 +1,5 @@
---- Makefile.common.orig	Sat Sep  2 12:31:58 2000
-+++ Makefile.common	Tue Sep  5 00:00:00 2000
+--- Makefile.common.orig	Sun Dec  3 07:36:01 2000
++++ Makefile.common	Fri Dec  8 00:00:00 2000
 @@ -115,24 +115,20 @@
  
  $(LIBOBJECTS): %.o: $(SRCSUBDIR)/%.c
@@ -36,30 +36,30 @@
  install.merge.common: $(MERGENAME) $(NOMERGEBINARIES) install.script
  	cd $(INSTALLBINARIES) ; rm -f $(BINARIES) $(MERGE_ALIASES)
  ifneq ($(MERGENAME)x,x)
--	$(INSTALL) -c -s -m $(INSTALL_PERM_BIN) $(MERGENAME) $(INSTALLBINARIES)
-+	${BSD_INSTALL_PROGRAM} $(MERGENAME) $(INSTALLBINARIES)
+-	$(INSTALL) -c $(STRIPFLAG) -m $(INSTALL_PERM_BIN) \
++	${BSD_INSTALL_PROGRAM} \
+             $(MERGENAME) $(INSTALLBINARIES)
  	cd $(INSTALLBINARIES) ; \
  	   for i in $(MERGEBINARIES) $(MERGE_ALIASES) ; \
-              do ln -s $(MERGENAME)$(EXE) $$i ; \
-@@ -171,7 +167,7 @@
+@@ -172,7 +168,7 @@
  ifneq ($(NOMERGEBINARIES)x,x)
  	for x in $(NOMERGEBINARIES); \
          do \
--           $(INSTALL) -c -s -m $(INSTALL_PERM_BIN) $$x $(INSTALLBINARIES); \
-+           ${BSD_INSTALL_PROGRAM} $$x $(INSTALLBINARIES); \
+-           $(INSTALL) -c $(STRIPFLAG) -m $(INSTALL_PERM_BIN) \
++           ${BSD_INSTALL_PROGRAM} \
+                $$x $(INSTALLBINARIES); \
  	done
  endif
- 
-@@ -181,7 +177,7 @@
+@@ -183,7 +179,7 @@
  # Make and Install know that pbmmake.exe counts as pbmmake.
  	for x in $(BINARIES); \
  	do \
--	   $(INSTALL) -c -s -m $(INSTALL_PERM_BIN) $$x $(INSTALLBINARIES); \
-+	   ${BSD_INSTALL_PROGRAM} $$x $(INSTALLBINARIES); \
+-	   $(INSTALL) -c $(STRIPFLAG) -m $(INSTALL_PERM_BIN) \
++	   ${BSD_INSTALL_PROGRAM} \
+                $$x $(INSTALLBINARIES); \
  	done
  
- .PHONY: install.script
-@@ -189,7 +185,7 @@
+@@ -192,7 +188,7 @@
  ifneq ($(SCRIPTS)x,x)
  	for x in $(SCRIPTS); \
  	do \
@@ -68,7 +68,7 @@
                 $(INSTALLSCRIPTS); \
  	done
  endif
-@@ -226,7 +222,7 @@
+@@ -229,7 +225,7 @@
  # directory when you compile your programs.
  	for x in $(INTERFACE_HEADERS); \
  	do \
@@ -77,7 +77,7 @@
                 $(INSTALLHDRS); \
  	done
  
-@@ -240,15 +236,14 @@
+@@ -243,15 +239,14 @@
  # here causes the static library to be built at that time.
  .PHONY: install.staticlib
  install.staticlib: lib$(LIBROOT).a
diff --git a/graphics/netpbm/files/patch-bd b/graphics/netpbm/files/patch-bd
index f316e9c..3744852 100644
--- a/graphics/netpbm/files/patch-bd
+++ b/graphics/netpbm/files/patch-bd
@@ -1,5 +1,5 @@
 --- pbm/Makefile.orig	Sat Sep  2 12:59:29 2000
-+++ pbm/Makefile	Tue Sep  5 00:00:00 2000
++++ pbm/Makefile	Fri Dec  8 00:00:00 2000
 @@ -5,7 +5,7 @@
  include $(BUILDDIR)/Makefile.config
  
@@ -31,44 +31,15 @@
  
  MANUALS1 =	$(BINARIES)
  MANUALS3 =	libpbm
-@@ -54,26 +55,21 @@
- 
- .PHONY: all
- all:		$(BINARIES)
--	$(MAKE) -C pbmtoppa all
- 
- .PHONY: merge
- merge: $(MERGENAME)
--	$(MAKE) -C pbmtoppa all
- 
- .PHONY: install.bin
- install.bin: install.bin.common
--	$(MAKE) -C pbmtoppa install.bin
- 
- .PHONY: install.merge
- install.merge: install.merge.common
--	$(MAKE) -C pbmtoppa install.bin
- 
- .PHONY: install.lib
- install.lib: install.lib.common
- 
- .PHONY: install.man
- install.man: install.man.common
--	$(MAKE) -C pbmtoppa install.man
- 
- include $(SRCDIR)/Makefile.common
- 
-@@ -81,13 +77,7 @@
+@@ -80,11 +81,6 @@
+ # Don't use $(SRCDIR) in the target below because Makefile.dep doesn't !
  ../compile.h: 
  	$(MAKE) -C $(SRCDIR) compile.h
- 
+-
 -$(BUILDDIR)/shhopt/shhopt.o:
 -	cd ../shhopt; $(MAKE) shhopt.o
 -$(BUILDDIR)/shhopt/libshhopt.a:
 -	cd ../shhopt; $(MAKE) libshhopt.a
--
+ 
  .PHONY: clean
  clean: clean.common
--	$(MAKE) -C pbmtoppa clean
- 
- FORCE:
diff --git a/graphics/netpbm/files/patch-be b/graphics/netpbm/files/patch-be
index 040d14b..9aeb586 100644
--- a/graphics/netpbm/files/patch-be
+++ b/graphics/netpbm/files/patch-be
@@ -1,12 +1,6 @@
---- pgm/Makefile.orig	Fri Aug  4 08:45:21 2000
-+++ pgm/Makefile	Sat Aug  5 00:00:00 2000
-@@ -10,11 +10,13 @@
- INCLUDEPBM = -I$(PBMDIR)
- LIBPBM = libpbm.$(NETPBMLIBSUFFIX)
- 
--INCLUDE = -I$(SRCDIR) $(INCLUDEPBM) -I$(SRCDIR)/shhopt
-+INCLUDE = -I$(SRCDIR) $(INCLUDEPBM)
- 
+--- pgm/Makefile.orig	Sat Sep  2 13:00:08 2000
++++ pgm/Makefile	Fri Dec  8 00:00:00 2000
+@@ -16,18 +16,27 @@
  NETPBMLIBS = $(LIBPGM) $(PBMDIR)/$(LIBPBM)
  LIBLIBS = $(PBMDIR)/$(LIBPBM)
  
@@ -15,11 +9,48 @@
  PORTBINARIES =	asciitopgm bioradtopgm fstopgm hipstopgm \
  		lispmtopgm pbmtopgm pgmbentley pgmenhance pgmhist \
  		pgmnoise pgmnorm pgmoil pgmramp pgmslice pgmtofs pgmtolispm \
-@@ -27,6 +29,7 @@
+ 		pgmtopbm psidtopgm spottopgm sbigtopgm
+-MATHBINARIES =	pgmcrater pgmedge pgmtexture rawtopgm pgmkernel
+-BINARIES =	$(PORTBINARIES) $(MATHBINARIES)
++MATHBINARIES =	pgmcrater pgmedge pgmtexture pgmkernel
++
++NOMERGEBINARIES =	rawtopgm
++
++MERGEBINARIES =	$(PORTBINARIES) $(MATHBINARIES)
++
++BINARIES = $(MERGEBINARIES) $(NOMERGEBINARIES)
+ 
+ OBJECTS = $(patsubst %, %.o, $(BINARIES))
+-MERGEBINARIES = $(BINARIES)
++
  MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
  
  LIBOBJECTS = libpgm1.o libpgm2.o
 +SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
++LIBSHHOPT = $(SRCDIR)/shhopt/libshhopt.a
  
  MANUALS1 =	$(BINARIES)
  MANUALS3 =	libpgm
+@@ -40,7 +49,11 @@
+ .PHONY: all
+ all:		$(BINARIES)
+ .PHONY: merge
+-merge: $(MERGENAME)
++merge:	$(MERGENAME) $(NOMERGEBINARIES)
++
++rawtopgm: %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT)
++	$(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \
++	  -lm $(LIBSHHOPT) $(CDEBUG)
+ 
+ # LIBRARIES
+ 
+@@ -60,6 +73,9 @@
+ install.man: install.man.common
+ 
+ include $(SRCDIR)/Makefile.common
++
++$(SRCDIR)/shhopt/libshhopt.a:
++	cd ../shhopt; $(MAKE) libshhopt.a
+ 
+ .PHONY: clean
+ clean: clean.common
diff --git a/graphics/netpbm/files/patch-bf b/graphics/netpbm/files/patch-bf
index 48c36f9..1737b91 100644
--- a/graphics/netpbm/files/patch-bf
+++ b/graphics/netpbm/files/patch-bf
@@ -1,5 +1,5 @@
---- pnm/Makefile.orig	Sat Sep  2 13:03:27 2000
-+++ pnm/Makefile	Tue Sep  5 00:00:00 2000
+--- pnm/Makefile.orig	Sun Dec  3 07:48:46 2000
++++ pnm/Makefile	Fri Dec  8 00:00:00 2000
 @@ -48,6 +48,8 @@
    JPEGLD = -L$(JPEGLIB_DIR) -ljpeg
  endif
@@ -27,9 +27,10 @@
  		pnmtoplainpnm pnmtops pnmtorast \
 -		pnmtosgi pnmtosir pnmtoxwd pstopnm \
 -		rasttopnm sgitopnm sirtopnm xwdtopnm zeisstopnm
+-MATHBINARIES =	pnmgamma pnmnlfilt pnmrotate pnmscale pnmscalefixed pnmshear
 +		pnmtosgi pnmtosir pnmtoxwd \
 +		rasttopnm sgitopnm sirtopnm zeisstopnm
- MATHBINARIES =	pnmgamma pnmnlfilt pnmrotate pnmscale pnmshear
++MATHBINARIES =	pnmgamma pnmnlfilt pnmrotate pnmshear
 +SHHOPTBINARIES =	pamchannel pamcut pamfile pamtopnm pnmcrop pnmcut \
 +			pnmfile pnminterp pnmsplit pstopnm xwdtopnm
  
@@ -38,7 +39,7 @@
  # from building all the other programs.
  
 -NOMERGEBINARIES = 
-+NOMERGEBINARIES = $(SHHOPTBINARIES)
++NOMERGEBINARIES = $(SHHOPTBINARIES) pnmscale pnmscalefixed
  ifneq ($(PNGHDR_DIR),NONE)
    ifneq ($(PNGLIB_DIR),NONE)
      NOMERGEBINARIES += pnmtopng pngtopnm
@@ -51,34 +52,31 @@
  
  MANUALS1 = $(BINARIES) $(SCRIPTS)
  MANUALS3 = libpnm
-@@ -118,12 +123,12 @@
+@@ -125,6 +130,14 @@
+ 	$(MAKE) -C jbig all
+ 	$(MAKE) -C fiasco all
  
- .PHONY: all
- all:      $(BINARIES)
--	$(MAKE) -C jbig all
--	$(MAKE) -C fiasco all
- PHONY: merge
- merge:    $(MERGENAME) $(NOMERGEBINARIES)
--	$(MAKE) -C jbig all
--	$(MAKE) -C fiasco all
-+
 +$(SHHOPTBINARIES): %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT)
 +	$(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \
 +	  $(LIBSHHOPT) $(CDEBUG)
- 
++
++pnmscale pnmscalefixed: %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT)
++	$(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \
++	  -lm $(LIBSHHOPT) $(CDEBUG)
++
  ifeq ($(TIFFLIB_DIR),$(TIFFDIR))
  # We're using the internal Tiff library, so make sure it's built
-@@ -134,18 +139,18 @@
- endif
+ TIFFLIB_DEP = $(TIFFDIR)/$(LIBTIFF)
+@@ -135,17 +148,18 @@
  
  # The Tiff library references math functions.
--tifftopnm pnmtotiff pnmtotiffcmyk: %: %.o \
--  $(NETPBMLIBS) $(TIFFLIB_DIR)/libtiff.$(LIBTIFFSUFFIX) $(LIBOPT)
-+tifftopnm pnmtotiff pnmtotiffcmyk: %: %.o $(NETPBMLIBS) $(LIBOPT) \
-+	$(TIFFLIB_DIR)/libtiff.$(LIBTIFFSUFFIX) $(LIBSHHOPT)
+ tifftopnm pnmtotiff pnmtotiffcmyk: %: %.o \
+-  $(NETPBMLIBS) $(TIFFLIB_DEP) $(LIBOPT)
++  $(NETPBMLIBS) $(TIFFLIB_DEP) $(LIBOPT) $(LIBSHHOPT)
  	$(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \
--	  -L$(TIFFLIB_DIR) -ltiff $(JPEGLD) -lm $(CDEBUG)
-+	  -L$(TIFFLIB_DIR) -ltiff $(JPEGLD) -lm $(LIBSHHOPT) $(CDEBUG)
+-	  -L$(TIFFLIB_DIR) -ltiff $(JPEGLD) -lm $(TIFF_LDFLAGS) $(CDEBUG)
++	  -L$(TIFFLIB_DIR) -ltiff $(JPEGLD) -lm $(TIFF_LDFLAGS) \
++	   $(LIBSHHOPT) $(CDEBUG)
  
  pngtopnm pnmtopng: %: %.o $(NETPBMLIBS) $(LIBOPT)
  	$(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \
@@ -88,36 +86,17 @@
 +jpegtopnm: %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT)
  	$(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` $(JPEGLD) \
 -	   $(CDEBUG)
-+	  $(LIBSHHOPT) $(CDEBUG)
++	   $(LIBSHHOPT) $(CDEBUG)
  
  ifeq ($(URTLIB_DIR),$(URTDIR))
  # We're using the internal URT library, so make sure it's built
-@@ -182,25 +187,20 @@
- # backward compatibility: program used to be gemtopbm
- 	rm -f $(INSTALLBINARIES)/gemtopbm
- 	ln -s $(INSTALLBINARIES)/gemtopnm$(EXE) $(INSTALLBINARIES)/gemtopbm
--	$(MAKE) -C jbig install.bin
--	$(MAKE) -C fiasco install.bin
- 
- .PHONY: install.merge
- install.merge: install.merge.common
--	$(MAKE) -C jbig install.bin
--	$(MAKE) -C fiasco install.bin
- 
- .PHONY: install.lib
- install.lib: install.lib.common
- 
- .PHONY: install.man
+@@ -197,6 +211,9 @@
  install.man: install.man.common
--	$(MAKE) -C jbig install.man
--	$(MAKE) -C fiasco install.man
+ 	$(MAKE) -C jbig install.man
+ 	$(MAKE) -C fiasco install.man
 +
-+$(SRCDIR)/shhopt/libshhopt.a:   
++$(SRCDIR)/shhopt/libshhopt.a:
 +	cd ../shhopt; $(MAKE) libshhopt.a
  
  .PHONY: clean
  clean: clean.common
--	$(MAKE) -C jbig clean
--	$(MAKE) -C fiasco clean
- 
- FORCE:
diff --git a/graphics/netpbm/files/patch-bg b/graphics/netpbm/files/patch-bg
index 645ff24..1dedc42 100644
--- a/graphics/netpbm/files/patch-bg
+++ b/graphics/netpbm/files/patch-bg
@@ -1,22 +1,23 @@
---- ppm/Makefile.orig	Fri Aug  4 08:45:03 2000
-+++ ppm/Makefile	Sat Aug  5 00:00:00 2000
-@@ -21,26 +21,30 @@
+--- ppm/Makefile.orig	Sun Dec  3 07:41:51 2000
++++ ppm/Makefile	Fri Dec  8 00:00:00 2000
+@@ -22,26 +22,31 @@
  NETPBMLIBS = $(LIBPPM) $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM)
  LIBLIBS = $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM)
  
 +SOVER = 1
 +
- PORTBINARIES =	bmptoppm eyuvtoppm gouldtoppm hpcdtoppm ilbmtoppm imgtoppm \
+ PORTBINARIES =	bmptoppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \
  		leaftoppm mtvtoppm pcxtoppm pgmtoppm pi1toppm picttoppm \
  		pjtoppm \
 -		ppm3d ppmbrighten ppmchange ppmcolormask \
 +		ppm3d ppmbrighten \
  		ppmdim ppmdist ppmdither \
- 		ppmflash ppmhist ppmmake ppmmix ppmnorm \
+-		ppmflash ppmhist ppmmake ppmmix ppmnorm \
++		ppmflash ppmmake ppmmix ppmnorm \
  		ppmquant ppmrelief ppmshift ppmspread ppmtoacad \
 -		ppmtobmp ppmtoeyuv ppmtogif ppmtoleaf \
 +		ppmtoeyuv ppmtogif ppmtoleaf \
- 		ppmtoicr ppmtoilbm ppmtomitsu \
+ 		ppmtoicr ppmtoilbm ppmtolj ppmtomitsu \
  		ppmtopcx ppmtopgm ppmtopi1 ppmtopict ppmtopj \
  		ppmtopjxl ppmtopuzz ppmtorgb3 ppmtosixel \
  		ppmtotga ppmtouil ppmtowinicon ppmtoxpm ppmtoyuv \
@@ -25,7 +26,8 @@
 -		sputoppm tgatoppm winicontoppm ximtoppm xpmtoppm xvminitoppm \
 +		sputoppm winicontoppm xpmtoppm xvminitoppm \
  		yuvtoppm yuvsplittoppm
-+SHHOPTBINARIES =	ppmchange ppmcolormask ppmtobmp tgatoppm ximtoppm
++SHHOPTBINARIES =	ppmchange ppmcolormask ppmhist ppmtobmp tgatoppm \
++			ximtoppm 
  
  # We don't build vidtoppm by default, because it requires special libraries
  # and there is no known requirement for vidtoppm.
@@ -34,7 +36,7 @@
  ifneq ($(JPEGLIB_DIR), NONE)
    ifneq ($(JPEGHDR_DIR), NONE)
        NOMERGEBINARIES += ppmtojpeg
-@@ -49,7 +53,7 @@
+@@ -50,7 +55,7 @@
  
  MERGEBINARIES = $(PORTBINARIES) $(MATHBINARIES)
  
@@ -43,7 +45,7 @@
  BINARIES = $(MERGEBINARIES) $(NOMERGEBINARIES) 
  SCRIPTS = ppmquantall ppmshadow ppmfade
  
-@@ -58,6 +62,8 @@
+@@ -59,6 +64,8 @@
  MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
  
  LIBOBJECTS = libppm1.o libppm2.o libppm3.o libppm4.o libppm5.o bitio.o
@@ -52,7 +54,7 @@
  
  MANUALS1 = $(BINARIES) $(SCRIPTS)
  MANUALS3 = libppm
-@@ -65,18 +71,24 @@
+@@ -66,7 +73,7 @@
  
  MERGENAME= ppmmerge
  
@@ -61,10 +63,9 @@
  
  .PHONY: all
  all:        $(BINARIES)
--	$(MAKE) -C ppmtompeg all
- .PHONY: merge
- merge:      $(MERGENAME) $(NOMERGEBINARIES)
--	$(MAKE) -C ppmtompeg all
+@@ -77,9 +84,17 @@
+ 	$(MAKE) -C ppmtompeg all
+ 	$(MAKE) -C hpcdtoppm all
  
 -ppmtojpeg: %: %.o $(NETPBMLIBS) $(LIBOPT)
 +$(SHHOPTBINARIES): %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT)
@@ -82,26 +83,13 @@
  
  # And libraries.
  $(PBMDIR)/$(LIBPBM): FORCE
-@@ -89,19 +101,19 @@
- 
- .PHONY: install.merge
- install.merge: install.merge.common
--	$(MAKE) -C ppmtompeg install.bin
- 
- .PHONY: install.lib
- install.lib: install.lib.common
- 
- .PHONY: install.man
- install.man: install.man.common
--	$(MAKE) -C ppmtompeg install.man
+@@ -106,6 +121,9 @@
+ 	$(MAKE) -C hpcdtoppm install.man
  
  include $(SRCDIR)/Makefile.common
- 
++
 +$(SRCDIR)/shhopt/libshhopt.a:
 +	cd ../shhopt; $(MAKE) libshhopt.a
-+
+ 
  .PHONY: clean
  clean: clean.common
--	$(MAKE) -C ppmtompeg clean
- 
- FORCE:
diff --git a/graphics/netpbm/files/patch-bj b/graphics/netpbm/files/patch-bj
index 3c13b6e..a640ff4 100644
--- a/graphics/netpbm/files/patch-bj
+++ b/graphics/netpbm/files/patch-bj
@@ -1,14 +1,11 @@
---- ppm/eyuvtoppm.c.orig	Fri Mar 31 07:09:32 2000
-+++ ppm/eyuvtoppm.c	Sat Apr  8 12:00:00 2000
-@@ -40,8 +40,11 @@
+--- ppm/eyuvtoppm.c.orig	Wed May 17 05:21:57 2000
++++ ppm/eyuvtoppm.c	Fri Dec  8 00:00:00 2000
+@@ -40,8 +40,6 @@
   * HEADER FILES *
   *==============*/
  #include <stdio.h>
-+#ifdef __STDC__
- #include <stdlib.h>
-+#else
- #include <malloc.h>
-+#endif
+-#include <stdlib.h>
+-#include <malloc.h>
  
- typedef unsigned char uint8;
+ #include "ppm.h"
  
diff --git a/graphics/netpbm/files/patch-cf b/graphics/netpbm/files/patch-cf
new file mode 100644
index 0000000..9e4ad54
--- /dev/null
+++ b/graphics/netpbm/files/patch-cf
@@ -0,0 +1,43 @@
+--- pgm/rawtopgm.c.orig	Sun Dec  3 07:28:43 2000
++++ pgm/rawtopgm.c	Fri Dec  8 00:00:00 2000
+@@ -12,6 +12,7 @@
+ 
+ #include <math.h>
+ #include "pgm.h"
++#include "shhopt.h"
+ 
+ 
+ struct cmdline_info {
+@@ -47,6 +48,15 @@
+ 
+     unsigned int option_def_index;
+ 
++    /* Create the OptStruct structure describing our options */
++    #define OPTENTRY(shortvalue,longvalue,typevalue,outputvalue,flagvalue) {\
++      option_def[option_def_index].shortName = (shortvalue); \
++      option_def[option_def_index].longName = (longvalue); \
++      option_def[option_def_index].type = (typevalue); \
++      option_def[option_def_index].arg = (outputvalue); \
++      option_def[option_def_index].flags = (flagvalue); \
++      option_def_index++; \
++      }
+     option_def_index = 0;   /* incremented by OPTENTRY */
+     OPTENTRY(0,   "bottomfirst",   OPT_FLAG,   &cmdline_p->bottomfirst,    0);
+     OPTENTRY(0,   "bt",            OPT_FLAG,   &cmdline_p->bottomfirst,    0);
+@@ -57,6 +67,7 @@
+     OPTENTRY(0,   "bpp",           OPT_INT,    &cmdline_p->bpp,            0);
+     OPTENTRY(0,   "littleendian",  OPT_FLAG,   &cmdline_p->littleendian,   0);
+     OPTENTRY(0,   "maxval",        OPT_UINT,   &cmdline_p->maxval,         0);
++    option_def[option_def_index].type = OPT_END;
+ 
+     /* Set the defaults */
+     cmdline_p->bottomfirst = FALSE;
+@@ -70,7 +81,7 @@
+     opt.short_allowed = FALSE;  /* We have no short (old-fashioned) options */
+     opt.allowNegNum = FALSE;  /* We may have parms that are negative numbers */
+ 
+-    pm_optParseOptions2(&argc, argv, opt, 0);
++    optParseOptions2(&argc, argv, opt, 0);
+         /* Uses and sets argc, argv, and some of *cmdline_p and others. */
+ 
+     if (argc-1 == 0) {
diff --git a/graphics/netpbm/files/patch-cg b/graphics/netpbm/files/patch-cg
new file mode 100644
index 0000000..c56c8e8
--- /dev/null
+++ b/graphics/netpbm/files/patch-cg
@@ -0,0 +1,43 @@
+--- pnm/pnmscale.c.orig	Mon Nov  6 03:46:37 2000
++++ pnm/pnmscale.c	Fri Dec  8 00:00:00 2000
+@@ -12,6 +12,7 @@
+ 
+ #include <math.h>
+ #include "pnm.h"
++#include "shhopt.h"
+ 
+ /* The pnm library allows us to code this program without branching cases
+    for PGM and PPM, but we do the branch anyway to speed up processing of 
+@@ -51,6 +52,15 @@
+     int xysize, xsize, ysize, pixels;
+     float xscale, yscale, scale_parm;
+ 
++    /* Create the OptStruct structure describing our options */
++    #define OPTENTRY(shortvalue,longvalue,typevalue,outputvalue,flagvalue) {\
++      option_def[option_def_index].shortName = (shortvalue); \
++      option_def[option_def_index].longName = (longvalue); \
++      option_def[option_def_index].type = (typevalue); \
++      option_def[option_def_index].arg = (outputvalue); \
++      option_def[option_def_index].flags = (flagvalue); \
++      option_def_index++; \
++      }
+     option_def_index = 0;   /* incremented by OPTENTRY */
+     OPTENTRY(0,   "xsize",     OPT_UINT,    &xsize,         0);
+     OPTENTRY(0,   "width",     OPT_UINT,    &xsize,         0);
+@@ -61,6 +71,7 @@
+     OPTENTRY(0,   "pixels",    OPT_UINT,    &pixels,        0);
+     OPTENTRY(0,   "xysize",    OPT_FLAG,    &xysize,        0);
+     OPTENTRY(0,   "verbose",   OPT_FLAG,    &cmdline_p->verbose,        0);
++    option_def[option_def_index].type = OPT_END;
+ 
+     /* Set the defaults. -1 = unspecified */
+     xsize = -1;
+@@ -74,7 +85,7 @@
+     opt.short_allowed = FALSE;  /* We have no short (old-fashioned) options */
+     opt.allowNegNum = FALSE;  /* We have no parms that are negative numbers */
+ 
+-    pm_optParseOptions2(&argc, argv, opt, 0);
++    optParseOptions2(&argc, argv, opt, 0);
+         /* Uses and sets argc, argv, and some of *cmdline_p and others. */
+ 
+     if (xsize == 0)
diff --git a/graphics/netpbm/files/patch-ch b/graphics/netpbm/files/patch-ch
new file mode 100644
index 0000000..8422b05
--- /dev/null
+++ b/graphics/netpbm/files/patch-ch
@@ -0,0 +1,43 @@
+--- pnm/pnmscalefixed.c.orig	Sun Nov 19 08:20:07 2000
++++ pnm/pnmscalefixed.c	Fri Dec  8 00:00:00 2000
+@@ -12,6 +12,7 @@
+ 
+ #include <math.h>
+ #include "pnm.h"
++#include "shhopt.h"
+ 
+ /* The pnm library allows us to code this program without branching cases
+    for PGM and PPM, but we do the branch anyway to speed up processing of 
+@@ -58,6 +59,15 @@
+     int xysize, xsize, ysize, pixels;
+     float xscale, yscale, scale_parm;
+ 
++    /* Create the OptStruct structure describing our options */
++    #define OPTENTRY(shortvalue,longvalue,typevalue,outputvalue,flagvalue) {\
++      option_def[option_def_index].shortName = (shortvalue); \
++      option_def[option_def_index].longName = (longvalue); \
++      option_def[option_def_index].type = (typevalue); \
++      option_def[option_def_index].arg = (outputvalue); \
++      option_def[option_def_index].flags = (flagvalue); \
++      option_def_index++; \
++      }
+     option_def_index = 0;   /* incremented by OPTENTRY */
+     OPTENTRY(0,   "xsize",     OPT_UINT,    &xsize,         0);
+     OPTENTRY(0,   "width",     OPT_UINT,    &xsize,         0);
+@@ -68,6 +78,7 @@
+     OPTENTRY(0,   "pixels",    OPT_UINT,    &pixels,        0);
+     OPTENTRY(0,   "xysize",    OPT_FLAG,    &xysize,        0);
+     OPTENTRY(0,   "verbose",   OPT_FLAG,    &cmdline_p->verbose,        0);
++    option_def[option_def_index].type = OPT_END;
+ 
+     /* Set the defaults. -1 = unspecified */
+     xsize = -1;
+@@ -81,7 +92,7 @@
+     opt.short_allowed = FALSE;  /* We have no short (old-fashioned) options */
+     opt.allowNegNum = FALSE;  /* We have no parms that are negative numbers */
+ 
+-    pm_optParseOptions2(&argc, argv, opt, 0);
++    optParseOptions2(&argc, argv, opt, 0);
+         /* Uses and sets argc, argv, and some of *cmdline_p and others. */
+ 
+     if (xsize == 0)
diff --git a/graphics/netpbm/files/patch-ci b/graphics/netpbm/files/patch-ci
new file mode 100644
index 0000000..5e404b9
--- /dev/null
+++ b/graphics/netpbm/files/patch-ci
@@ -0,0 +1,41 @@
+--- ppm/ppmhist.c.orig	Mon Sep 18 15:11:07 2000
++++ ppm/ppmhist.c	Fri Dec  8 00:00:00 2000
+@@ -12,6 +12,7 @@
+ 
+ #include "ppm.h"
+ #include "ppmcmap.h"
++#include "shhopt.h"
+ 
+ #define MAXCOLORS 100000
+ 
+@@ -43,11 +44,21 @@
+     
+     int nomap;  /* dummy option for backward compatibility */
+ 
++    /* Create the OptStruct structure describing our options */
++    #define OPTENTRY(shortvalue,longvalue,typevalue,outputvalue,flagvalue) {\
++      option_def[option_def_index].shortName = (shortvalue); \
++      option_def[option_def_index].longName = (longvalue); \
++      option_def[option_def_index].type = (typevalue); \
++      option_def[option_def_index].arg = (outputvalue); \
++      option_def[option_def_index].flags = (flagvalue); \
++      option_def_index++; \
++      }
+     option_def_index = 0;   /* incremented by OPTENTRY */
+     OPTENTRY(0,   "map",         OPT_FLAG,   &cmdline_p->map,         0);
+     OPTENTRY(0,   "nomap",       OPT_FLAG,   &nomap,                  0);
+     OPTENTRY(0,   "noheader",    OPT_FLAG,   &cmdline_p->noheader,    0);
+     OPTENTRY(0,   "hexcolor",    OPT_FLAG,   &cmdline_p->hexcolor,    0);
++    option_def[option_def_index].type = OPT_END;
+ 
+     /* Set the defaults */
+     cmdline_p->map = FALSE;
+@@ -58,7 +69,7 @@
+     opt.short_allowed = FALSE;  /* We have no short (old-fashioned) options */
+     opt.allowNegNum = FALSE;  /* We may have parms that are negative numbers */
+ 
+-    pm_optParseOptions2(&argc, argv, opt, 0);
++    optParseOptions2(&argc, argv, opt, 0);
+         /* Uses and sets argc, argv, and some of *cmdline_p and others. */
+ 
+     if (argc-1 == 0) 
diff --git a/graphics/netpbm/files/patch-cj b/graphics/netpbm/files/patch-cj
new file mode 100644
index 0000000..56fde7a
--- /dev/null
+++ b/graphics/netpbm/files/patch-cj
@@ -0,0 +1,14 @@
+--- ppm/hpcdtoppm/hpcdtoppm.h.orig	Mon Jun 13 17:04:45 1994
++++ ppm/hpcdtoppm/hpcdtoppm.h	Fri Dec  8 00:00:00 2000
+@@ -11,10 +11,10 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
+-#include <malloc.h>
+ #include <sys/types.h>
+ #include <ctype.h>
+ #include "config.h"
++#include "ppm.h"
+ 
+ 
+ 
diff --git a/graphics/netpbm/files/patch-ck b/graphics/netpbm/files/patch-ck
new file mode 100644
index 0000000..80b268c
--- /dev/null
+++ b/graphics/netpbm/files/patch-ck
@@ -0,0 +1,10 @@
+--- ppm/ppmtompeg/opts.c.orig	Sat Aug  5 08:07:31 2000
++++ ppm/ppmtompeg/opts.c	Fri Dec  8 00:00:00 2000
+@@ -37,7 +37,6 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
+-#include <malloc.h>
+ #include <math.h>
+ #include "opts.h"
+ 
diff --git a/graphics/netpbm/files/patch-cl b/graphics/netpbm/files/patch-cl
new file mode 100644
index 0000000..8d1ca13
--- /dev/null
+++ b/graphics/netpbm/files/patch-cl
@@ -0,0 +1,12 @@
+--- ppm/ppmtompeg/parallel.c.orig	Sat Jul  1 16:51:53 2000
++++ ppm/ppmtompeg/parallel.c	Fri Dec  8 00:00:00 2000
+@@ -70,9 +70,6 @@
+  *
+  */
+ 
+-#define _POSIX_SOURCE
+-#define _POSIX_C_SOURCE 2
+-    /* This makes sure pclose() is in stdio.h */
+ /* On SunOS 5.6, netinet/in.h, via sys/vnode.h uses non-POSIX
+    typedefs, but when _POSIX_SOURCE is defined, it doesn't cause those
+    typedefs to be defined.  In later releases, this is fixed.  If we
diff --git a/graphics/netpbm/pkg-plist b/graphics/netpbm/pkg-plist
index 89acd6e..6bc45e1 100644
--- a/graphics/netpbm/pkg-plist
+++ b/graphics/netpbm/pkg-plist
@@ -6,6 +6,7 @@ bin/bmptoppm
 bin/brushtopbm
 bin/cmuwmtopbm
 bin/eyuvtoppm
+bin/fiascotopnm
 bin/fitstopnm
 bin/fstopgm
 bin/g3topbm
@@ -18,6 +19,7 @@ bin/hpcdtoppm
 bin/icontopbm
 bin/ilbmtoppm
 bin/imgtoppm
+bin/jbigtopnm
 bin/jpegtopnm
 bin/leaftoppm
 bin/lispmtopgm
@@ -60,6 +62,7 @@ bin/pbmtopgm
 bin/pbmtopi3
 bin/pbmtopk
 bin/pbmtoplot
+bin/pbmtoppa
 bin/pbmtoptx
 bin/pbmtowbmp
 bin/pbmtox10bm
@@ -117,15 +120,19 @@ bin/pnmpad
 bin/pnmpaste
 bin/pnmrotate
 bin/pnmscale
+bin/pnmscalefixed
 bin/pnmshear
 bin/pnmsmooth
 bin/pnmsplit
 bin/pnmtile
 bin/pnmtoddif
+bin/pnmtofiasco
 bin/pnmtofits
+bin/pnmtojbig
 bin/pnmtoplainpnm
 bin/pnmtopng
 bin/pnmtops
+bin/pnmtopsnr
 bin/pnmtorast
 bin/pnmtosgi
 bin/pnmtosir
@@ -166,8 +173,10 @@ bin/ppmtoicr
 bin/ppmtoilbm
 bin/ppmtojpeg
 bin/ppmtoleaf
+bin/ppmtolj
 bin/ppmtomap
 bin/ppmtomitsu
+bin/ppmtompeg
 bin/ppmtopcx
 bin/ppmtopgm
 bin/ppmtopi1