Update to 9.5.

PR:		19622
Submitted by:	Ports Fury

17 files changed, 305 insertions, 357 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 65bd321ae82c..cfb7b52dddd4 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	netpbm
-PORTVERSION=	9.4
+PORTVERSION=	9.5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,10 +19,10 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		png.3:${PORTSDIR}/graphics/png
 
 USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	merge
 INSTALL_TARGET=	install-merge install-dev
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index d812350a1e01..dd1cc00eac58 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1 +1 @@
-MD5 (netpbm-9.4.tgz) = 18ce92e1b0b9fd4cea374eccc90abc8a
+MD5 (netpbm-9.5.tgz) = 978920c632ab4e9a4e5e4ae94dd86fe6
diff --git a/graphics/netpbm/files/manpages b/graphics/netpbm/files/manpages
index 4aac643237d2..a4fcfa9867f4 100644
--- a/graphics/netpbm/files/manpages
+++ b/graphics/netpbm/files/manpages
@@ -55,6 +55,7 @@ MAN1+=	pbmtopi3.1
 MAN1+=	pbmtopk.1
 MAN1+=	pbmtoplot.1
 MAN1+=	pbmtoptx.1
+MAN1+=	pbmtowbmp.1
 MAN1+=	pbmtox10bm.1
 MAN1+=	pbmtoxbm.1
 MAN1+=	pbmtoybm.1
@@ -109,6 +110,7 @@ MAN1+=	pnmrotate.1
 MAN1+=	pnmscale.1
 MAN1+=	pnmshear.1
 MAN1+=	pnmsmooth.1
+MAN1+=	pnmsplit.1
 MAN1+=	pnmtile.1
 MAN1+=	pnmtoddif.1
 MAN1+=	pnmtofits.1
@@ -188,6 +190,7 @@ MAN1+=	spottopgm.1
 MAN1+=	sputoppm.1
 MAN1+=	tgatoppm.1
 MAN1+=	tifftopnm.1
+MAN1+=	wbmptopbm.1
 MAN1+=	winicontoppm.1
 MAN1+=	xbmtopbm.1
 MAN1+=	ximtoppm.1
diff --git a/graphics/netpbm/files/patch-aj b/graphics/netpbm/files/patch-aj
index d63eee246772..b69e67d9fa62 100644
--- a/graphics/netpbm/files/patch-aj
+++ b/graphics/netpbm/files/patch-aj
@@ -1,5 +1,5 @@
---- pbmplus.h.orig	Sat May 27 03:50:50 2000
-+++ pbmplus.h	Sat Jun  3 00:00:00 2000
+--- pbmplus.h.orig	Tue Jun 20 04:24:29 2000
++++ pbmplus.h	Sat Jul  1 12:00:00 2000
 @@ -18,6 +18,9 @@
  #include <stdio.h>
  #include <errno.h>
@@ -28,9 +28,9 @@
  #define RGB_DB2 "/usr/openwin/lib/rgb.txt"
  #endif
  
-@@ -299,37 +302,6 @@
-     PM_CHECK_BASIC
- };
+@@ -298,39 +301,6 @@
+          const unsigned int need_raster_size,
+          enum pm_check_code * const retval_p);
  
 -
 -/* By making this <> instead of "", we avoid making shhopt.h a dependency
@@ -40,6 +40,8 @@
 -
 -void pm_optParseOptions(int *argc, char *argv[],
 -                        optStruct opt[], int allowNegNum);
+-void pm_optParseOptions2(int * const argc, char *argv[],
+-                        const optStruct2 opt, const unsigned long flags);
 -/* Use pm_optParseOptions instead of optParseOptions in order to use the
 -   shared Netpbm libraries
 -*/
diff --git a/graphics/netpbm/files/patch-au b/graphics/netpbm/files/patch-au
index 5f217adbf401..416ab21df1da 100644
--- a/graphics/netpbm/files/patch-au
+++ b/graphics/netpbm/files/patch-au
@@ -1,289 +1,38 @@
---- ppm/ppmtobmp.c.orig	Thu Mar 23 16:34:34 2000
-+++ ppm/ppmtobmp.c	Sun Apr  1 12:00:00 2000
-@@ -75,7 +75,7 @@
-     unsigned short cBitCount, pixel **pixels, colorhash_table cht));
- static int colorstobpp ARGS((int colors));
- static void BMPEncode ARGS((FILE *fp, int class, int x, int y, pixel **pixels,
--    int colors, colorhash_table cht, pixval *R, pixval *G, pixval *B));
-+    int bpp, int colors, colorhash_table cht, pixval *R, pixval *G, pixval *B));
- static void
- PutByte(FILE *fp, char v)
- {
-@@ -244,16 +244,20 @@
-         int             i;
-         long            ncolors;
- 
--        for (i = 0; i < colors; i++)
-+        if (bpp != 24)
-         {
--                nbyte += BMPwritergb(fp,class,R[i],G[i],B[i]);
--        }
- 
--        ncolors = (1 << bpp);
-+                for (i = 0; i < colors; i++)
-+                {
-+                        nbyte += BMPwritergb(fp,class,R[i],G[i],B[i]);
-+                }
-+
-+                ncolors = (1 << bpp);
- 
--        for (; i < ncolors; i++)
--        {
--                nbyte += BMPwritergb(fp,class,0,0,0);
-+                for (; i < ncolors; i++)
-+                {
-+                        nbyte += BMPwritergb(fp,class,0,0,0);
-+                }
-         }
- 
-         return nbyte;
-@@ -271,26 +275,38 @@
-         int             rc;
-         unsigned        x;
- 
--        if ((b = pm_bitinit(fp, "w")) == (BITSTREAM) 0)
-+        if (bpp != 24)
-         {
--                return -1;
--        }
-+                if ((b = pm_bitinit(fp, "w")) == (BITSTREAM) 0)
-+                {
-+                        return -1;
-+                }
- 
--        for (x = 0; x < cx; x++, row++)
--        {
--                if ((rc = pm_bitwrite(b, bpp, ppm_lookupcolor(cht, row))) == -1)
-+                for (x = 0; x < cx; x++, row++)
-+                {
-+                        if ((rc = pm_bitwrite(b, bpp, ppm_lookupcolor(cht, row))) == -1)
-+                        {
-+                                return -1;
-+                        }
-+                        nbyte += rc;
-+                }
-+
-+                if ((rc = pm_bitfini(b)) == -1)
-                 {
-                         return -1;
-                 }
-                 nbyte += rc;
-         }
--
--        if ((rc = pm_bitfini(b)) == -1)
-+        else
-         {
--                return -1;
-+                for (x = 0; x < cx; x++, row++)
-+                {
-+                        PutByte(fp, PPM_GETB(*row));
-+                        PutByte(fp, PPM_GETG(*row));
-+                        PutByte(fp, PPM_GETR(*row));
-+                        nbyte += 3;
-+                }
-         }
--        nbyte += rc;
--
-         /*
-          * Make sure we write a multiple of 4 bytes.
-          */
-@@ -376,48 +392,21 @@
-  * arrays are undefined.
-  */
- static void
--BMPEncode(fp, class, x, y, pixels, colors, cht, R, G, B)
-+BMPEncode(fp, class, x, y, pixels, bpp, colors, cht, R, G, B)
-         FILE           *fp;
-         int             class;
-         int             x;
-         int             y;
-         pixel         **pixels;
-+        int             bpp;    /* bits per pixel */
-         int             colors; /* number of valid entries in R,G,B */
-         colorhash_table cht;
-         pixval         *R;
-         pixval         *G;
-         pixval         *B;
- {
--        int             bpp;    /* bits per pixel */
-         unsigned long   nbyte = 0;
- 
--        bpp = colorstobpp(colors);
--
--        /*
--         * I have found empirically at least one BMP-displaying program
--         * that can't deal with (for instance) using 3 bits per pixel.
--         * I have seen no programs that can deal with using 3 bits per
--         * pixel.  I have seen programs which can deal with 1, 4, and
--         * 8 bits per pixel.
--         *
--         * Based on this, I adjust actual the number of bits per pixel
--         * as follows.  If anyone knows better, PLEASE tell me!
--         */
--        switch(bpp)
--        {
--        case 2:
--        case 3:
--                bpp = 4;
--                break;
--        case 5:
--        case 6:
--        case 7:
--                bpp = 8;
--                break;
--        }
--
--        pm_message("Using %d bits per pixel", bpp);
--
-         nbyte += BMPwritefileheader(fp, class, bpp, x, y);
-         nbyte += BMPwriteinfoheader(fp, class, bpp, x, y);
-         nbyte += BMPwritergbtable(fp, class, bpp, colors, R, G, B);
-@@ -499,13 +488,15 @@
-         char          **argv;
- {
-         FILE           *ifp = stdin;
--        char           *usage = "[-windows] [-os2] [ppmfile]";
-+        char           *usage = "[-windows] [-os2] [-1/4/8/24bits] [ppmfile]";
-         int             class = C_OS2;
- 
-         int             argn;
-         int             rows;
-         int             cols;
-         int             colors;
-+        int             maxcolors = MAXCOLORS;
-+        int             bpp = 0;
-         int             i;
-         pixval          maxval;
-         colorhist_vector chv;
-@@ -527,6 +518,14 @@
-                         class = C_WIN;
-                 else if (pm_keymatch(argv[argn], "-os2", 2))
-                         class = C_OS2;
-+                else if (pm_keymatch(argv[argn], "-24bits", 3))
-+                        bpp = 24, maxcolors = 256;
-+                else if (pm_keymatch(argv[argn], "-8bits", 2))
-+                        bpp = 8, maxcolors = 256;
-+                else if (pm_keymatch(argv[argn], "-4bits", 2))
-+                        bpp = 4, maxcolors = 16;
-+                else if (pm_keymatch(argv[argn], "-1bit", 2))
-+                        bpp = 1, maxcolors = 2;
-                 else
-                         pm_usage(usage);
-                 ++argn;
-@@ -567,44 +566,90 @@
- #endif
- 
-         /* Figure out the colormap. */
--        pm_message("computing colormap...");
--        chv = ppm_computecolorhist(pixels, cols, rows, MAXCOLORS, &colors);
--        if (chv == (colorhist_vector) 0)
--                pm_error("too many colors - try doing a 'ppmquant %d'"
--                        , MAXCOLORS);
--        pm_message("%d colors found", colors);
--
--        /*
--         * Now turn the ppm colormap into the appropriate GIF
--         * colormap.
--         */
--        if (maxval > 255)
-+        chv = (colorhist_vector) 0;
-+        if (bpp != 24)
-         {
--                pm_message("maxval is not 255 - automatically rescaling colors");
-+                pm_message("computing colormap...");
-+                chv = ppm_computecolorhist(pixels, cols, rows, maxcolors, &colors);
-         }
--        for (i = 0; i < colors; ++i)
-+        if (chv == (colorhist_vector) 0)
-         {
--                if (maxval == 255)
-+                if (bpp == 0)
-                 {
--                        Red[i] = PPM_GETR(chv[i].color);
--                        Green[i] = PPM_GETG(chv[i].color);
--                        Blue[i] = PPM_GETB(chv[i].color);
-+                        pm_message("over 256 colors found");
-+                        bpp = 24;
-                 }
--                else
-+                else if (bpp != 24)
-+                        pm_error("too many colors - try doing a 'ppmquant %d'"
-+                                , maxcolors);
-+        }
-+        else
-+        {
-+                pm_message("%d colors found", colors);
-+
-+               /*
-+                * I have found empirically at least one BMP-displaying program
-+                * that can't deal with (for instance) using 3 bits per pixel.
-+                * I have seen no programs that can deal with using 3 bits per
-+                * pixel.  I have seen programs which can deal with 1, 4, and
-+                * 8 bits per pixel.
-+                *
-+                * Based on this, I adjust actual the number of bits per pixel
-+                * as follows.  If anyone knows better, PLEASE tell me!
-+                */
-+
-+               if (!bpp)
-+               {
-+                       bpp = colorstobpp(colors);
-+
-+                       switch(bpp)
-+                       {
-+                       case 2:
-+                       case 3:
-+                               bpp = 4;
-+                               break;
-+                       case 5:
-+                       case 6:
-+                       case 7:
-+                               bpp = 8;
-+                               break;
-+                       }
-+                }
-+
-+                /*
-+                 * Now turn the ppm colormap into the appropriate GIF
-+                 * colormap.
-+                 */
-+                if (maxval > 255)
-+                {
-+                        pm_message("maxval is not 255 - automatically rescaling colors");
-+                }
-+                for (i = 0; i < colors; ++i)
-                 {
--                        Red[i] = (pixval) PPM_GETR(chv[i].color) * 255 / maxval;
--                        Green[i] = (pixval) PPM_GETG(chv[i].color) * 255 / maxval;
--                        Blue[i] = (pixval) PPM_GETB(chv[i].color) * 255 / maxval;
-+                        if (maxval == 255)
-+                        {
-+                                Red[i] = PPM_GETR(chv[i].color);
-+                                Green[i] = PPM_GETG(chv[i].color);
-+                                Blue[i] = PPM_GETB(chv[i].color);
-+                        }
-+                        else
-+                        {
-+                                Red[i] = (pixval) PPM_GETR(chv[i].color) * 255 / maxval;
-+                                Green[i] = (pixval) PPM_GETG(chv[i].color) * 255 / maxval;
-+                                Blue[i] = (pixval) PPM_GETB(chv[i].color) * 255 / maxval;
-+                        }
-                 }
-+
-+                /* And make a hash table for fast lookup. */
-+                cht = ppm_colorhisttocolorhash(chv, colors);
-+                ppm_freecolorhist(chv);
-         }
- 
--        /* And make a hash table for fast lookup. */
--        cht = ppm_colorhisttocolorhash(chv, colors);
--        ppm_freecolorhist(chv);
-+        pm_message("Using %d bits per pixel", bpp);
- 
-         /* All set, let's do it. */
-         BMPEncode(stdout, class
--                , cols, rows, pixels, colors, cht
-+                , cols, rows, pixels, bpp, colors, cht
-                 ,Red, Green, Blue);
- 
-         pm_close(stdout);
+--- ppm/ppmtobmp.c.orig	Sat Jul  1 03:00:34 2000
++++ ppm/ppmtobmp.c	Sat Jul  1 12:00:00 2000
+@@ -51,6 +51,7 @@
+ #include        "ppm.h"
+ #include        "ppmcmap.h"
+ #include        "bitio.h"
++#include        "shhopt.h"
+ 
+ #define MAXCOLORS 256
+ 
+@@ -93,16 +94,26 @@
+     opt.short_allowed = FALSE;  /* We have no short (old-fashioned) options */
+     opt.allowNegNum = FALSE;  /* We have no parms that are negative numbers */
+ 
++    /* 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('w', "windows",   OPT_FLAG,      &windows,   0);
+     OPTENTRY('o', "os2",       OPT_FLAG,      &os2,       0);
+     OPTENTRY(0,   "bpp",       OPT_UINT,      &bpp,       0);
++    option_def[option_def_index].type = OPT_END;
+ 
+     /* Set the defaults */
+     windows = os2 = FALSE;
+     bpp = -1;
+ 
+-    pm_optParseOptions2(&argc, argv, opt, 0);
++    optParseOptions2(&argc, argv, opt, 0);
+         /* Uses and sets argc, and argv */
+ 
+     if (argc - 1 == 0)
diff --git a/graphics/netpbm/files/patch-bb b/graphics/netpbm/files/patch-bb
index 3c3a46080b5f..24a83d82da73 100644
--- a/graphics/netpbm/files/patch-bb
+++ b/graphics/netpbm/files/patch-bb
@@ -1,5 +1,5 @@
---- Makefile.common.orig	Fri Jun  2 02:38:14 2000
-+++ Makefile.common	Sat Jun  3 00:00:00 2000
+--- Makefile.common.orig	Sat Jul  1 04:59:36 2000
++++ Makefile.common	Sat Jul  1 12:00:00 2000
 @@ -97,24 +97,20 @@
  # BUILDING NETPBM LIBRARIES
  
@@ -32,25 +32,25 @@
  
  # Static library.  Unused by default, but with a small change to make files...
  lib$(LIBROOT).a: $(LIBOBJECTS) $(LIBOBJECTS_X)
-@@ -138,7 +134,7 @@
+@@ -142,7 +138,7 @@
  install.merge.common: $(MERGENAME) $(NOMERGEBINARIES) install.script
  	cd $(INSTALLBINARIES) ; rm -f $(BINARIES) $(MERGE_ALIASES)
  ifneq ($(MERGENAME)x,x)
--	$(INSTALL) -s -m $(INSTALL_PERM_BIN) $(MERGENAME) $(INSTALLBINARIES)
+-	$(INSTALL) -c -s -m $(INSTALL_PERM_BIN) $(MERGENAME) $(INSTALLBINARIES)
 +	${BSD_INSTALL_PROGRAM} $(MERGENAME) $(INSTALLBINARIES)
  	cd $(INSTALLBINARIES) ; \
  	   for i in $(MERGEBINARIES) $(MERGE_ALIASES) ; \
               do ln -s $(MERGENAME)$(EXE) $$i ; \
-@@ -146,7 +142,7 @@
- endif
+@@ -151,7 +147,7 @@
+ ifneq ($(NOMERGEBINARIES)x,x)
  	for x in $(NOMERGEBINARIES); \
          do \
 -           $(INSTALL) -c -s -m $(INSTALL_PERM_BIN) $$x $(INSTALLBINARIES); \
 +           ${BSD_INSTALL_PROGRAM} $$x $(INSTALLBINARIES); \
  	done
+ endif
  
- # INSTALLING
-@@ -157,7 +153,7 @@
+@@ -163,7 +159,7 @@
  # Make and Install know that pbmmake.exe counts as pbmmake.
  	for x in $(BINARIES); \
  	do \
@@ -59,7 +59,7 @@
  	done
  
  .PHONY: install.script
-@@ -165,7 +161,7 @@
+@@ -171,7 +167,7 @@
  ifneq ($(SCRIPTS)x,x)
  	for x in $(SCRIPTS); \
  	do \
@@ -68,7 +68,7 @@
  	done
  endif
  
-@@ -198,7 +194,7 @@
+@@ -204,7 +200,7 @@
  # directory when you compile your programs.
  	for x in $(INTERFACE_HEADERS); \
  	do \
@@ -77,7 +77,7 @@
  	done
  
  # Install a static library 
-@@ -209,16 +205,15 @@
+@@ -215,16 +211,15 @@
  # library, the dependency here will do that.
  .PHONY: install.staticlib
  install.staticlib: lib$(LIBROOT).a
diff --git a/graphics/netpbm/files/patch-bc b/graphics/netpbm/files/patch-bc
index d109dcf2d5b9..58b3dec128ee 100644
--- a/graphics/netpbm/files/patch-bc
+++ b/graphics/netpbm/files/patch-bc
@@ -1,5 +1,5 @@
---- Makefile.config.orig	Mon Jun  5 08:08:43 2000
-+++ Makefile.config	Sat Jun 10 00:00:00 2000
+--- Makefile.config.orig	Fri Jun 23 02:48:03 2000
++++ Makefile.config	Sat Jul  1 12:00:00 2000
 @@ -39,7 +39,7 @@
  #Tru64:
  #CC =		cc
@@ -9,7 +9,7 @@
  
  # The linker.
  LD = $(CC)
-@@ -53,7 +53,7 @@
+@@ -66,7 +66,7 @@
  # calls compress or pack.  Mantocat, included with Netpbm, is used on
  # systems which use man pages in the "cat" format.
  
@@ -17,28 +17,33 @@
 +MANCP =	${BSD_INSTALL_MAN}
  #MANCP = $(SRCDIR)/mantocat
  
- # MAKE is set automatically by Make to what was used to invoke Make.
-@@ -73,7 +73,7 @@
- 
- # C compiler options
- 
+ AR= ar
+@@ -79,7 +79,7 @@
+ # -ansi and -Werror should work too, but are not included
+ # by default because there's no point in daring the build to fail.
+ # -pedantic isn't a problem because it causes at worst a warning.
 -CFLAGS = -pedantic -O2 -Wall -Wno-uninitialized $(CDEBUG)
 +CFLAGS += $(CDEBUG)
  # On DEC Tru64 4.0F (at least), you need -DLONG_32 for ppmtompeg.
  #Tru64:
  #CFLAGS = -O2 -std1 DLONG_32 $(CDEBUG)
-@@ -123,7 +123,7 @@
+@@ -132,7 +132,7 @@
  # independent code, so you need -fpic or fPIC here.  (The rule is: if 
  # -fpic works, use it.  If it bombs, go to fPIC).
  
 -CFLAGS_SHLIB = 
-+CFLAGS_SHLIB = -fPIC -DPIC
++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
+@@ -148,11 +148,11 @@
+ # but otherwise will not.
+ 
+ # Use the Tiff library included with Netpbm:
+-TIFFHDR_DIR = $(SRCDIR)/libtiff
+-TIFFLIB_DIR = $(SRCDIR)/libtiff
++#TIFFHDR_DIR = $(SRCDIR)/libtiff
++#TIFFLIB_DIR = $(SRCDIR)/libtiff
  #NetBSD:
 -#TIFFHDR_DIR = $(LOCALBASE)/include
 -#TIFFLIB_DIR = $(LOCALBASE)/lib
@@ -47,7 +52,7 @@
  # OSF, Tru64:
  #TIFFHDR_DIR = /usr/local1/DEC/include
  #TIFFLIB_DIR = /usr/local1/DEC/lib
-@@ -164,11 +164,11 @@
+@@ -173,11 +173,11 @@
  # at least JPEGLIB_DIR here, or the tiff converters will not build at
  # all.
  
@@ -63,7 +68,7 @@
  # OSF, Tru64:
  #JPEGLIB_DIR = /usr/local1/DEC/lib
  #JPEGHDR_DIR = /usr/local1/DEC/include
-@@ -186,11 +186,11 @@
+@@ -195,11 +195,11 @@
  # here.  If you do not have the PNG library, and still want to
  # successully build everything else, put NONE for these.
  
@@ -79,7 +84,7 @@
  # OSF/Tru64:
  #PNGLIB_DIR = /usr/local1/DEC/lib
  #PNGHDR_DIR = /usr/local1/DEC/include
-@@ -204,8 +204,10 @@
+@@ -213,8 +213,10 @@
  
  # And the Utah Raster Toolkit (aka URT aka RLE) library:
  
diff --git a/graphics/netpbm/files/patch-bd b/graphics/netpbm/files/patch-bd
index e3c9c418b75a..428bff66ef33 100644
--- a/graphics/netpbm/files/patch-bd
+++ b/graphics/netpbm/files/patch-bd
@@ -1,5 +1,5 @@
---- pbm/Makefile.orig	Fri Jun  2 02:17:51 2000
-+++ pbm/Makefile	Sat Jun  3 00:00:00 2000
+--- pbm/Makefile.orig	Thu Jun 29 01:06:06 2000
++++ pbm/Makefile	Sat Jul  1 12:00:00 2000
 @@ -4,13 +4,12 @@
  include $(SRCDIR)/Makefile.config
  
@@ -11,7 +11,7 @@
  LIBROOT = pbm
  LIBPBM = lib$(LIBROOT).$(NETPBMLIBSUFFIX)
 -MAJ = 9
--MIN = 3
+-MIN = 5
 +SOVER = 1
  
  LIBLIBS = 
diff --git a/graphics/netpbm/files/patch-be b/graphics/netpbm/files/patch-be
index 8a18d679124b..e0783e3163db 100644
--- a/graphics/netpbm/files/patch-be
+++ b/graphics/netpbm/files/patch-be
@@ -1,11 +1,11 @@
---- pgm/Makefile.orig	Sat May 27 04:14:36 2000
-+++ pgm/Makefile	Sat Jun  3 00:00:00 2000
+--- pgm/Makefile.orig	Thu Jun 29 01:05:55 2000
++++ pgm/Makefile	Sat Jul  1 12:00:00 2000
 @@ -3,14 +3,13 @@
  
  LIBROOT = pgm
  LIBPGM = lib$(LIBROOT).$(NETPBMLIBSUFFIX)
 -MAJ = 9
--MIN = 3
+-MIN = 5
 +SOVER = 1
  
  PBMDIR = $(SRCDIR)/pbm
diff --git a/graphics/netpbm/files/patch-bf b/graphics/netpbm/files/patch-bf
index e3b3c72987b8..b3b0a681522c 100644
--- a/graphics/netpbm/files/patch-bf
+++ b/graphics/netpbm/files/patch-bf
@@ -1,33 +1,42 @@
---- pnm/Makefile.orig	Sat May 27 04:14:52 2000
-+++ pnm/Makefile	Sat Jun  3 00:00:00 2000
+--- pnm/Makefile.orig	Thu Jun 29 02:23:53 2000
++++ pnm/Makefile	Sat Jul  1 12:00:00 2000
 @@ -3,8 +3,7 @@
  
  LIBROOT = pnm
  LIBPNM = lib$(LIBROOT).$(NETPBMLIBSUFFIX)
 -MAJ = 9
--MIN = 3
+-MIN = 5
 +SOVER = 1
  
  PPMDIR = $(SRCDIR)/ppm
  LIBPPM = libppm.$(NETPBMLIBSUFFIX)
-@@ -61,14 +60,14 @@
- 		pnmsmooth pnmtile pnmtoddif pnmtofits \
+@@ -56,19 +55,20 @@
+ 
+ PORTBINARIES = fitstopnm gemtopnm giftopnm \
+ 		pnmalias pnmarith pnmcat pnmcomp pnmconvol pnmcrop \
+-		pnmcut pnmdepth pnmenlarge pnmfile pnmflip pnmhisteq \
++		pnmdepth pnmenlarge pnmflip pnmhisteq \
+ 		pnmhistmap pnminterp pnminvert pnmpad pnmpaste \
+-		pnmsmooth pnmsplit pnmtile pnmtoddif pnmtofits \
++		pnmsmooth pnmtile pnmtoddif pnmtofits \
  		pnmtoplainpnm pnmtops pnmtorast \
- 		pnmtosgi pnmtosir pnmtoxwd \
+-		pnmtosgi pnmtosir pnmtoxwd pstopnm \
 -		rasttopnm sgitopnm sirtopnm xwdtopnm zeisstopnm
++		pnmtosgi pnmtosir pnmtoxwd \
 +		rasttopnm sgitopnm sirtopnm zeisstopnm
  MATHBINARIES =	pnmgamma pnmnlfilt pnmrotate pnmscale pnmshear
++SHHOPTBINARIES = pnmcut pnmfile pnmsplit pstopnm xwdtopnm
  
  # We don't include programs that have special library dependencies in the
  # merge scheme, because we don't want those dependencies to prevent us
  # from building all the other programs.
  
 -NOMERGEBINARIES = 
-+NOMERGEBINARIES = xwdtopnm
++NOMERGEBINARIES = $(SHHOPTBINARIES)
  ifneq ($(PNGHDR_DIR),NONE)
    ifneq ($(PNGLIB_DIR),NONE)
      NOMERGEBINARIES += pnmtopng pngtopnm
-@@ -105,6 +104,8 @@
+@@ -105,6 +105,8 @@
  MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
  
  LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o
@@ -36,7 +45,7 @@
  
  MANUALS1 = $(BINARIES) $(SCRIPTS)
  MANUALS3 = libpnm
-@@ -116,10 +117,12 @@
+@@ -116,10 +118,12 @@
  
  .PHONY: all
  all:      $(BINARIES)
@@ -45,13 +54,13 @@
  merge:    $(MERGENAME) $(NOMERGEBINARIES)
 -	$(MAKE) -C jbig all
 +
-+xwdtopnm: %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT)
++$(SHHOPTBINARIES): %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT)
 +	$(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \
 +	  $(LIBSHHOPT) $(CDEBUG)
  
  ifeq ($(TIFFLIB_DIR),$(TIFFDIR))
  # We're using the internal Tiff library, so make sure it's built
-@@ -130,18 +133,18 @@
+@@ -130,18 +134,18 @@
  endif
  
  # The Tiff library references math functions.
@@ -75,7 +84,7 @@
  
  ifeq ($(URTLIB_DIR),$(URTDIR))
  # We're using the internal URT library, so make sure it's built
-@@ -178,22 +181,20 @@
+@@ -178,22 +182,20 @@
  # backward compatibility: program used to be gemtopbm
  	rm -f $(INSTALLBINARIES)/gemtopbm
  	ln -s $(INSTALLBINARIES)/gemtopnm$(EXE) $(INSTALLBINARIES)/gemtopbm
diff --git a/graphics/netpbm/files/patch-bg b/graphics/netpbm/files/patch-bg
index 3647f4f8b48c..6c1cbb4ca698 100644
--- a/graphics/netpbm/files/patch-bg
+++ b/graphics/netpbm/files/patch-bg
@@ -1,16 +1,16 @@
---- ppm/Makefile.orig	Fri Jun  2 01:22:16 2000
-+++ ppm/Makefile	Sat Jun  3 00:00:00 2000
+--- ppm/Makefile.orig	Sat Jul  1 03:26:39 2000
++++ ppm/Makefile	Sat Jul  1 12:00:00 2000
 @@ -3,8 +3,7 @@
  
  LIBROOT = ppm
  LIBPPM = lib$(LIBROOT).$(NETPBMLIBSUFFIX)
 -MAJ = 9
--MIN = 3
+-MIN = 5
 +SOVER = 1
  
  PGMDIR = $(SRCDIR)/pgm
  LIBPGM = libpgm.$(NETPBMLIBSUFFIX)
-@@ -24,7 +23,7 @@
+@@ -24,23 +23,25 @@
  PORTBINARIES =	bmptoppm eyuvtoppm gouldtoppm hpcdtoppm ilbmtoppm imgtoppm \
  		leaftoppm mtvtoppm pcxtoppm pgmtoppm pi1toppm picttoppm \
  		pjtoppm \
@@ -19,22 +19,27 @@
  		ppmdim ppmdist ppmdither \
  		ppmflash ppmhist ppmmake ppmmix ppmnorm \
  		ppmquant ppmrelief ppmshift ppmspread ppmtoacad \
-@@ -35,12 +34,13 @@
+-		ppmtobmp ppmtoeyuv ppmtogif ppmtoleaf \
++		ppmtoeyuv ppmtogif ppmtoleaf \
+ 		ppmtoicr ppmtoilbm ppmtomitsu \
+ 		ppmtopcx ppmtopgm ppmtopi1 ppmtopict ppmtopj \
+ 		ppmtopjxl ppmtopuzz ppmtorgb3 ppmtosixel \
  		ppmtotga ppmtouil ppmtowinicon ppmtoxpm ppmtoyuv \
  		ppmtoyuvsplit ppmtv \
  		qrttoppm rawtoppm rgb3toppm sldtoppm spctoppm \
 -		sputoppm tgatoppm winicontoppm ximtoppm xpmtoppm xvminitoppm \
 +		sputoppm winicontoppm xpmtoppm xvminitoppm \
  		yuvtoppm yuvsplittoppm
++SHHOPTBINARIES = ppmcolormask ppmtobmp tgatoppm ximtoppm
  
  # We don't build vidtoppm by default, because it requires special libraries
  # and there is no known requirement for vidtoppm.
  
-+NOMERGEBINARIES = ppmcolormask ppmntsc tgatoppm ximtoppm
++NOMERGEBINARIES = $(SHHOPTBINARIES) ppmntsc
  ifneq ($(JPEGLIB_DIR), NONE)
    ifneq ($(JPEGHDR_DIR), NONE)
        NOMERGEBINARIES += ppmtojpeg
-@@ -49,7 +49,7 @@
+@@ -49,7 +50,7 @@
  
  MERGEBINARIES = $(PORTBINARIES) $(MATHBINARIES)
  
@@ -43,7 +48,7 @@
  BINARIES = $(MERGEBINARIES) $(NOMERGEBINARIES) 
  SCRIPTS = ppmquantall ppmshadow ppmfade
  
-@@ -58,6 +58,8 @@
+@@ -58,6 +59,8 @@
  MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
  
  LIBOBJECTS = libppm1.o libppm2.o libppm3.o libppm4.o libppm5.o bitio.o
@@ -52,7 +57,7 @@
  
  MANUALS1 = $(BINARIES) $(SCRIPTS)
  MANUALS3 = libppm
-@@ -65,18 +67,24 @@
+@@ -65,18 +68,24 @@
  
  MERGENAME= ppmmerge
  
@@ -67,7 +72,7 @@
 -	$(MAKE) -C ppmtompeg all
  
 -ppmtojpeg: %: %.o $(NETPBMLIBS) $(LIBOPT)
-+ppmcolormask tgatoppm ximtoppm: %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT)
++$(SHHOPTBINARIES): %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT)
  	$(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \
 -	  -L$(JPEGLIB_DIR) -ljpeg $(CDEBUG)
 +	  $(LIBSHHOPT) $(CDEBUG)
@@ -82,7 +87,7 @@
  
  # And libraries.
  $(PBMDIR)/$(LIBPBM): FORCE
-@@ -89,19 +97,19 @@
+@@ -89,19 +98,19 @@
  
  .PHONY: install.merge
  install.merge: install.merge.common
diff --git a/graphics/netpbm/files/patch-bk b/graphics/netpbm/files/patch-bk
index 1898c58c30cb..e01ccdfab396 100644
--- a/graphics/netpbm/files/patch-bk
+++ b/graphics/netpbm/files/patch-bk
@@ -1,6 +1,6 @@
---- pbm/libpbm1.c.orig	Sat May  6 16:33:57 2000
-+++ pbm/libpbm1.c	Mon May  8 00:00:00 2000
-@@ -14,7 +14,6 @@
+--- pbm/libpbm1.c.orig	Tue Jun 20 04:24:00 2000
++++ pbm/libpbm1.c	Sat Jul  1 12:00:00 2000
+@@ -18,7 +18,6 @@
  #include "version.h"
  #include "../compile.h"
  #include "libpbm.h"
@@ -8,7 +8,7 @@
  
  #if __STDC__
  #include <stdarg.h>
-@@ -141,17 +140,6 @@
+@@ -145,27 +144,6 @@
          }
      return 1;
      }
@@ -23,6 +23,16 @@
 -    optParseOptions(argc, argv, opt, allowNegNum);
 -
 -}
+-
+-
+-
+-void 
+-pm_optParseOptions2(int * const argc_p, char *argv[],
+-                    const optStruct2 opt, const unsigned long flags) {
+-
+-    optParseOptions2(argc_p, argv, opt, flags);
+-
+-}
  
  
  /* Log base two hacks. */
diff --git a/graphics/netpbm/files/patch-bu b/graphics/netpbm/files/patch-bu
new file mode 100644
index 000000000000..cd9733762d0c
--- /dev/null
+++ b/graphics/netpbm/files/patch-bu
@@ -0,0 +1,43 @@
+--- pnm/pnmcut.c.orig	Fri Jun 30 07:59:22 2000
++++ pnm/pnmcut.c	Sat Jul  1 12:00:00 2000
+@@ -12,6 +12,7 @@
+ 
+ #include <limits.h>
+ #include "pnm.h"
++#include "shhopt.h"
+ 
+ #define UNSPEC INT_MAX
+     /* UNSPEC is the value we use for an argument that is not specified
+@@ -58,6 +59,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,   "left",       OPT_INT,    &cmdline_p->left,           0);
+     OPTENTRY(0,   "right",      OPT_INT,    &cmdline_p->right,          0);
+@@ -66,6 +76,7 @@
+     OPTENTRY(0,   "width",      OPT_INT,    &cmdline_p->width,          0);
+     OPTENTRY(0,   "height",     OPT_INT,    &cmdline_p->height,         0);
+     OPTENTRY(0,   "verbose",    OPT_FLAG,   &cmdline_p->verbose,        0);
++    option_def[option_def_index].type = OPT_END;
+ 
+     /* Set the defaults */
+     cmdline_p->left = UNSPEC;
+@@ -80,7 +91,7 @@
+     opt.short_allowed = FALSE;  /* We have no short (old-fashioned) options */
+     opt.allowNegNum = TRUE;  /* 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 (cmdline_p->width < 0)
diff --git a/graphics/netpbm/files/patch-bv b/graphics/netpbm/files/patch-bv
new file mode 100644
index 000000000000..b7c5f563c506
--- /dev/null
+++ b/graphics/netpbm/files/patch-bv
@@ -0,0 +1,38 @@
+--- pnm/pnmfile.c.orig	Mon Jun 19 10:04:17 2000
++++ pnm/pnmfile.c	Sat Jul  1 12:00:00 2000
+@@ -11,6 +11,7 @@
+ */
+ 
+ #include "pnm.h"
++#include "shhopt.h"
+ 
+ 
+ struct cmdline_info {
+@@ -38,8 +39,18 @@
+ 
+     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,   "allimages", OPT_FLAG,   &cmdline_p->allimages,     0);
++    option_def[option_def_index].type = OPT_END;
+ 
+     /* Set the defaults */
+     cmdline_p->allimages = FALSE;
+@@ -48,7 +59,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 all of *cmdline_p. */
+ 
+     cmdline_p->input_filespec = argv + 1;
diff --git a/graphics/netpbm/files/patch-bw b/graphics/netpbm/files/patch-bw
new file mode 100644
index 000000000000..e327c5e84a6f
--- /dev/null
+++ b/graphics/netpbm/files/patch-bw
@@ -0,0 +1,38 @@
+--- pnm/pnmsplit.c.orig	Sat Jul  1 03:09:40 2000
++++ pnm/pnmsplit.c	Sat Jul  1 12:00:00 2000
+@@ -13,6 +13,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include "pnm.h"
++#include "shhopt.h"
+ 
+ 
+ struct cmdline_info {
+@@ -40,8 +41,18 @@
+ 
+     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,   "debug", OPT_FLAG,   &cmdline_p->debug,     0);
++    option_def[option_def_index].type = OPT_END;
+ 
+     /* Set the defaults */
+     cmdline_p->debug = FALSE;
+@@ -50,7 +61,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 all of *cmdline_p. */
+ 
+     if (argc - 1 < 1) 
diff --git a/graphics/netpbm/files/patch-bx b/graphics/netpbm/files/patch-bx
new file mode 100644
index 000000000000..49c2f834e158
--- /dev/null
+++ b/graphics/netpbm/files/patch-bx
@@ -0,0 +1,43 @@
+--- pnm/pstopnm.c.orig	Sat Jul  1 03:19:11 2000
++++ pnm/pstopnm.c	Sat Jul  1 12:00:00 2000
+@@ -16,6 +16,7 @@
+ #include <sys/wait.h>   /* For popen() exit codes */
+ #include <sys/stat.h>
+ #include "pnm.h"
++#include "shhopt.h"
+ 
+ enum orientation {PORTRAIT, LANDSCAPE, UNSPECIFIED};
+ struct box {
+@@ -69,6 +70,15 @@
+     int portrait_opt, landscape_opt;
+     float llx, lly, urx, ury;
+     
++    /* 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,   "forceplain", OPT_FLAG,   &cmdline_p->forceplain,     0);
+     OPTENTRY(0,   "llx",        OPT_FLOAT,  &llx,                       0);
+@@ -89,6 +99,7 @@
+     OPTENTRY(0,   "portrait",   OPT_FLAG,   &portrait_opt,              0);
+     OPTENTRY(0,   "landscape",  OPT_FLAG,   &landscape_opt,             0);
+     OPTENTRY(0,   "stdout",     OPT_FLAG,   &cmdline_p->goto_stdout,    0);
++    option_def[option_def_index].type = OPT_END;
+ 
+     /* Set the defaults */
+     cmdline_p->forceplain = FALSE;
+@@ -106,7 +117,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 (argc-1 == 0)
diff --git a/graphics/netpbm/pkg-plist b/graphics/netpbm/pkg-plist
index 4fb0192559f6..e1d3fe68e2d1 100644
--- a/graphics/netpbm/pkg-plist
+++ b/graphics/netpbm/pkg-plist
@@ -57,6 +57,7 @@ bin/pbmtopi3
 bin/pbmtopk
 bin/pbmtoplot
 bin/pbmtoptx
+bin/pbmtowbmp
 bin/pbmtox10bm
 bin/pbmtoxbm
 bin/pbmtoybm
@@ -114,6 +115,7 @@ bin/pnmrotate
 bin/pnmscale
 bin/pnmshear
 bin/pnmsmooth
+bin/pnmsplit
 bin/pnmtile
 bin/pnmtoddif
 bin/pnmtofits
@@ -194,6 +196,7 @@ bin/spottopgm
 bin/sputoppm
 bin/tgatoppm
 bin/tifftopnm
+bin/wbmptopbm
 bin/winicontoppm
 bin/xbmtopbm
 bin/ximtoppm