Attachment #12611 for bug #24284

View | Details | Raw Unified | Return to bug 24284
Collapse All | Expand All

Lines 6-12 Link Here

(-)graphics/netpbm/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= netpbm	8	PORTNAME= netpbm
9	PORTVERSION= 9.9	9	PORTVERSION= 9.10
10	CATEGORIES= graphics	10	CATEGORIES= graphics
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}

Line 1 Link Here

(-)graphics/netpbm/distinfo (-1 / +1 lines)
1	MD5 (netpbm-9.9.tgz) = dd80d319eaad3ad9930e9078dee20219	1	MD5 (netpbm-9.10.tgz) = b39c20ffcc83d5d8474ba4af204caec6




MAN1+=	mdatopbm.1
MAN1+=	mgrtopbm.1
MAN1+=	mtvtoppm.1
MAN1+=	palmtopnm.1
MAN1+=	pamchannel.1
MAN1+=	pamcut.1
MAN1+=	pamfile.1

MAN1+=	pnminterp.1
MAN1+=	pnminvert.1
MAN1+=	pnmmargin.1
MAN1+=	pnmmontage.1
MAN1+=	pnmnlfilt.1
MAN1+=	pnmpad.1
MAN1+=	pnmpaste.1

MAN1+=	pnmtofiasco.1
MAN1+=	pnmtofits.1
MAN1+=	pnmtojbig.1
MAN1+=	pnmtopalm.1 
MAN1+=	pnmtoplainpnm.1
MAN1+=	pnmtopng.1
MAN1+=	pnmtops.1

Lines 1-12 Link Here

(-)graphics/netpbm/files/patch-ba (-8 / +10 lines)
1	--- GNUmakefile.orig Mon Jun 5 13:30:53 2000	1	--- GNUmakefile.orig Thu Jan 11 12:01:03 2001
2	+++ GNUmakefile Sat Jun 10 00:00:00 2000	2	+++ GNUmakefile Sat Jan 13 00:00:00 2001
3	@@ -116,8 +116,7 @@	3	@@ -128,10 +128,8 @@
4	.PHONY: install.hdr	4	.PHONY: install.hdr
5	install.hdr:	5	install.hdr:
6	./mkinstalldirs $(INSTALLHDRS)	6	$(SRCDIR)/mkinstalldirs $(INSTALLHDRS)
7	- $(INSTALL) -c -m$(INSTALL_PERM_HDR) pbmplus.h $(INSTALLHDRS)	7	- $(INSTALL) -c -m$(INSTALL_PERM_HDR) \
8	- $(INSTALL) -c -m$(INSTALL_PERM_HDR) shhopt/shhopt.h $(INSTALLHDRS)	8	+ ${BSD_INSTALL_DATA} \
9	+ ${BSD_INSTALL_DATA} pbmplus.h $(INSTALLHDRS)	9	$(SRCDIR)/pbmplus.h $(INSTALLHDRS)
		10	- $(INSTALL) -c -m$(INSTALL_PERM_HDR) \
		11	- $(SRCDIR)/shhopt/shhopt.h $(INSTALLHDRS)
10	for i in $(SUBDIRS) ; do \	12	for i in $(SUBDIRS) ; do \
11	$(MAKE) -C $$i install.hdr ; \	13	$(MAKE) -C $$i -f $(SRCDIR)/$$i/Makefile install.hdr ; \
12	done	14	done




--- Makefile.common.orig	Thu Jan 11 07:20:19 2001
+++ Makefile.common	Sat Jan 13 00:00:00 2001
@@ -117,24 +117,20 @@
 
 $(LIBOBJECTS): %.o: $(SRCSUBDIR)/%.c
 # Note that the user may have configured -I options into CFLAGS.

-          `$(LIBOPT) $(LIBLIBS)` -lc
+$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT) lib$(LIBROOT).a
+	$(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \
+          `$(LIBOPT) $(LIBLIBS)` $(LDFLAGS)
 
 # Static library.  Unused by default, but with a small change to make files...
 lib$(LIBROOT).a: $(LIBOBJECTS) $(LIBOBJECTS_X)
@@ -164,7 +160,7 @@
 install.merge.common: $(MERGENAME) $(NOMERGEBINARIES) install.script
 	cd $(INSTALLBINARIES) ; rm -f $(BINARIES) $(MERGE_ALIASES)
 ifneq ($(MERGENAME)x,x)

             $(MERGENAME) $(INSTALLBINARIES)
 	cd $(INSTALLBINARIES) ; \
 	   for i in $(MERGEBINARIES) $(MERGE_ALIASES) ; \
@@ -174,7 +170,7 @@
 ifneq ($(NOMERGEBINARIES)x,x)
 	for x in $(NOMERGEBINARIES); \
         do \

                $$x $(INSTALLBINARIES); \
 	done
 endif
@@ -185,7 +181,7 @@
 # Make and Install know that pbmmake.exe counts as pbmmake.
 	for x in $(BINARIES); \
 	do \

                $$x $(INSTALLBINARIES); \
 	done
 
@@ -194,7 +190,7 @@
 ifneq ($(SCRIPTS)x,x)
 	for x in $(SCRIPTS); \
 	do \

                $(INSTALLSCRIPTS); \
 	done
 endif
@@ -231,7 +227,7 @@
 # directory when you compile your programs.
 	for x in $(INTERFACE_HEADERS); \
 	do \

                $(INSTALLHDRS); \
 	done
 
@@ -245,15 +241,14 @@
 # here causes the static library to be built at that time.
 .PHONY: install.staticlib
 install.staticlib: lib$(LIBROOT).a




--- Makefile.config.orig	Mon Jan  8 03:52:54 2001
+++ Makefile.config	Sat Jan 13 00:00:00 2001
@@ -39,7 +39,7 @@
 #Tru64 (= Digital Unix):
 #CC = cc
 #CC = gcc
-CC = gcc

 
 # The linker.
 LD = $(CC)
@@ -71,7 +71,7 @@
 # calls compress or pack.  Mantocat, included with Netpbm, is used on
 # systems which use man pages in the "cat" format.
 

 #DJGPP/Windows:
 #MANCP = $(SRCDIR)/mantocat
 
@@ -85,7 +85,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.

 # On DEC Tru64 4.0F (at least), you need -DLONG_32 for ppmtompeg.
 #Tru64:
 #CFLAGS = -O2 -std1 DLONG_32 $(CDEBUG)
@@ -100,7 +100,7 @@
   
 # linker options.  
 
-LDFLAGS =
+#LDFLAGS =
 # Eunice users may want to use -noshare so that the executables can
 # run standalone:
 #LDFLAGS = -noshare
@@ -113,7 +113,7 @@
 # For a traditional linker:
 #LDFLAGS = -R$(INSTALLLIBS)
 #If the linker is gcc (e.g. NetBSD):
-#LDFLAGS = -Wl,--rpath,$(INSTALLLIBS)
+LDFLAGS = -Wl,--rpath,$(INSTALLLIBS)
 
 # Linker options for created Netpbm shared libraries.
 
@@ -139,7 +139,7 @@
 # independent code, so you need -fpic or fPIC here.  (The rule is: if 
 # -fpic works, use it.  If it bombs, go to fPIC).
 

 # Solaris, SunOS, and NetBSD:
 #CFLAGS_SHLIB = -fpic
 #CFLAGS_SHLIB = -fPIC
@@ -155,11 +155,11 @@
 # but otherwise will not.
 
 # Use the Tiff library included with Netpbm:

 # OSF, Tru64:
 #TIFFHDR_DIR = /usr/local1/DEC/include
 #TIFFLIB_DIR = /usr/local1/DEC/lib
@@ -186,11 +186,11 @@
 # at least JPEGLIB_DIR here, or the tiff converters will not build at
 # all.
 

 # OSF, Tru64:
 #JPEGLIB_DIR = /usr/local1/DEC/lib
 #JPEGHDR_DIR = /usr/local1/DEC/include
@@ -208,11 +208,11 @@
 # here.  If you do not have the PNG library, and still want to
 # successully build everything else, put NONE for these.
 

 # OSF/Tru64:
 #PNGLIB_DIR = /usr/local1/DEC/lib
 #PNGHDR_DIR = /usr/local1/DEC/include
@@ -226,8 +226,10 @@
 
 # And the Utah Raster Toolkit (aka URT aka RLE) library:
 

 
 # These are -l options to link in the network libraries.  Often, these are
 # built into the standard C library, so this can be null.  If you don't 
@@ -321,7 +323,7 @@
 # Specify the directory where you want data files that the Neptbm programs
 # access to be installed
 
-INSTALLDATA = $(INSTALL_PREFIX)/lib
+INSTALLDATA = $(INSTALL_PREFIX)/share/netpbm
 
 
 #NETPBMLIBSUFFIX is the suffix on the filename of the generated and installed




--- pnm/Makefile.orig	Mon Jan  8 03:54:37 2001
+++ pnm/Makefile	Sat Jan 13 00:00:00 2001
@@ -48,6 +48,8 @@
   JPEGLD = -L$(JPEGLIB_DIR) -ljpeg
 endif

 # We tend to separate out the build targets so that we don't have
 # any more dependencies for a given target than it really needs.
 # That way, if there is a problem with a dependency, we can still
@@ -55,22 +57,24 @@
 # This package is so big, it's useful even when some parts won't 
 # build.
 

-		pamfile pamtopnm \
-		pnmalias pnmarith pnmcat pnmcomp pnmconvol pnmcrop \
-		pnmcut pnmdepth pnmenlarge pnmfile pnmflip pnmhisteq \
-		pnmhistmap pnminterp pnminvert pnmmontage pnmpad pnmpaste \
-		pnmsmooth pnmsplit pnmtile pnmtoddif pnmtofits \
+PORTBINARIES =	fitstopnm gemtopnm \
+		pnmalias pnmarith pnmcat pnmcomp pnmconvol \
+		pnmdepth pnmenlarge pnmflip pnmhisteq \
+		pnmhistmap pnminvert pnmpad pnmpaste \

+		pnmtosgi pnmtosir pnmtoxwd \
+		rasttopnm sgitopnm sirtopnm zeisstopnm
+MATHBINARIES =	pnmgamma pnmnlfilt pnmrotate pnmshear
+SHHOPTBINARIES =	giftopnm pamchannel pamcut pamfile pamtopnm pnmcrop \
+		pnmcut pnmfile pnminterp pnmmontage 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

 ifneq ($(PNGHDR_DIR),NONE)
   ifneq ($(PNGLIB_DIR),NONE)
     NOMERGEBINARIES += pnmtopng pngtopnm
@@ -107,6 +111,8 @@
 MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
 
 LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o libpam.o

 
 MANUALS1 = $(BINARIES) $(SCRIPTS)
 MANUALS3 = libpnm
@@ -127,6 +133,14 @@
 	$(MAKE) -C jbig all
 	$(MAKE) -C pnmtopalm all
 
+$(SHHOPTBINARIES): %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT)
+	$(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \

 ifeq ($(TIFFLIB_DIR),$(TIFFDIR))
 # We're using the internal Tiff library, so make sure it's built
 TIFFLIB_DEP = $(TIFFDIR)/$(LIBTIFF)
@@ -137,17 +151,18 @@
 
 # The Tiff library references math functions.
 tifftopnm pnmtotiff pnmtotiffcmyk: %: %.o \

 
 ifeq ($(URTLIB_DIR),$(URTDIR))
 # We're using the internal URT library, so make sure it's built
@@ -202,6 +217,9 @@
 install.man: install.man.common
 	$(MAKE) -C jbig install.man
 	$(MAKE) -C fiasco install.man
 	$(MAKE) -C jbig install.man
 	$(MAKE) -C pnmtopalm install.man
+
+$(SRCDIR)/shhopt/libshhopt.a:
+	cd ../shhopt; $(MAKE) libshhopt.a




--- ppm/Makefile.orig	Sun Dec  3 07:41:51 2000
+++ ppm/Makefile	Sat Jan 13 00:00:00 2001
@@ -22,26 +22,31 @@
 NETPBMLIBS = $(LIBPPM) $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM)
 LIBLIBS = $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM)

+		ppmflash ppmmake ppmmix ppmnorm \
 		ppmquant ppmrelief ppmshift ppmspread ppmtoacad \
-		ppmtobmp ppmtoeyuv ppmtogif ppmtoleaf \
+		ppmtoeyuv ppmtoleaf \
 		ppmtoicr ppmtoilbm ppmtolj ppmtomitsu \
 		ppmtopcx ppmtopgm ppmtopi1 ppmtopict ppmtopj \
 		ppmtopjxl ppmtopuzz ppmtorgb3 ppmtosixel \

-		sputoppm tgatoppm winicontoppm ximtoppm xpmtoppm xvminitoppm \
+		sputoppm winicontoppm xpmtoppm xvminitoppm \
 		yuvtoppm yuvsplittoppm
+SHHOPTBINARIES =	ppmchange ppmcolormask ppmhist ppmtobmp ppmtogif \
+		tgatoppm ximtoppm 
 
 # We don't build vidtoppm by default, because it requires special libraries
 # and there is no known requirement for vidtoppm.




--- pnm/jpegtopnm.c.orig	Sat Dec 16 17:19:20 2000
+++ pnm/jpegtopnm.c	Sat Jan 13 00:00:00 2001
@@ -162,6 +162,15 @@
     char ** const argv_parse = malloc(argc*sizeof(char *));
     /* argv, except we modify it as we parse */
 

     option_def_index = 0;   /* incremented by OPTENTRY */
     OPTENTRY(0, "verbose",     OPT_FLAG,   &cmdline_p->verbose,        0);
     OPTENTRY(0, "dct",         OPT_STRING, &dctval,                    0);
@@ -171,6 +180,7 @@
     OPTENTRY(0, "adobe",       OPT_FLAG,   &adobe,                     0);
     OPTENTRY(0, "notadobe",    OPT_FLAG,   &notadobe,                  0);
     OPTENTRY(0, "comments",    OPT_FLAG,   &cmdline_p->comments,       0);
+    option_def[option_def_index].type = OPT_END;
 
     /* Set the defaults */
     cmdline_p->verbose = FALSE;
@@ -190,7 +200,7 @@
     argc_parse = argc;
     for (i=0; i < argc; i++) argv_parse[i] = argv[i];
 




--- ppm/ppmtojpeg.c.orig	Thu Jan 11 07:30:35 2001
+++ ppm/ppmtojpeg.c	Sat Jan 13 00:00:00 2001
@@ -334,6 +334,15 @@
     char ** const argv_parse = malloc(argc*sizeof(char *));
     /* argv, except we modify it as we parse */
 

     option_def_index = 0;   /* incremented by OPTENTRY */
     OPTENTRY(0, "verbose",     OPT_FLAG,   &cmdline_p->verbose,        0);
     OPTENTRY(0, "quality",     OPT_UINT,   &cmdline_p->quality,        0);
@@ -354,6 +363,7 @@
     OPTENTRY(0, "optimize",    OPT_FLAG,   &cmdline_p->optimize,       0);
     OPTENTRY(0, "optimise",    OPT_FLAG,   &cmdline_p->optimize,       0);
     OPTENTRY(0, "restart",     OPT_STRING, &restart,                   0);
     OPTENTRY(0, "comment",     OPT_STRING, &cmdline_p->comment,        0);
+    option_def[option_def_index].type = OPT_END;
 
     /* Set the defaults */
     cmdline_p->verbose = FALSE;
@@ -382,7 +392,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_parse, argv, opt, 0);
+    optParseOptions2(&argc_parse, argv, opt, 0);
         /* Uses and sets argc_parse, argv, and some of *cmdline_p and others. */
 
     if (argc_parse - 1 == 0)




--- ppm/ppmchange.c.orig	Mon Jan  8 05:12:30 2001
+++ ppm/ppmchange.c	Sat Jan 13 00:00:00 2001
@@ -14,6 +14,7 @@
 */
 

 #define TCOLS 256
 #define SQRT3 1.73205080756887729352
     /* The square root of 3 */
@@ -53,9 +54,19 @@
 
     char * remainder_color;  /* value of -remainder option */
 
+    /* Create the OptStruct structure describing our options */
+    #define OPTENTRY(shortvalue,longvalue,typevalue,outputvalue,flagvalue) {\

+      option_def_index++; \
+      }
     option_def_index = 0;   /* incremented by OPTENTRY */
     OPTENTRY(0,   "closeness",     OPT_INT,    &cmdlineP->closeness,     0);
     OPTENTRY(0,   "remainder",     OPT_STRING, &remainder_color,         0);
+    option_def[option_def_index].type = OPT_END;
 
     /* Set the defaults */
     cmdlineP->closeness = 0;
@@ -65,7 +76,7 @@
     opt.short_allowed = FALSE;  /* We have no short (old-fashioned) options */
     opt.allowNegNum = FALSE;  /* We may have parms that are negative numbers */
 

+    optParseOptions2(&argc, argv, opt, 0);
         /* Uses and sets argc, argv, and some of *cmdlineP and others. */
 
     if (remainder_color) {




--- ppm/ppmtompeg/parallel.c.orig	Sat Jul  1 16:51:53 2000
+++ ppm/ppmtompeg/parallel.c	Sat Jan 13 00:00:00 2001
@@ -70,9 +70,6 @@
  *
  */

 /* 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
@@ -97,7 +94,6 @@
 #include <string.h>
 #include <signal.h>
 #include "all.h"
-#include "param.h"
 #include "mpeg.h"
 #include "prototypes.h"
 #include "parallel.h"
@@ -105,6 +101,7 @@
 #include "fsize.h"
 #include "combine.h"
 #include "frames.h"
+#include "param.h"
 
 
 #define MAX_IO_SERVERS	10




--- pnm/giftopnm.c.orig	Wed Jan 10 12:59:44 2001
+++ pnm/giftopnm.c	Sat Jan 13 00:00:00 2001
@@ -11,6 +11,7 @@
 
 #include <string.h>
 #include "pnm.h"
+#include "shhopt.h"
 
 #define GIFMAXVAL 255
 #define MAXCOLORMAPSIZE 256
@@ -56,11 +57,21 @@
 
     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,   "verbose",     OPT_FLAG,   &cmdline_p->verbose,         0);
     OPTENTRY(0,   "comments",    OPT_FLAG,   &cmdline_p->comments,        0);
     OPTENTRY(0,   "image",       OPT_UINT,   &cmdline_p->image_no,        0);
     OPTENTRY(0,   "alphaout",   OPT_STRING, &cmdline_p->alpha_filename, 0);
+    option_def[option_def_index].type = OPT_END;
 
     /* Set the defaults */
     cmdline_p->verbose = FALSE;
@@ -72,7 +83,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) 




--- pnm/pnmmontage.c.orig	Tue Jan  2 04:59:04 2001
+++ pnm/pnmmontage.c	Sat Jan 13 00:00:00 2001
@@ -11,6 +11,7 @@
  */
 
 #include "pam.h"
+#include "shhopt.h"
 #include <limits.h>
 #include <string.h>
 
@@ -172,8 +173,18 @@
   int helpflag = 0;
   optStruct option_def[100];
   optStruct2 opt;
-  unsigned option_def_index = 0;
+  unsigned 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('?', "?",       OPT_FLAG,   &helpflag,  0);
   OPTENTRY('h', "help",    OPT_FLAG,   &helpflag,  0);
   OPTENTRY( 0,  "header",  OPT_STRING, &headfname, 0);
@@ -189,6 +200,7 @@
   OPTENTRY('7', "7",       OPT_FLAG,   &q[7],      0);
   OPTENTRY('8', "8",       OPT_FLAG,   &q[8],      0);
   OPTENTRY('9', "9",       OPT_FLAG,   &q[9],      0);
+  option_def[option_def_index].type = OPT_END;
 
   opt.opt_table = option_def;
   opt.short_allowed = 0;
@@ -197,7 +209,7 @@
   pnm_init(&argc, argv);
 
   /* Check for flags. */
-  pm_optParseOptions2(&argc, argv, opt, 0);
+  optParseOptions2(&argc, argv, opt, 0);
 
   if (helpflag)
   {

Line 0 Link Here

(-)graphics/netpbm/files/patch-co (+11 lines)
	1	--- pnm/pnmtopalm/Makefile.orig Thu Jan 11 11:59:53 2001
	2	+++ pnm/pnmtopalm/Makefile Sat Jan 13 00:00:00 2001
	3	@@ -48,7 +48,7 @@
	4	$(SRCDIR)/mkinstalldirs $(INSTALLDATA)
	5	for x in palmcolor8.map palmgray1.map palmgray2.map palmgray4.map ;\
	6	do \
	7	- $(INSTALL) -c -m $(INSTALL_PERM_DATA) $(SRCSUBDIR)/$$x \
	8	+ ${BSD_INSTALL_DATA} $(SRCSUBDIR)/$$x \
	9	$(INSTALLDATA); \
	10	done
	11




--- ppm/ppmtogif.c.orig	Sat Dec 16 16:34:16 2000
+++ ppm/ppmtogif.c	Sat Jan 13 00:00:00 2001
@@ -22,6 +22,7 @@
 
 #include "ppm.h"
 #include "ppmcmap.h"
+#include "shhopt.h"
 
 #define MAXCOLORS 256
 
@@ -91,12 +92,22 @@
 
     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,   "interlace",   OPT_FLAG,   &cmdline_p->interlace,      0);
     OPTENTRY(0,   "sort",        OPT_FLAG,   &cmdline_p->sort,           0);
     OPTENTRY(0,   "mapfile",     OPT_STRING, &cmdline_p->mapfile,        0);
     OPTENTRY(0,   "transparent", OPT_STRING, &cmdline_p->transparent,    0);
     OPTENTRY(0,   "comment",     OPT_STRING, &cmdline_p->comment,        0);
+    option_def[option_def_index].type = OPT_END;
 
     /* Set the defaults */
     cmdline_p->interlace = FALSE;
@@ -109,7 +120,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) 




bin/mdatopbm
bin/mgrtopbm
bin/mtvtoppm
bin/palmtopnm
bin/pamchannel
bin/pamcut
bin/pamfile

bin/pnminvert
bin/pnmmargin
bin/pnmmerge
bin/pnmmontage
bin/pnmnlfilt
bin/pnmnoraw
bin/pnmpad

bin/pnmtofiasco
bin/pnmtofits
bin/pnmtojbig
bin/pnmtopalm
bin/pnmtoplainpnm
bin/pnmtopng
bin/pnmtops

lib/libppm.a
lib/libppm.so
lib/libppm.so.1
share/netpbm/palmcolor8.map
share/netpbm/palmgray1.map
share/netpbm/palmgray2.map
share/netpbm/palmgray4.map
@dirrm share/netpbm

Return to bug 24284

Lines 26-31 Link Here

(-)graphics/netpbm/files/manpages (+3 lines)
26	MAN1+= mdatopbm.1	26	MAN1+= mdatopbm.1
27	MAN1+= mgrtopbm.1	27	MAN1+= mgrtopbm.1
28	MAN1+= mtvtoppm.1	28	MAN1+= mtvtoppm.1
		29	MAN1+= palmtopnm.1
29	MAN1+= pamchannel.1	30	MAN1+= pamchannel.1
30	MAN1+= pamcut.1	31	MAN1+= pamcut.1
31	MAN1+= pamfile.1	32	MAN1+= pamfile.1
Lines 111-116 Link Here
111	MAN1+= pnminterp.1	112	MAN1+= pnminterp.1
112	MAN1+= pnminvert.1	113	MAN1+= pnminvert.1
113	MAN1+= pnmmargin.1	114	MAN1+= pnmmargin.1
		115	MAN1+= pnmmontage.1
114	MAN1+= pnmnlfilt.1	116	MAN1+= pnmnlfilt.1
115	MAN1+= pnmpad.1	117	MAN1+= pnmpad.1
116	MAN1+= pnmpaste.1	118	MAN1+= pnmpaste.1
Lines 126-131 Link Here
126	MAN1+= pnmtofiasco.1	128	MAN1+= pnmtofiasco.1
127	MAN1+= pnmtofits.1	129	MAN1+= pnmtofits.1
128	MAN1+= pnmtojbig.1	130	MAN1+= pnmtojbig.1
		131	MAN1+= pnmtopalm.1
129	MAN1+= pnmtoplainpnm.1	132	MAN1+= pnmtoplainpnm.1
130	MAN1+= pnmtopng.1	133	MAN1+= pnmtopng.1
131	MAN1+= pnmtops.1	134	MAN1+= pnmtops.1

Lines 1-6 Link Here

(-)graphics/netpbm/files/patch-bb (-10 / +10 lines)
1	--- Makefile.common.orig Sun Dec 3 07:36:01 2000	1	--- Makefile.common.orig Thu Jan 11 07:20:19 2001
2	+++ Makefile.common Fri Dec 8 00:00:00 2000	2	+++ Makefile.common Sat Jan 13 00:00:00 2001
3	@@ -115,24 +115,20 @@	3	@@ -117,24 +117,20 @@
4		4
5	$(LIBOBJECTS): %.o: $(SRCSUBDIR)/%.c	5	$(LIBOBJECTS): %.o: $(SRCSUBDIR)/%.c
6	# Note that the user may have configured -I options into CFLAGS.	6	# Note that the user may have configured -I options into CFLAGS.
Lines 28-38 Link Here
28	- `$(LIBOPT) $(LIBLIBS)` -lc	28	- `$(LIBOPT) $(LIBLIBS)` -lc
29	+$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT) lib$(LIBROOT).a	29	+$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT) lib$(LIBROOT).a
30	+ $(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \	30	+ $(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \
31	+ `$(LIBOPT) $(LIBLIBS)`	31	+ `$(LIBOPT) $(LIBLIBS)` $(LDFLAGS)
32		32
33	# Static library. Unused by default, but with a small change to make files...	33	# Static library. Unused by default, but with a small change to make files...
34	lib$(LIBROOT).a: $(LIBOBJECTS) $(LIBOBJECTS_X)	34	lib$(LIBROOT).a: $(LIBOBJECTS) $(LIBOBJECTS_X)
35	@@ -162,7 +158,7 @@	35	@@ -164,7 +160,7 @@
36	install.merge.common: $(MERGENAME) $(NOMERGEBINARIES) install.script	36	install.merge.common: $(MERGENAME) $(NOMERGEBINARIES) install.script
37	cd $(INSTALLBINARIES) ; rm -f $(BINARIES) $(MERGE_ALIASES)	37	cd $(INSTALLBINARIES) ; rm -f $(BINARIES) $(MERGE_ALIASES)
38	ifneq ($(MERGENAME)x,x)	38	ifneq ($(MERGENAME)x,x)
Lines 41-47 Link Here
41	$(MERGENAME) $(INSTALLBINARIES)	41	$(MERGENAME) $(INSTALLBINARIES)
42	cd $(INSTALLBINARIES) ; \	42	cd $(INSTALLBINARIES) ; \
43	for i in $(MERGEBINARIES) $(MERGE_ALIASES) ; \	43	for i in $(MERGEBINARIES) $(MERGE_ALIASES) ; \
44	@@ -172,7 +168,7 @@	44	@@ -174,7 +170,7 @@
45	ifneq ($(NOMERGEBINARIES)x,x)	45	ifneq ($(NOMERGEBINARIES)x,x)
46	for x in $(NOMERGEBINARIES); \	46	for x in $(NOMERGEBINARIES); \
47	do \	47	do \
Lines 50-56 Link Here
50	$$x $(INSTALLBINARIES); \	50	$$x $(INSTALLBINARIES); \
51	done	51	done
52	endif	52	endif
53	@@ -183,7 +179,7 @@	53	@@ -185,7 +181,7 @@
54	# Make and Install know that pbmmake.exe counts as pbmmake.	54	# Make and Install know that pbmmake.exe counts as pbmmake.
55	for x in $(BINARIES); \	55	for x in $(BINARIES); \
56	do \	56	do \
Lines 59-65 Link Here
59	$$x $(INSTALLBINARIES); \	59	$$x $(INSTALLBINARIES); \
60	done	60	done
61		61
62	@@ -192,7 +188,7 @@	62	@@ -194,7 +190,7 @@
63	ifneq ($(SCRIPTS)x,x)	63	ifneq ($(SCRIPTS)x,x)
64	for x in $(SCRIPTS); \	64	for x in $(SCRIPTS); \
65	do \	65	do \
Lines 68-74 Link Here
68	$(INSTALLSCRIPTS); \	68	$(INSTALLSCRIPTS); \
69	done	69	done
70	endif	70	endif
71	@@ -229,7 +225,7 @@	71	@@ -231,7 +227,7 @@
72	# directory when you compile your programs.	72	# directory when you compile your programs.
73	for x in $(INTERFACE_HEADERS); \	73	for x in $(INTERFACE_HEADERS); \
74	do \	74	do \
Lines 77-83 Link Here
77	$(INSTALLHDRS); \	77	$(INSTALLHDRS); \
78	done	78	done
79		79
80	@@ -243,15 +239,14 @@	80	@@ -245,15 +241,14 @@
81	# here causes the static library to be built at that time.	81	# here causes the static library to be built at that time.
82	.PHONY: install.staticlib	82	.PHONY: install.staticlib
83	install.staticlib: lib$(LIBROOT).a	83	install.staticlib: lib$(LIBROOT).a

Lines 1-7 Link Here

(-)graphics/netpbm/files/patch-bc (-10 / +37 lines)
1	--- Makefile.config.orig Sun Aug 20 01:29:00 2000	1	--- Makefile.config.orig Mon Jan 8 03:52:54 2001
2	+++ Makefile.config Tue Sep 5 00:00:00 2000	2	+++ Makefile.config Sat Jan 13 00:00:00 2001
3	@@ -39,7 +39,7 @@	3	@@ -39,7 +39,7 @@
4	#Tru64:	4	#Tru64 (= Digital Unix):
5	#CC = cc	5	#CC = cc
6	#CC = gcc	6	#CC = gcc
7	-CC = gcc	7	-CC = gcc
Lines 9-15 Link Here
9		9
10	# The linker.	10	# The linker.
11	LD = $(CC)	11	LD = $(CC)
12	@@ -65,7 +65,7 @@	12	@@ -71,7 +71,7 @@
13	# calls compress or pack. Mantocat, included with Netpbm, is used on	13	# calls compress or pack. Mantocat, included with Netpbm, is used on
14	# systems which use man pages in the "cat" format.	14	# systems which use man pages in the "cat" format.
15		15
Lines 18-24 Link Here
18	#DJGPP/Windows:	18	#DJGPP/Windows:
19	#MANCP = $(SRCDIR)/mantocat	19	#MANCP = $(SRCDIR)/mantocat
20		20
21	@@ -79,7 +79,7 @@	21	@@ -85,7 +85,7 @@
22	# -ansi and -Werror should work too, but are not included	22	# -ansi and -Werror should work too, but are not included
23	# by default because there's no point in daring the build to fail.	23	# by default because there's no point in daring the build to fail.
24	# -pedantic isn't a problem because it causes at worst a warning.	24	# -pedantic isn't a problem because it causes at worst a warning.
Lines 27-33 Link Here
27	# On DEC Tru64 4.0F (at least), you need -DLONG_32 for ppmtompeg.	27	# On DEC Tru64 4.0F (at least), you need -DLONG_32 for ppmtompeg.
28	#Tru64:	28	#Tru64:
29	#CFLAGS = -O2 -std1 DLONG_32 $(CDEBUG)	29	#CFLAGS = -O2 -std1 DLONG_32 $(CDEBUG)
30	@@ -133,7 +133,7 @@	30	@@ -100,7 +100,7 @@
		31
		32	# linker options.
		33
		34	-LDFLAGS =
		35	+#LDFLAGS =
		36	# Eunice users may want to use -noshare so that the executables can
		37	# run standalone:
		38	#LDFLAGS = -noshare
		39	@@ -113,7 +113,7 @@
		40	# For a traditional linker:
		41	#LDFLAGS = -R$(INSTALLLIBS)
		42	#If the linker is gcc (e.g. NetBSD):
		43	-#LDFLAGS = -Wl,--rpath,$(INSTALLLIBS)
		44	+LDFLAGS = -Wl,--rpath,$(INSTALLLIBS)
		45
		46	# Linker options for created Netpbm shared libraries.
		47
		48	@@ -139,7 +139,7 @@
31	# independent code, so you need -fpic or fPIC here. (The rule is: if	49	# independent code, so you need -fpic or fPIC here. (The rule is: if
32	# -fpic works, use it. If it bombs, go to fPIC).	50	# -fpic works, use it. If it bombs, go to fPIC).
33		51
Lines 36-42 Link Here
36	# Solaris, SunOS, and NetBSD:	54	# Solaris, SunOS, and NetBSD:
37	#CFLAGS_SHLIB = -fpic	55	#CFLAGS_SHLIB = -fpic
38	#CFLAGS_SHLIB = -fPIC	56	#CFLAGS_SHLIB = -fPIC
39	@@ -149,11 +149,11 @@	57	@@ -155,11 +155,11 @@
40	# but otherwise will not.	58	# but otherwise will not.
41		59
42	# Use the Tiff library included with Netpbm:	60	# Use the Tiff library included with Netpbm:
Lines 52-58 Link Here
52	# OSF, Tru64:	70	# OSF, Tru64:
53	#TIFFHDR_DIR = /usr/local1/DEC/include	71	#TIFFHDR_DIR = /usr/local1/DEC/include
54	#TIFFLIB_DIR = /usr/local1/DEC/lib	72	#TIFFLIB_DIR = /usr/local1/DEC/lib
55	@@ -174,11 +174,11 @@	73	@@ -186,11 +186,11 @@
56	# at least JPEGLIB_DIR here, or the tiff converters will not build at	74	# at least JPEGLIB_DIR here, or the tiff converters will not build at
57	# all.	75	# all.
58		76
Lines 68-74 Link Here
68	# OSF, Tru64:	86	# OSF, Tru64:
69	#JPEGLIB_DIR = /usr/local1/DEC/lib	87	#JPEGLIB_DIR = /usr/local1/DEC/lib
70	#JPEGHDR_DIR = /usr/local1/DEC/include	88	#JPEGHDR_DIR = /usr/local1/DEC/include
71	@@ -196,11 +196,11 @@	89	@@ -208,11 +208,11 @@
72	# here. If you do not have the PNG library, and still want to	90	# here. If you do not have the PNG library, and still want to
73	# successully build everything else, put NONE for these.	91	# successully build everything else, put NONE for these.
74		92
Lines 84-90 Link Here
84	# OSF/Tru64:	102	# OSF/Tru64:
85	#PNGLIB_DIR = /usr/local1/DEC/lib	103	#PNGLIB_DIR = /usr/local1/DEC/lib
86	#PNGHDR_DIR = /usr/local1/DEC/include	104	#PNGHDR_DIR = /usr/local1/DEC/include
87	@@ -214,8 +214,10 @@	105	@@ -226,8 +226,10 @@
88		106
89	# And the Utah Raster Toolkit (aka URT aka RLE) library:	107	# And the Utah Raster Toolkit (aka URT aka RLE) library:
90		108
Lines 97-99 Link Here
97		115
98	# These are -l options to link in the network libraries. Often, these are	116	# These are -l options to link in the network libraries. Often, these are
99	# built into the standard C library, so this can be null. If you don't	117	# built into the standard C library, so this can be null. If you don't
		118	@@ -321,7 +323,7 @@
		119	# Specify the directory where you want data files that the Neptbm programs
		120	# access to be installed
		121
		122	-INSTALLDATA = $(INSTALL_PREFIX)/lib
		123	+INSTALLDATA = $(INSTALL_PREFIX)/share/netpbm
		124
		125
		126	#NETPBMLIBSUFFIX is the suffix on the filename of the generated and installed

Lines 1-5 Link Here

(-)graphics/netpbm/files/patch-bf (-14 / +15 lines)
1	--- pnm/Makefile.orig Sun Dec 3 07:48:46 2000	1	--- pnm/Makefile.orig Mon Jan 8 03:54:37 2001
2	+++ pnm/Makefile Fri Dec 8 00:00:00 2000	2	+++ pnm/Makefile Sat Jan 13 00:00:00 2001
3	@@ -48,6 +48,8 @@	3	@@ -48,6 +48,8 @@
4	JPEGLD = -L$(JPEGLIB_DIR) -ljpeg	4	JPEGLD = -L$(JPEGLIB_DIR) -ljpeg
5	endif	5	endif
Lines 9-15 Link Here
9	# We tend to separate out the build targets so that we don't have	9	# We tend to separate out the build targets so that we don't have
10	# any more dependencies for a given target than it really needs.	10	# any more dependencies for a given target than it really needs.
11	# That way, if there is a problem with a dependency, we can still	11	# That way, if there is a problem with a dependency, we can still
12	@@ -55,22 +57,23 @@	12	@@ -55,22 +57,24 @@
13	# This package is so big, it's useful even when some parts won't	13	# This package is so big, it's useful even when some parts won't
14	# build.	14	# build.
15		15
Lines 17-25 Link Here
17	- pamfile pamtopnm \	17	- pamfile pamtopnm \
18	- pnmalias pnmarith pnmcat pnmcomp pnmconvol pnmcrop \	18	- pnmalias pnmarith pnmcat pnmcomp pnmconvol pnmcrop \
19	- pnmcut pnmdepth pnmenlarge pnmfile pnmflip pnmhisteq \	19	- pnmcut pnmdepth pnmenlarge pnmfile pnmflip pnmhisteq \
20	- pnmhistmap pnminterp pnminvert pnmpad pnmpaste \	20	- pnmhistmap pnminterp pnminvert pnmmontage pnmpad pnmpaste \
21	- pnmsmooth pnmsplit pnmtile pnmtoddif pnmtofits \	21	- pnmsmooth pnmsplit pnmtile pnmtoddif pnmtofits \
22	+PORTBINARIES = fitstopnm gemtopnm giftopnm \	22	+PORTBINARIES = fitstopnm gemtopnm \
23	+ pnmalias pnmarith pnmcat pnmcomp pnmconvol \	23	+ pnmalias pnmarith pnmcat pnmcomp pnmconvol \
24	+ pnmdepth pnmenlarge pnmflip pnmhisteq \	24	+ pnmdepth pnmenlarge pnmflip pnmhisteq \
25	+ pnmhistmap pnminvert pnmpad pnmpaste \	25	+ pnmhistmap pnminvert pnmpad pnmpaste \
Lines 31-38 Link Here
31	+ pnmtosgi pnmtosir pnmtoxwd \	31	+ pnmtosgi pnmtosir pnmtoxwd \
32	+ rasttopnm sgitopnm sirtopnm zeisstopnm	32	+ rasttopnm sgitopnm sirtopnm zeisstopnm
33	+MATHBINARIES = pnmgamma pnmnlfilt pnmrotate pnmshear	33	+MATHBINARIES = pnmgamma pnmnlfilt pnmrotate pnmshear
34	+SHHOPTBINARIES = pamchannel pamcut pamfile pamtopnm pnmcrop pnmcut \	34	+SHHOPTBINARIES = giftopnm pamchannel pamcut pamfile pamtopnm pnmcrop \
35	+ pnmfile pnminterp pnmsplit pstopnm xwdtopnm	35	+ pnmcut pnmfile pnminterp pnmmontage pnmsplit pstopnm \
		36	+ xwdtopnm
36		37
37	# We don't include programs that have special library dependencies in the	38	# We don't include programs that have special library dependencies in the
38	# merge scheme, because we don't want those dependencies to prevent us	39	# merge scheme, because we don't want those dependencies to prevent us
Lines 43-49 Link Here
43	ifneq ($(PNGHDR_DIR),NONE)	44	ifneq ($(PNGHDR_DIR),NONE)
44	ifneq ($(PNGLIB_DIR),NONE)	45	ifneq ($(PNGLIB_DIR),NONE)
45	NOMERGEBINARIES += pnmtopng pngtopnm	46	NOMERGEBINARIES += pnmtopng pngtopnm
46	@@ -107,6 +110,8 @@	47	@@ -107,6 +111,8 @@
47	MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))	48	MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
48		49
49	LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o libpam.o	50	LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o libpam.o
Lines 52-60 Link Here
52		53
53	MANUALS1 = $(BINARIES) $(SCRIPTS)	54	MANUALS1 = $(BINARIES) $(SCRIPTS)
54	MANUALS3 = libpnm	55	MANUALS3 = libpnm
55	@@ -125,6 +130,14 @@	56	@@ -127,6 +133,14 @@
56	$(MAKE) -C jbig all	57	$(MAKE) -C jbig all
57	$(MAKE) -C fiasco all	58	$(MAKE) -C pnmtopalm all
58		59
59	+$(SHHOPTBINARIES): %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT)	60	+$(SHHOPTBINARIES): %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT)
60	+ $(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \	61	+ $(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \
Lines 67-73 Link Here
67	ifeq ($(TIFFLIB_DIR),$(TIFFDIR))	68	ifeq ($(TIFFLIB_DIR),$(TIFFDIR))
68	# We're using the internal Tiff library, so make sure it's built	69	# We're using the internal Tiff library, so make sure it's built
69	TIFFLIB_DEP = $(TIFFDIR)/$(LIBTIFF)	70	TIFFLIB_DEP = $(TIFFDIR)/$(LIBTIFF)
70	@@ -135,17 +148,18 @@	71	@@ -137,17 +151,18 @@
71		72
72	# The Tiff library references math functions.	73	# The Tiff library references math functions.
73	tifftopnm pnmtotiff pnmtotiffcmyk: %: %.o \	74	tifftopnm pnmtotiff pnmtotiffcmyk: %: %.o \
Lines 90-99 Link Here
90		91
91	ifeq ($(URTLIB_DIR),$(URTDIR))	92	ifeq ($(URTLIB_DIR),$(URTDIR))
92	# We're using the internal URT library, so make sure it's built	93	# We're using the internal URT library, so make sure it's built
93	@@ -197,6 +211,9 @@	94	@@ -202,6 +217,9 @@
94	install.man: install.man.common
95	$(MAKE) -C jbig install.man
96	$(MAKE) -C fiasco install.man	95	$(MAKE) -C fiasco install.man
		96	$(MAKE) -C jbig install.man
		97	$(MAKE) -C pnmtopalm install.man
97	+	98	+
98	+$(SRCDIR)/shhopt/libshhopt.a:	99	+$(SRCDIR)/shhopt/libshhopt.a:
99	+ cd ../shhopt; $(MAKE) libshhopt.a	100	+ cd ../shhopt; $(MAKE) libshhopt.a

Lines 1-5 Link Here

(-)graphics/netpbm/files/patch-bg (-4 / +4 lines)
1	--- ppm/Makefile.orig Sun Dec 3 07:41:51 2000	1	--- ppm/Makefile.orig Sun Dec 3 07:41:51 2000
2	+++ ppm/Makefile Fri Dec 8 00:00:00 2000	2	+++ ppm/Makefile Sat Jan 13 00:00:00 2001
3	@@ -22,26 +22,31 @@	3	@@ -22,26 +22,31 @@
4	NETPBMLIBS = $(LIBPPM) $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM)	4	NETPBMLIBS = $(LIBPPM) $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM)
5	LIBLIBS = $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM)	5	LIBLIBS = $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM)
Lines 16-22 Link Here
16	+ ppmflash ppmmake ppmmix ppmnorm \	16	+ ppmflash ppmmake ppmmix ppmnorm \
17	ppmquant ppmrelief ppmshift ppmspread ppmtoacad \	17	ppmquant ppmrelief ppmshift ppmspread ppmtoacad \
18	- ppmtobmp ppmtoeyuv ppmtogif ppmtoleaf \	18	- ppmtobmp ppmtoeyuv ppmtogif ppmtoleaf \
19	+ ppmtoeyuv ppmtogif ppmtoleaf \	19	+ ppmtoeyuv ppmtoleaf \
20	ppmtoicr ppmtoilbm ppmtolj ppmtomitsu \	20	ppmtoicr ppmtoilbm ppmtolj ppmtomitsu \
21	ppmtopcx ppmtopgm ppmtopi1 ppmtopict ppmtopj \	21	ppmtopcx ppmtopgm ppmtopi1 ppmtopict ppmtopj \
22	ppmtopjxl ppmtopuzz ppmtorgb3 ppmtosixel \	22	ppmtopjxl ppmtopuzz ppmtorgb3 ppmtosixel \
Lines 26-33 Link Here
26	- sputoppm tgatoppm winicontoppm ximtoppm xpmtoppm xvminitoppm \	26	- sputoppm tgatoppm winicontoppm ximtoppm xpmtoppm xvminitoppm \
27	+ sputoppm winicontoppm xpmtoppm xvminitoppm \	27	+ sputoppm winicontoppm xpmtoppm xvminitoppm \
28	yuvtoppm yuvsplittoppm	28	yuvtoppm yuvsplittoppm
29	+SHHOPTBINARIES = ppmchange ppmcolormask ppmhist ppmtobmp tgatoppm \	29	+SHHOPTBINARIES = ppmchange ppmcolormask ppmhist ppmtobmp ppmtogif \
30	+ ximtoppm	30	+ tgatoppm ximtoppm
31		31
32	# We don't build vidtoppm by default, because it requires special libraries	32	# We don't build vidtoppm by default, because it requires special libraries
33	# and there is no known requirement for vidtoppm.	33	# and there is no known requirement for vidtoppm.

Lines 1-6 Link Here

(-)graphics/netpbm/files/patch-bl (-6 / +6 lines)
1	--- pnm/jpegtopnm.c.orig Mon Aug 28 04:56:27 2000	1	--- pnm/jpegtopnm.c.orig Sat Dec 16 17:19:20 2000
2	+++ pnm/jpegtopnm.c Tue Sep 5 00:00:00 2000	2	+++ pnm/jpegtopnm.c Sat Jan 13 00:00:00 2001
3	@@ -161,6 +161,15 @@	3	@@ -162,6 +162,15 @@
4	char ** const argv_parse = malloc(argcsizeof(char ));	4	char ** const argv_parse = malloc(argcsizeof(char ));
5	/* argv, except we modify it as we parse */	5	/* argv, except we modify it as we parse */
6		6
Lines 16-30 Link Here
16	option_def_index = 0; /* incremented by OPTENTRY */	16	option_def_index = 0; /* incremented by OPTENTRY */
17	OPTENTRY(0, "verbose", OPT_FLAG, &cmdline_p->verbose, 0);	17	OPTENTRY(0, "verbose", OPT_FLAG, &cmdline_p->verbose, 0);
18	OPTENTRY(0, "dct", OPT_STRING, &dctval, 0);	18	OPTENTRY(0, "dct", OPT_STRING, &dctval, 0);
19	@@ -170,6 +179,7 @@	19	@@ -171,6 +180,7 @@
20	OPTENTRY(0, "adobe", OPT_FLAG, &adobe, 0);	20	OPTENTRY(0, "adobe", OPT_FLAG, &adobe, 0);
21	OPTENTRY(0, "notadobe", OPT_FLAG, &notadobe, 0);	21	OPTENTRY(0, "notadobe", OPT_FLAG, &notadobe, 0);
22	OPTENTRY(0, "nosmooth", OPT_FLAG, &cmdline_p->nosmooth, 0);	22	OPTENTRY(0, "comments", OPT_FLAG, &cmdline_p->comments, 0);
23	+ option_def[option_def_index].type = OPT_END;	23	+ option_def[option_def_index].type = OPT_END;
24		24
25	/* Set the defaults */	25	/* Set the defaults */
26	cmdline_p->verbose = FALSE;	26	cmdline_p->verbose = FALSE;
27	@@ -188,7 +198,7 @@	27	@@ -190,7 +200,7 @@
28	argc_parse = argc;	28	argc_parse = argc;
29	for (i=0; i < argc; i++) argv_parse[i] = argv[i];	29	for (i=0; i < argc; i++) argv_parse[i] = argv[i];
30		30

Lines 1-6 Link Here

(-)graphics/netpbm/files/patch-bo (-12 / +12 lines)
1	--- ppm/ppmtojpeg.c.orig Sun Apr 9 07:44:01 2000	1	--- ppm/ppmtojpeg.c.orig Thu Jan 11 07:30:35 2001
2	+++ ppm/ppmtojpeg.c Mon May 8 00:00:00 2000	2	+++ ppm/ppmtojpeg.c Sat Jan 13 00:00:00 2001
3	@@ -325,6 +325,15 @@	3	@@ -334,6 +334,15 @@
4	char ** const argv_parse = malloc(argcsizeof(char ));	4	char ** const argv_parse = malloc(argcsizeof(char ));
5	/* argv, except we modify it as we parse */	5	/* argv, except we modify it as we parse */
6		6
Lines 16-35 Link Here
16	option_def_index = 0; /* incremented by OPTENTRY */	16	option_def_index = 0; /* incremented by OPTENTRY */
17	OPTENTRY(0, "verbose", OPT_FLAG, &cmdline_p->verbose, 0);	17	OPTENTRY(0, "verbose", OPT_FLAG, &cmdline_p->verbose, 0);
18	OPTENTRY(0, "quality", OPT_UINT, &cmdline_p->quality, 0);	18	OPTENTRY(0, "quality", OPT_UINT, &cmdline_p->quality, 0);
19	@@ -344,6 +353,7 @@	19	@@ -354,6 +363,7 @@
20	OPTENTRY(0, "optimize", OPT_FLAG, &cmdline_p->optimize, 0);
21	OPTENTRY(0, "optimise", OPT_FLAG, &cmdline_p->optimize, 0);	20	OPTENTRY(0, "optimise", OPT_FLAG, &cmdline_p->optimize, 0);
22	OPTENTRY(0, "restart", OPT_STRING, &restart, 0);	21	OPTENTRY(0, "restart", OPT_STRING, &restart, 0);
23	+ option_def[option_def_index].type = OPT_END;	22	OPTENTRY(0, "comment", OPT_STRING, &cmdline_p->comment, 0);
		23	+ option_def[option_def_index].type = OPT_END;
24		24
25	/* Set the defaults */	25	/* Set the defaults */
26	cmdline_p->verbose = FALSE;	26	cmdline_p->verbose = FALSE;
27	@@ -367,7 +377,7 @@	27	@@ -382,7 +392,7 @@
28	argc_parse = argc;	28	opt.short_allowed = FALSE; /* We have no short (old-fashioned) options */
29	for (i=0; i < argc; i++) argv_parse[i] = argv[i];	29	opt.allowNegNum = FALSE; /* We have no parms that are negative numbers */
30		30
31	- pm_optParseOptions(&argc_parse, argv_parse, option_def, 0);	31	- pm_optParseOptions2(&argc_parse, argv, opt, 0);
32	+ optParseOptions(&argc_parse, argv_parse, option_def, 0);	32	+ optParseOptions2(&argc_parse, argv, opt, 0);
33	/* Uses and sets argc_parse, argv_parse and all of cmdline_p. /	33	/* Uses and sets argc_parse, argv, and some of cmdline_p and others. /
34		34
35	if (argc_parse - 1 == 0)	35	if (argc_parse - 1 == 0)

Lines 1-5 Link Here

(-)graphics/netpbm/files/patch-ce (-7 / +8 lines)
1	--- ppm/ppmchange.c.orig Sun Aug 6 14:44:44 2000	1	--- ppm/ppmchange.c.orig Mon Jan 8 05:12:30 2001
2	+++ ppm/ppmchange.c Tue Sep 5 00:00:00 2000	2	+++ ppm/ppmchange.c Sat Jan 13 00:00:00 2001
3	@@ -14,6 +14,7 @@	3	@@ -14,6 +14,7 @@
4	*/	4	*/
5		5
Lines 8-16 Link Here
8	#define TCOLS 256	8	#define TCOLS 256
9	#define SQRT3 1.73205080756887729352	9	#define SQRT3 1.73205080756887729352
10	/* The square root of 3 */	10	/* The square root of 3 */
11	@@ -45,8 +46,18 @@	11	@@ -53,9 +54,19 @@
12		12
13	unsigned int option_def_index;	13	char * remainder_color; /* value of -remainder option */
14		14
15	+ /* Create the OptStruct structure describing our options */	15	+ /* Create the OptStruct structure describing our options */
16	+ #define OPTENTRY(shortvalue,longvalue,typevalue,outputvalue,flagvalue) {\	16	+ #define OPTENTRY(shortvalue,longvalue,typevalue,outputvalue,flagvalue) {\
Lines 22-33 Link Here
22	+ option_def_index++; \	22	+ option_def_index++; \
23	+ }	23	+ }
24	option_def_index = 0; /* incremented by OPTENTRY */	24	option_def_index = 0; /* incremented by OPTENTRY */
25	OPTENTRY(0, "closeness", OPT_INT, &cmdlineP->closeness, 0);	25	OPTENTRY(0, "closeness", OPT_INT, &cmdlineP->closeness, 0);
		26	OPTENTRY(0, "remainder", OPT_STRING, &remainder_color, 0);
26	+ option_def[option_def_index].type = OPT_END;	27	+ option_def[option_def_index].type = OPT_END;
27		28
28	/* Set the defaults */	29	/* Set the defaults */
29	cmdlineP->closeness = 0;	30	cmdlineP->closeness = 0;
30	@@ -55,7 +66,7 @@	31	@@ -65,7 +76,7 @@
31	opt.short_allowed = FALSE; /* We have no short (old-fashioned) options */	32	opt.short_allowed = FALSE; /* We have no short (old-fashioned) options */
32	opt.allowNegNum = FALSE; /* We may have parms that are negative numbers */	33	opt.allowNegNum = FALSE; /* We may have parms that are negative numbers */
33		34
Lines 35-38 Link Here
35	+ optParseOptions2(&argc, argv, opt, 0);	36	+ optParseOptions2(&argc, argv, opt, 0);
36	/* Uses and sets argc, argv, and some of cmdlineP and others. /	37	/* Uses and sets argc, argv, and some of cmdlineP and others. /
37		38
38	if ((argc-1) % 2 == 0)	39	if (remainder_color) {

Lines 1-5 Link Here

(-)graphics/netpbm/files/patch-cl (-1 / +17 lines)
1	--- ppm/ppmtompeg/parallel.c.orig Sat Jul 1 16:51:53 2000	1	--- ppm/ppmtompeg/parallel.c.orig Sat Jul 1 16:51:53 2000
2	+++ ppm/ppmtompeg/parallel.c Fri Dec 8 00:00:00 2000	2	+++ ppm/ppmtompeg/parallel.c Sat Jan 13 00:00:00 2001
3	@@ -70,9 +70,6 @@	3	@@ -70,9 +70,6 @@
4	*	4	*
5	*/	5	*/
Lines 10-12 Link Here
10	/* On SunOS 5.6, netinet/in.h, via sys/vnode.h uses non-POSIX	10	/* On SunOS 5.6, netinet/in.h, via sys/vnode.h uses non-POSIX
11	typedefs, but when _POSIX_SOURCE is defined, it doesn't cause those	11	typedefs, but when _POSIX_SOURCE is defined, it doesn't cause those
12	typedefs to be defined. In later releases, this is fixed. If we	12	typedefs to be defined. In later releases, this is fixed. If we
		13	@@ -97,7 +94,6 @@
		14	#include <string.h>
		15	#include <signal.h>
		16	#include "all.h"
		17	-#include "param.h"
		18	#include "mpeg.h"
		19	#include "prototypes.h"
		20	#include "parallel.h"
		21	@@ -105,6 +101,7 @@
		22	#include "fsize.h"
		23	#include "combine.h"
		24	#include "frames.h"
		25	+#include "param.h"
		26
		27
		28	#define MAX_IO_SERVERS 10

Line 0 Link Here

(-)graphics/netpbm/files/patch-cm (+41 lines)
	1	--- pnm/giftopnm.c.orig Wed Jan 10 12:59:44 2001
	2	+++ pnm/giftopnm.c Sat Jan 13 00:00:00 2001
	3	@@ -11,6 +11,7 @@
	4
	5	#include <string.h>
	6	#include "pnm.h"
	7	+#include "shhopt.h"
	8
	9	#define GIFMAXVAL 255
	10	#define MAXCOLORMAPSIZE 256
	11	@@ -56,11 +57,21 @@
	12
	13	unsigned int option_def_index;
	14
	15	+ /* Create the OptStruct structure describing our options */
	16	+ #define OPTENTRY(shortvalue,longvalue,typevalue,outputvalue,flagvalue) {\
	17	+ option_def[option_def_index].shortName = (shortvalue); \
	18	+ option_def[option_def_index].longName = (longvalue); \
	19	+ option_def[option_def_index].type = (typevalue); \
	20	+ option_def[option_def_index].arg = (outputvalue); \
	21	+ option_def[option_def_index].flags = (flagvalue); \
	22	+ option_def_index++; \
	23	+ }
	24	option_def_index = 0; /* incremented by OPTENTRY */
	25	OPTENTRY(0, "verbose", OPT_FLAG, &cmdline_p->verbose, 0);
	26	OPTENTRY(0, "comments", OPT_FLAG, &cmdline_p->comments, 0);
	27	OPTENTRY(0, "image", OPT_UINT, &cmdline_p->image_no, 0);
	28	OPTENTRY(0, "alphaout", OPT_STRING, &cmdline_p->alpha_filename, 0);
	29	+ option_def[option_def_index].type = OPT_END;
	30
	31	/* Set the defaults */
	32	cmdline_p->verbose = FALSE;
	33	@@ -72,7 +83,7 @@
	34	opt.short_allowed = FALSE; /* We have no short (old-fashioned) options */
	35	opt.allowNegNum = FALSE; /* We have no parms that are negative numbers */
	36
	37	- pm_optParseOptions2(&argc, argv, opt, 0);
	38	+ optParseOptions2(&argc, argv, opt, 0);
	39	/* Uses and sets argc, argv, and some of cmdline_p and others. /
	40
	41	if (argc-1 == 0)

Line 0 Link Here

(-)graphics/netpbm/files/patch-cn (+47 lines)
	1	--- pnm/pnmmontage.c.orig Tue Jan 2 04:59:04 2001
	2	+++ pnm/pnmmontage.c Sat Jan 13 00:00:00 2001
	3	@@ -11,6 +11,7 @@
	4	*/
	5
	6	#include "pam.h"
	7	+#include "shhopt.h"
	8	#include <limits.h>
	9	#include <string.h>
	10
	11	@@ -172,8 +173,18 @@
	12	int helpflag = 0;
	13	optStruct option_def[100];
	14	optStruct2 opt;
	15	- unsigned option_def_index = 0;
	16	+ unsigned option_def_index;
	17
	18	+ /* Create the OptStruct structure describing our options */
	19	+ #define OPTENTRY(shortvalue,longvalue,typevalue,outputvalue,flagvalue) {\
	20	+ option_def[option_def_index].shortName = (shortvalue); \
	21	+ option_def[option_def_index].longName = (longvalue); \
	22	+ option_def[option_def_index].type = (typevalue); \
	23	+ option_def[option_def_index].arg = (outputvalue); \
	24	+ option_def[option_def_index].flags = (flagvalue); \
	25	+ option_def_index++; \
	26	+ }
	27	+ option_def_index = 0; /* incremented by OPTENTRY */
	28	OPTENTRY('?', "?", OPT_FLAG, &helpflag, 0);
	29	OPTENTRY('h', "help", OPT_FLAG, &helpflag, 0);
	30	OPTENTRY( 0, "header", OPT_STRING, &headfname, 0);
	31	@@ -189,6 +200,7 @@
	32	OPTENTRY('7', "7", OPT_FLAG, &q[7], 0);
	33	OPTENTRY('8', "8", OPT_FLAG, &q[8], 0);
	34	OPTENTRY('9', "9", OPT_FLAG, &q[9], 0);
	35	+ option_def[option_def_index].type = OPT_END;
	36
	37	opt.opt_table = option_def;
	38	opt.short_allowed = 0;
	39	@@ -197,7 +209,7 @@
	40	pnm_init(&argc, argv);
	41
	42	/* Check for flags. */
	43	- pm_optParseOptions2(&argc, argv, opt, 0);
	44	+ optParseOptions2(&argc, argv, opt, 0);
	45
	46	if (helpflag)
	47	{

Line 0 Link Here

(-)graphics/netpbm/files/patch-cp (+42 lines)
	1	--- ppm/ppmtogif.c.orig Sat Dec 16 16:34:16 2000
	2	+++ ppm/ppmtogif.c Sat Jan 13 00:00:00 2001
	3	@@ -22,6 +22,7 @@
	4
	5	#include "ppm.h"
	6	#include "ppmcmap.h"
	7	+#include "shhopt.h"
	8
	9	#define MAXCOLORS 256
	10
	11	@@ -91,12 +92,22 @@
	12
	13	unsigned int option_def_index;
	14
	15	+ /* Create the OptStruct structure describing our options */
	16	+ #define OPTENTRY(shortvalue,longvalue,typevalue,outputvalue,flagvalue) {\
	17	+ option_def[option_def_index].shortName = (shortvalue); \
	18	+ option_def[option_def_index].longName = (longvalue); \
	19	+ option_def[option_def_index].type = (typevalue); \
	20	+ option_def[option_def_index].arg = (outputvalue); \
	21	+ option_def[option_def_index].flags = (flagvalue); \
	22	+ option_def_index++; \
	23	+ }
	24	option_def_index = 0; /* incremented by OPTENTRY */
	25	OPTENTRY(0, "interlace", OPT_FLAG, &cmdline_p->interlace, 0);
	26	OPTENTRY(0, "sort", OPT_FLAG, &cmdline_p->sort, 0);
	27	OPTENTRY(0, "mapfile", OPT_STRING, &cmdline_p->mapfile, 0);
	28	OPTENTRY(0, "transparent", OPT_STRING, &cmdline_p->transparent, 0);
	29	OPTENTRY(0, "comment", OPT_STRING, &cmdline_p->comment, 0);
	30	+ option_def[option_def_index].type = OPT_END;
	31
	32	/* Set the defaults */
	33	cmdline_p->interlace = FALSE;
	34	@@ -109,7 +120,7 @@
	35	opt.short_allowed = FALSE; /* We have no short (old-fashioned) options */
	36	opt.allowNegNum = FALSE; /* We may have parms that are negative numbers */
	37
	38	- pm_optParseOptions2(&argc, argv, opt, 0);
	39	+ optParseOptions2(&argc, argv, opt, 0);
	40	/* Uses and sets argc, argv, and some of cmdline_p and others. /
	41
	42	if (argc-1 == 0)

Lines 27-32 Link Here

(-)graphics/netpbm/pkg-plist (+8 lines)
27	bin/mdatopbm	27	bin/mdatopbm
28	bin/mgrtopbm	28	bin/mgrtopbm
29	bin/mtvtoppm	29	bin/mtvtoppm
		30	bin/palmtopnm
30	bin/pamchannel	31	bin/pamchannel
31	bin/pamcut	32	bin/pamcut
32	bin/pamfile	33	bin/pamfile
Lines 115-120 Link Here
115	bin/pnminvert	116	bin/pnminvert
116	bin/pnmmargin	117	bin/pnmmargin
117	bin/pnmmerge	118	bin/pnmmerge
		119	bin/pnmmontage
118	bin/pnmnlfilt	120	bin/pnmnlfilt
119	bin/pnmnoraw	121	bin/pnmnoraw
120	bin/pnmpad	122	bin/pnmpad
Lines 131-136 Link Here
131	bin/pnmtofiasco	133	bin/pnmtofiasco
132	bin/pnmtofits	134	bin/pnmtofits
133	bin/pnmtojbig	135	bin/pnmtojbig
		136	bin/pnmtopalm
134	bin/pnmtoplainpnm	137	bin/pnmtoplainpnm
135	bin/pnmtopng	138	bin/pnmtopng
136	bin/pnmtops	139	bin/pnmtops
Lines 240-242 Link Here
240	lib/libppm.a	243	lib/libppm.a
241	lib/libppm.so	244	lib/libppm.so
242	lib/libppm.so.1	245	lib/libppm.so.1
		246	share/netpbm/palmcolor8.map
		247	share/netpbm/palmgray1.map
		248	share/netpbm/palmgray2.map
		249	share/netpbm/palmgray4.map
		250	@dirrm share/netpbm