diff options
| author | Peter Pentchev <roam@FreeBSD.org> | 2001-06-11 17:53:53 +0000 |
|---|---|---|
| committer | Peter Pentchev <roam@FreeBSD.org> | 2001-06-11 17:53:53 +0000 |
| commit | c214744602f4c552cea7938627e4d5864581b5ac (patch) | |
| tree | 9e04361eff34bc00b8c61b089324cd488a0a70d1 /graphics/netpbm | |
| parent | Add p5-DBIx-DataSource 0.02, (diff) | |
Update to 9.14.
PR: 28051
Submitted by: Ports Fury
Notes
Notes:
svn path=/head/; revision=43859
Diffstat (limited to 'graphics/netpbm')
46 files changed, 63 insertions, 1602 deletions
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index d278e6186c66..da5b82953c6f 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -6,7 +6,7 @@ # PORTNAME= netpbm -PORTVERSION= 9.12 +PORTVERSION= 9.14 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -31,5 +31,6 @@ INSTALLS_SHLIB= yes post-patch: @${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/pbmplus.h @${CP} ${FILESDIR}/Makefile.config.FreeBSD ${WRKSRC}/Makefile.config + @${LN} -sf ${WRKSRC}/shhopt/shhopt.h ${WRKSRC}/shhopt/pbmshhopt.h .include <bsd.port.post.mk> diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index 0d1af49732e6..c937c0f39a7a 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -1 +1 @@ -MD5 (netpbm-9.12.tgz) = 6de9fb5133763d30f1ae707b4b115cfe +MD5 (netpbm-9.14.tgz) = e77b5efa08bc0efb6d8ea2e7ddeb0005 diff --git a/graphics/netpbm/files/Makefile.config.FreeBSD b/graphics/netpbm/files/Makefile.config.FreeBSD index 5295fd120174..5acab4bfede7 100644 --- a/graphics/netpbm/files/Makefile.config.FreeBSD +++ b/graphics/netpbm/files/Makefile.config.FreeBSD @@ -1,7 +1,7 @@ +BUILD_FIASCO = Y STATICLIB = N LD = ${CC} MANCP = ${BSD_INSTALL_MAN} -CFLAGS += $(CDEBUG) LDFLAGS = -Wl,--rpath,$(INSTALLLIBS) LDSHLIB = -shared -Wl,-soname,$(SONAME) CFLAGS_SHLIB = -fpic -DPIC @@ -26,3 +26,4 @@ SUFFIXMANUALS5 = 5 INSTALLHDRS = $(INSTALL_PREFIX)/include INSTALLDATA = $(INSTALL_PREFIX)/share/netpbm NETPBMLIBSUFFIX = so +SOVER = 1 diff --git a/graphics/netpbm/files/manpages b/graphics/netpbm/files/manpages index 9bc1cb10c599..529328c27b91 100644 --- a/graphics/netpbm/files/manpages +++ b/graphics/netpbm/files/manpages @@ -25,6 +25,7 @@ MAN1+= leaftoppm.1 MAN1+= lispmtopgm.1 MAN1+= macptopbm.1 MAN1+= mdatopbm.1 +MAN1+= netpbm.1 MAN1+= mgrtopbm.1 MAN1+= mtvtoppm.1 MAN1+= palmtopnm.1 @@ -206,6 +207,7 @@ MAN1+= spctoppm.1 MAN1+= spottopgm.1 MAN1+= sputoppm.1 MAN1+= tgatoppm.1 +MAN1+= thinkjettopbm.1 MAN1+= tifftopnm.1 MAN1+= wbmptopbm.1 MAN1+= winicontoppm.1 diff --git a/graphics/netpbm/files/patch-aj b/graphics/netpbm/files/patch-aj index b69e67d9fa62..3dfdb6132438 100644 --- a/graphics/netpbm/files/patch-aj +++ b/graphics/netpbm/files/patch-aj @@ -1,5 +1,5 @@ ---- pbmplus.h.orig Tue Jun 20 04:24:29 2000 -+++ pbmplus.h Sat Jul 1 12:00:00 2000 +--- pbmplus.h.orig Mon May 14 13:53:10 2001 ++++ pbmplus.h Tue May 15 00:00:00 2001 @@ -18,6 +18,9 @@ #include <stdio.h> #include <errno.h> @@ -19,52 +19,25 @@ /* #define SYSV */ /* #define MSDOS */ /* #define AMIGA */ -@@ -51,7 +54,7 @@ - #define RGB_DB1 "PBMplus_Dir:RGB.TXT" +@@ -52,9 +55,9 @@ #define RGB_DB2 "PBMplus_Dir:RGB.TXT" + #define RGB_DB3 "PBMplus_Dir:RGB.TXT" #else -#define RGB_DB1 "/usr/lib/X11/rgb.txt" +-#define RGB_DB2 "/usr/openwin/lib/rgb.txt" +-#define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt" +#define RGB_DB1 "%%X11BASE%%/lib/X11/rgb.txt" - #define RGB_DB2 "/usr/openwin/lib/rgb.txt" ++#define RGB_DB2 "%%X11BASE%%/lib/X11/rgb.txt" ++#define RGB_DB3 "%%X11BASE%%/lib/X11/rgb.txt" #endif -@@ -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 -- of every program in the package when we do make dep. --*/ + /* CONFIGURE: This is the name of an environment variable that tells +@@ -339,7 +342,7 @@ + /* By making this <> instead of "", we avoid making shhopt.h a dependency + of every program in the package when we do make dep. + */ -#include <shhopt.h> -- --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 --*/ -- --/* You can use OPTENTRY to assign a value to a dynamically or automatically -- allocated optStruct structure with minimal typing and easy readability. -- -- Here is an example: -- -- unsigned int option_def_index = 0; -- optStruct *option_def = malloc(100*sizeof(optStruct)); -- OPTENTRY('h', "help", OPT_FLAG, &help_flag, 0); -- OPTENTRY(0, "alphaout", OPT_STRING, &alpha_filename, 0); --*/ -- --#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[++option_def_index].type = OPT_END; \ -- } - - /* Compatibility stuff */ ++#include <pbmshhopt.h> + /* 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 deleted file mode 100644 index 416ab21df1da..000000000000 --- a/graphics/netpbm/files/patch-au +++ /dev/null @@ -1,38 +0,0 @@ ---- 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-ba b/graphics/netpbm/files/patch-ba index 6c1722345945..6025b42fc89b 100644 --- a/graphics/netpbm/files/patch-ba +++ b/graphics/netpbm/files/patch-ba @@ -1,6 +1,6 @@ ---- GNUmakefile.orig Thu Jan 11 12:01:03 2001 -+++ GNUmakefile Sat Jan 13 00:00:00 2001 -@@ -128,10 +128,8 @@ +--- GNUmakefile.orig Mon Apr 9 11:10:10 2001 ++++ GNUmakefile Tue May 15 00:00:00 2001 +@@ -150,10 +150,10 @@ .PHONY: install.hdr install.hdr: $(SRCDIR)/mkinstalldirs $(INSTALLHDRS) @@ -9,6 +9,8 @@ $(SRCDIR)/pbmplus.h $(INSTALLHDRS) - $(INSTALL) -c -m$(INSTALL_PERM_HDR) \ - $(SRCDIR)/shhopt/shhopt.h $(INSTALLHDRS) ++ ${BSD_INSTALL_DATA} \ ++ $(SRCDIR)/shhopt/pbmshhopt.h $(INSTALLHDRS) for i in $(SUBDIRS) ; do \ $(MAKE) -C $$i -f $(SRCDIR)/$$i/Makefile install.hdr ; \ done diff --git a/graphics/netpbm/files/patch-bb b/graphics/netpbm/files/patch-bb index 3fabbc077d61..5f0a5e1e43e8 100644 --- a/graphics/netpbm/files/patch-bb +++ b/graphics/netpbm/files/patch-bb @@ -1,13 +1,13 @@ ---- Makefile.common.orig Tue Mar 27 00:25:04 2001 -+++ Makefile.common Tue Mar 27 00:00:00 2001 -@@ -151,24 +151,20 @@ +--- Makefile.common.orig Tue May 1 00:45:34 2001 ++++ Makefile.common Tue May 15 00:00:00 2001 +@@ -155,24 +155,20 @@ $(LIBOBJECTS): %.o: $(SRCSUBDIR)/%.c $(HEADERLINKS) # Note that the user may have configured -I options into CFLAGS. -+ $(CC) -c $(INCLUDE) $(CFLAGS) -o $@ $< ++ $(CC) -c $(INCLUDE) $(CFLAGS) $(CDEBUG) -o $@ $< + +$(SHLIBOBJECTS): %.lo: $(SRCSUBDIR)/%.c $(HEADERLINKS) - $(CC) -c $(INCLUDE) $(CFLAGS) $(CFLAGS_SHLIB) -o $@ $< + $(CC) -c $(INCLUDE) $(CFLAGS) $(CFLAGS_SHLIB) $(CDEBUG) -o $@ $< -SONAME = lib$(LIBROOT).so.$(MAJ) +SONAME = lib$(LIBROOT).so.$(SOVER) @@ -25,14 +25,14 @@ -lib$(LIBROOT).so.$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) \ - $(LIBOPT) - $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \ -- `$(LIBOPT) $(LIBLIBS)` -lc +- `$(LIBOPT) $(LIBLIBS)` -lc $(CDEBUG) +$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT) lib$(LIBROOT).a + $(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \ -+ `$(LIBOPT) $(LIBLIBS)` $(LDFLAGS) ++ `$(LIBOPT) $(LIBLIBS)` $(LDFLAGS) $(CDEBUG) # Static library. Unused by default, but with a small change to make files... lib$(LIBROOT).a: $(LIBOBJECTS) $(LIBOBJECTS_X) -@@ -200,7 +196,7 @@ +@@ -204,7 +200,7 @@ install.merge.common: $(MERGENAME) $(NOMERGEBINARIES) install.script cd $(INSTALLBINARIES) ; rm -f $(BINARIES) $(MERGE_ALIASES) ifneq ($(MERGENAME)x,x) @@ -41,7 +41,7 @@ $(MERGENAME) $(INSTALLBINARIES) cd $(INSTALLBINARIES) ; \ for i in $(MERGEBINARIES) $(MERGE_ALIASES) ; \ -@@ -210,7 +206,7 @@ +@@ -214,7 +210,7 @@ ifneq ($(NOMERGEBINARIES)x,x) for x in $(NOMERGEBINARIES); \ do \ @@ -50,7 +50,7 @@ $$x $(INSTALLBINARIES); \ done endif -@@ -221,7 +217,7 @@ +@@ -225,7 +221,7 @@ # Make and Install know that pbmmake.exe counts as pbmmake. for x in $(BINARIES); \ do \ @@ -59,7 +59,7 @@ $$x $(INSTALLBINARIES); \ done -@@ -230,7 +226,7 @@ +@@ -234,7 +230,7 @@ ifneq ($(SCRIPTS)x,x) for x in $(SCRIPTS); \ do \ @@ -68,7 +68,7 @@ $(INSTALLSCRIPTS); \ done endif -@@ -267,7 +263,7 @@ +@@ -271,7 +267,7 @@ # directory when you compile your programs. for x in $(INTERFACE_HEADERS); \ do \ @@ -77,7 +77,7 @@ $(INSTALLHDRS); \ done -@@ -275,15 +271,14 @@ +@@ -279,15 +275,14 @@ # .PHONY: install.staticlib install.staticlib: lib$(LIBROOT).a diff --git a/graphics/netpbm/files/patch-bd b/graphics/netpbm/files/patch-bd index 3f94f425546b..8757b931f370 100644 --- a/graphics/netpbm/files/patch-bd +++ b/graphics/netpbm/files/patch-bd @@ -1,63 +1,22 @@ ---- pbm/Makefile.orig Sun Mar 25 18:24:46 2001 -+++ pbm/Makefile Tue Mar 27 00:00:00 2001 -@@ -17,10 +17,12 @@ - LIBLIBS = - NETPBMLIBS = $(LIBPBM) - -+SOVER = 1 -+ - PORTBINARIES = atktopbm brushtopbm cmuwmtopbm g3topbm \ - icontopbm macptopbm mdatopbm mgrtopbm \ - pbmclean pbmlife pbmmake pbmmask pbmpscale \ -- pbmreduce pbmtext \ -+ pbmreduce \ - pbmto10x pbmto4425 pbmtoascii pbmtoatk \ - pbmtobbnbg pbmtocmuwm \ - pbmtoepsi pbmtoepson \ -@@ -30,20 +32,25 @@ - pbmtox10bm pbmtoxbm pbmtoybm pbmtozinc \ - pbmupc pi3topbm pktopbm wbmptopbm xbmtopbm ybmtopbm - MATHBINARIES = pbmpage pbmtopk --BINARIES = $(PORTBINARIES) $(MATHBINARIES) -+SHHOPTBINARIES = pbmtext -+ -+NOMERGEBINARIES = $(SHHOPTBINARIES) -+ -+MERGEBINARIES = $(PORTBINARIES) $(MATHBINARIES) -+ -+BINARIES = $(MERGEBINARIES) $(NOMERGEBINARIES) - - OBJECTS = $(patsubst %, %.o, $(BINARIES)) - --MERGEBINARIES = $(BINARIES) - MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES)) +--- pbm/Makefile.orig Fri May 4 12:39:43 2001 ++++ pbm/Makefile Tue May 15 00:00:00 2001 +@@ -47,6 +47,7 @@ # Library objects to be built and linked by Makefile.common: LIBOBJECTS = libpbm1.o libpbm2.o libpbm3.o libpbm4.o libpbm5.o +SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS)) -+LIBSHHOPT = $(BUILDDIR)/shhopt/libshhopt.a ifneq (${VMS}x,x) LIBOBJECTS += libpbmvms.o endif --# Library objects to be linked but not built by Makefile.common: --LIBOBJECTS_X = $(BUILDDIR)/shhopt/shhopt.o - - MANUALS1 = $(BINARIES) - MANUALS3 = libpbm -@@ -55,26 +62,25 @@ +@@ -63,26 +64,21 @@ .PHONY: all all: $(BINARIES) - $(MAKE) -C pbmtoppa all .PHONY: merge --merge: $(MERGENAME) + merge: $(MERGENAME) - $(MAKE) -C pbmtoppa all -+merge: $(MERGENAME) $(NOMERGEBINARIES) -+ -+$(SHHOPTBINARIES): %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT) -+ $(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \ -+ $(LIBSHHOPT) $(CDEBUG) .PHONY: install.bin install.bin: install.bin.common @@ -76,17 +35,10 @@ HEADERLINKS = pbmplus.h version.h compile.h -@@ -88,13 +94,10 @@ - compile.h: - $(SRCDIR)/stamp-date - --$(BUILDDIR)/shhopt/shhopt.o: -- cd ../shhopt; $(MAKE) shhopt.o - $(BUILDDIR)/shhopt/libshhopt.a: - cd ../shhopt; $(MAKE) libshhopt.a - +@@ -104,6 +100,5 @@ .PHONY: clean clean: clean.common + rm -f thinkjettopbm.c - $(MAKE) -C pbmtoppa clean FORCE: diff --git a/graphics/netpbm/files/patch-be b/graphics/netpbm/files/patch-be index 2564205e5531..b2ff1f0f0fff 100644 --- a/graphics/netpbm/files/patch-be +++ b/graphics/netpbm/files/patch-be @@ -1,56 +1,10 @@ --- pgm/Makefile.orig Thu Jan 18 12:39:28 2001 -+++ pgm/Makefile Tue Mar 27 00:00:00 2001 -@@ -15,18 +15,27 @@ - NETPBMLIBS = $(LIBPGM) $(PBMDIR)/$(LIBPBM) - LIBLIBS = $(PBMDIR)/$(LIBPBM) - -+SOVER = 1 -+ - PORTBINARIES = asciitopgm bioradtopgm fstopgm hipstopgm \ - lispmtopgm pbmtopgm pgmbentley pgmenhance pgmhist \ - pgmnoise pgmnorm pgmoil pgmramp pgmslice pgmtofs pgmtolispm \ - 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) -+ ++++ pgm/Makefile Tue May 15 00:00:00 2001 +@@ -27,6 +27,7 @@ MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES)) LIBOBJECTS = libpgm1.o libpgm2.o +SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS)) -+LIBSHHOPT = $(BUILDDIR)/shhopt/libshhopt.a MANUALS1 = $(BINARIES) MANUALS3 = libpgm -@@ -39,7 +48,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 - -@@ -61,6 +74,9 @@ - HEADERLINKS = pbmplus.h pbm.h libpbm.h - - include $(SRCDIR)/Makefile.common -+ -+$(BUILDDIR)/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 b4c15738fcf2..3569594b318e 100644 --- a/graphics/netpbm/files/patch-bf +++ b/graphics/netpbm/files/patch-bf @@ -1,104 +1,10 @@ ---- pnm/Makefile.orig Thu Mar 15 12:11:59 2001 -+++ pnm/Makefile Tue Mar 27 00:00:00 2001 -@@ -48,6 +48,8 @@ - JPEGLD = -L$(JPEGLIB_DIR) -ljpeg - endif - -+SOVER = 1 -+ - # 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,23 +57,24 @@ - # This package is so big, it's useful even when some parts won't - # build. - --PORTBINARIES = fitstopnm gemtopnm giftopnm pamchannel pamcut \ -- 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 \ -+ pnmsmooth pnmtile pnmtoddif pnmtofits \ - pnmtoplainpnm pnmtops pnmtorast \ -- pnmtosgi pnmtosir pnmtoxwd pstopnm \ -- rasttopnm sgitopnm sirtopnm xwdtopnm zeisstopnm --MATHBINARIES = pnmgamma pnmnlfilt pnmpsnr pnmrotate \ -- pnmscale pnmscalefixed pnmshear -+ pnmtosgi pnmtosir pnmtoxwd \ -+ rasttopnm sgitopnm sirtopnm zeisstopnm -+MATHBINARIES = pnmgamma pnmnlfilt pnmpsnr 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 - # from building all the other programs. - --NOMERGEBINARIES = -+NOMERGEBINARIES = $(SHHOPTBINARIES) pnmscale pnmscalefixed - ifneq ($(PNGHDR_DIR),NONE) - ifneq ($(PNGLIB_DIR),NONE) - NOMERGEBINARIES += pnmtopng pngtopnm -@@ -108,6 +111,8 @@ +--- pnm/Makefile.orig Thu May 10 06:48:25 2001 ++++ pnm/Makefile Tue May 15 00:00:00 2001 +@@ -108,6 +108,7 @@ MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES)) LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o libpam.o +SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS)) -+LIBSHHOPT = $(BUILDDIR)/shhopt/libshhopt.a MANUALS1 = $(BINARIES) $(SCRIPTS) MANUALS3 = libpnm -@@ -128,6 +133,14 @@ - $(MAKE) -C jbig all - $(MAKE) -C pnmtopalm 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 - TIFFLIB_DEP = $(TIFFDIR)/$(LIBTIFF) -@@ -138,17 +151,18 @@ - - # The Tiff library references math functions. - 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 $(TIFF_LDFLAGS) $(CDEBUG) -+ -L$(TIFFLIB_DIR) -ltiff $(JPEGLD) -lm $(TIFF_LDFLAGS) \ -+ $(LIBSHHOPT) $(CDEBUG) - - pngtopnm pnmtopng: %: %.o $(NETPBMLIBS) $(LIBOPT) - $(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \ - -L$(ZLIB_DIR), -lz -L$(PNGLIB_DIR) -lpng -lm $(CDEBUG) - --jpegtopnm: %: %.o $(NETPBMLIBS) $(LIBOPT) -+jpegtopnm: %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT) - $(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` $(JPEGLD) \ -- $(CDEBUG) -+ $(LIBSHHOPT) $(CDEBUG) - - ifeq ($(URTLIB_DIR),$(URTDIR)) - # We're using the internal URT library, so make sure it's built -@@ -205,6 +219,9 @@ - $(MAKE) -C fiasco install.man - $(MAKE) -C jbig install.man - $(MAKE) -C pnmtopalm install.man -+ -+$(BUILDDIR)/shhopt/libshhopt.a: -+ cd ../shhopt; $(MAKE) libshhopt.a - - .PHONY: clean - clean: clean.common diff --git a/graphics/netpbm/files/patch-bg b/graphics/netpbm/files/patch-bg index b1c9ec2b7b31..0dedc2911e8f 100644 --- a/graphics/netpbm/files/patch-bg +++ b/graphics/netpbm/files/patch-bg @@ -1,61 +1,14 @@ ---- ppm/Makefile.orig Sun Mar 11 04:30:39 2001 -+++ ppm/Makefile Tue Mar 27 00:00:00 2001 -@@ -22,26 +22,31 @@ - NETPBMLIBS = $(LIBPPM) $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM) - LIBLIBS = $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM) - --PORTBINARIES = 411toppm bmptoppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \ -+SOVER = 1 -+ -+PORTBINARIES = 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 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 \ - 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 = 411toppm bmptoppm 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. - -+NOMERGEBINARIES = $(SHHOPTBINARIES) ppmntsc - ifneq ($(JPEGLIB_DIR), NONE) - ifneq ($(JPEGHDR_DIR), NONE) - NOMERGEBINARIES += ppmtojpeg -@@ -50,7 +55,7 @@ - - MERGEBINARIES = $(PORTBINARIES) $(MATHBINARIES) - --MATHBINARIES = ppmcie ppmforge ppmlabel ppmntsc ppmpat ppmqvga ppmtomap -+MATHBINARIES = ppmcie ppmforge ppmlabel ppmpat ppmqvga ppmtomap - BINARIES = $(MERGEBINARIES) $(NOMERGEBINARIES) - SCRIPTS = ppmquantall ppmshadow ppmfade - -@@ -60,6 +65,8 @@ +--- ppm/Makefile.orig Mon May 14 07:56:12 2001 ++++ ppm/Makefile Tue May 15 00:00:00 2001 +@@ -60,6 +60,7 @@ LIBOBJECTS = libppm1.o libppm2.o libppmcmap.o libppm4.o libppm5.o \ libppmfloyd.o bitio.o +SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS)) -+LIBSHHOPT = $(BUILDDIR)/shhopt/libshhopt.a MANUALS1 = $(BINARIES) $(SCRIPTS) MANUALS3 = libppm -@@ -67,7 +74,7 @@ +@@ -67,7 +68,7 @@ MERGENAME= ppmmerge @@ -64,33 +17,3 @@ .PHONY: all all: $(BINARIES) -@@ -78,9 +85,17 @@ - $(MAKE) -C ppmtompeg all - $(MAKE) -C hpcdtoppm all - --ppmtojpeg: %: %.o $(NETPBMLIBS) $(LIBOPT) -+$(SHHOPTBINARIES): %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT) -+ $(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \ -+ $(LIBSHHOPT) $(CDEBUG) -+ -+ppmntsc: %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT) - $(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \ -- -L$(JPEGLIB_DIR) -ljpeg $(CDEBUG) -+ -lm $(LIBSHHOPT) $(CDEBUG) -+ -+ppmtojpeg: %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT) -+ $(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \ -+ -L$(JPEGLIB_DIR) -ljpeg $(LIBSHHOPT) $(CDEBUG) - - # And libraries. - $(PBMDIR)/$(LIBPBM): FORCE -@@ -109,6 +124,9 @@ - HEADERLINKS = pbmplus.h pbm.h libpbm.h pbmfont.h pgm.h libpgm.h - - include $(SRCDIR)/Makefile.common -+ -+$(BUILDDIR)/shhopt/libshhopt.a: -+ cd ../shhopt; $(MAKE) libshhopt.a - - .PHONY: clean - clean: clean.common diff --git a/graphics/netpbm/files/patch-bj b/graphics/netpbm/files/patch-bj deleted file mode 100644 index a640ff4ff051..000000000000 --- a/graphics/netpbm/files/patch-bj +++ /dev/null @@ -1,11 +0,0 @@ ---- 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> --#include <stdlib.h> --#include <malloc.h> - - #include "ppm.h" - diff --git a/graphics/netpbm/files/patch-bk b/graphics/netpbm/files/patch-bk deleted file mode 100644 index e01ccdfab396..000000000000 --- a/graphics/netpbm/files/patch-bk +++ /dev/null @@ -1,38 +0,0 @@ ---- 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" --#include "shhopt.h" - - #if __STDC__ - #include <stdarg.h> -@@ -145,27 +144,6 @@ - } - return 1; - } -- -- --/* Wrapper for Shhopt, to get it into the shared library */ -- --void --pm_optParseOptions(int *argc, char *argv[], -- optStruct opt[], int allowNegNum) { -- -- 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-bl b/graphics/netpbm/files/patch-bl deleted file mode 100644 index c4c29f8142c2..000000000000 --- a/graphics/netpbm/files/patch-bl +++ /dev/null @@ -1,35 +0,0 @@ ---- 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 */ - -+ /* 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, "dct", OPT_STRING, &dctval, 0); -@@ -171,6 +180,7 @@ - OPTENTRY(0, "adobe", OPT_FLAG, &adobe, 0); - OPTENTRY(0, "notadobe", OPT_FLAG, ¬adobe, 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]; - -- pm_optParseOptions2(&argc_parse, argv_parse, opt, 0); -+ optParseOptions2(&argc_parse, argv_parse, opt, 0); - /* Uses and sets argc_parse, argv_parse, - and some of *cmdline_p and others. */ - diff --git a/graphics/netpbm/files/patch-bm b/graphics/netpbm/files/patch-bm deleted file mode 100644 index a9f58ef809b8..000000000000 --- a/graphics/netpbm/files/patch-bm +++ /dev/null @@ -1,30 +0,0 @@ ---- pnm/tifftopnm.c.orig Tue Apr 4 03:10:27 2000 -+++ pnm/tifftopnm.c Sat Apr 15 08:00:00 2000 -@@ -35,6 +35,7 @@ - */ - - #include <string.h> -+#include "shhopt.h" - #include "pnm.h" - #ifdef VMS - #ifdef SYSV -@@ -512,9 +513,19 @@ - */ - 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('h', "headerdump", OPT_FLAG, &cmdline_p->headerdump, 0); - OPTENTRY(0, "alphaout", OPT_STRING, &cmdline_p->alpha_filename, 0); -+ option_def[option_def_index].type = OPT_END; - - /* Set the defaults */ - cmdline_p->headerdump = 0; diff --git a/graphics/netpbm/files/patch-bo b/graphics/netpbm/files/patch-bo deleted file mode 100644 index 0cac8c43b140..000000000000 --- a/graphics/netpbm/files/patch-bo +++ /dev/null @@ -1,35 +0,0 @@ ---- 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 */ - -+ /* 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, "quality", OPT_UINT, &cmdline_p->quality, 0); -@@ -354,6 +363,7 @@ - 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) diff --git a/graphics/netpbm/files/patch-bp b/graphics/netpbm/files/patch-bp deleted file mode 100644 index 142001ac73a8..000000000000 --- a/graphics/netpbm/files/patch-bp +++ /dev/null @@ -1,30 +0,0 @@ ---- ppm/tgatoppm.c.orig Sun Apr 9 09:10:36 2000 -+++ ppm/tgatoppm.c Mon May 8 00:00:00 2000 -@@ -426,16 +426,26 @@ - */ - 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, "headerdump", OPT_FLAG, &cmdline_p->headerdump, 0); - OPTENTRY('d', "debug", OPT_FLAG, &cmdline_p->headerdump, 0); - OPTENTRY(0, "alphaout", OPT_STRING, &cmdline_p->alpha_filename, 0); -+ option_def[option_def_index].type = OPT_END; - - /* Set the defaults */ - cmdline_p->headerdump = 0; - cmdline_p->alpha_filename = NULL; - -- pm_optParseOptions(&argc, argv, option_def, 0); -+ optParseOptions(&argc, argv, option_def, 0); - /* Uses and sets argc, argv, and all of *cmdline_p. */ - - if (argc - 1 == 0) diff --git a/graphics/netpbm/files/patch-bq b/graphics/netpbm/files/patch-bq deleted file mode 100644 index 3e4da4edf82c..000000000000 --- a/graphics/netpbm/files/patch-bq +++ /dev/null @@ -1,27 +0,0 @@ ---- ppm/ximtoppm.c.orig Sun Apr 9 07:44:31 2000 -+++ ppm/ximtoppm.c Mon May 8 00:00:00 2000 -@@ -419,13 +419,23 @@ - */ - 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, "alphaout", OPT_STRING, &cmdline_p->alpha_filename, 0); -+ option_def[option_def_index].type = OPT_END; - - /* Set the defaults */ - cmdline_p->alpha_filename = NULL; - -- pm_optParseOptions(&argc, argv, option_def, 0); -+ optParseOptions(&argc, argv, option_def, 0); - /* Uses and sets argc, argv, and all of *cmdline_p. */ - - if (argc - 1 == 0) diff --git a/graphics/netpbm/files/patch-br b/graphics/netpbm/files/patch-br deleted file mode 100644 index 7334b3d9d9ee..000000000000 --- a/graphics/netpbm/files/patch-br +++ /dev/null @@ -1,35 +0,0 @@ ---- ppm/ppmcolormask.c.orig Fri Apr 14 16:06:33 2000 -+++ ppm/ppmcolormask.c Mon May 8 00:00:00 2000 -@@ -4,6 +4,7 @@ - #include <string.h> - #include "ppm.h" - #include "pbm.h" -+#include "shhopt.h" - - static struct cmdline_info { - /* All the information the user supplied in the command line, -@@ -84,13 +85,23 @@ - */ - 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('v', "verbose", OPT_FLAG, &cmdline_p->verbose, 0); -+ option_def[option_def_index].type = OPT_END; - - /* Set the defaults */ - cmdline_p->verbose = 0; - -- pm_optParseOptions(&argc, argv, option_def, 0); -+ optParseOptions(&argc, argv, option_def, 0); - /* Uses and sets argc, argv, and all of *cmdline_p. */ - - if (argc - 1 == 0) diff --git a/graphics/netpbm/files/patch-bs b/graphics/netpbm/files/patch-bs deleted file mode 100644 index f23e6e7b2346..000000000000 --- a/graphics/netpbm/files/patch-bs +++ /dev/null @@ -1,43 +0,0 @@ ---- ppm/ppmntsc.c.orig Sat Apr 22 08:44:59 2000 -+++ ppm/ppmntsc.c Mon May 8 00:00:00 2000 -@@ -42,6 +42,7 @@ - #include <math.h> - #include <string.h> - #include "ppm.h" -+#include "shhopt.h" - - #define TRUE 1 - #define FALSE 0 -@@ -440,6 +441,15 @@ - unsigned int option_def_index; - int legalonly, illegalonly, correctedonly; - -+ /* 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('v', "verbose", OPT_FLAG, &cmdline_p->verbose, 0); - OPTENTRY('V', "debug", OPT_FLAG, &cmdline_p->debug, 0); -@@ -447,6 +457,7 @@ - OPTENTRY('l', "legalonly", OPT_FLAG, &legalonly, 0); - OPTENTRY('i', "illegalonly", OPT_FLAG, &illegalonly, 0); - OPTENTRY('c', "correctedonly", OPT_FLAG, &correctedonly, 0); -+ option_def[option_def_index].type = OPT_END; - - /* Set the defaults */ - cmdline_p->verbose = FALSE; -@@ -454,7 +465,7 @@ - cmdline_p->pal = FALSE; - legalonly = illegalonly = correctedonly = FALSE; - -- pm_optParseOptions(&argc, argv, option_def, 0); -+ optParseOptions(&argc, argv, option_def, 0); - /* Uses and sets argc, argv, and all of *cmdline_p. */ - - if (argc - 1 == 0) diff --git a/graphics/netpbm/files/patch-bt b/graphics/netpbm/files/patch-bt deleted file mode 100644 index dfe70a4be26e..000000000000 --- a/graphics/netpbm/files/patch-bt +++ /dev/null @@ -1,27 +0,0 @@ ---- pnm/xwdtopnm.c.orig Wed May 24 14:37:34 2000 -+++ pnm/xwdtopnm.c Sat Jun 3 00:00:00 2000 -@@ -879,13 +879,23 @@ - */ - 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 = 0; - -- pm_optParseOptions(&argc, argv, option_def, 0); -+ optParseOptions(&argc, argv, option_def, 0); - /* Uses and sets argc, argv, and all of *cmdline_p. */ - - if (argc - 1 == 0) diff --git a/graphics/netpbm/files/patch-bu b/graphics/netpbm/files/patch-bu deleted file mode 100644 index cd9733762d0c..000000000000 --- a/graphics/netpbm/files/patch-bu +++ /dev/null @@ -1,43 +0,0 @@ ---- 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 deleted file mode 100644 index b7c5f563c506..000000000000 --- a/graphics/netpbm/files/patch-bv +++ /dev/null @@ -1,38 +0,0 @@ ---- 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 deleted file mode 100644 index e327c5e84a6f..000000000000 --- a/graphics/netpbm/files/patch-bw +++ /dev/null @@ -1,38 +0,0 @@ ---- 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 deleted file mode 100644 index 49c2f834e158..000000000000 --- a/graphics/netpbm/files/patch-bx +++ /dev/null @@ -1,43 +0,0 @@ ---- 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/files/patch-by b/graphics/netpbm/files/patch-by deleted file mode 100644 index d09ae33997fe..000000000000 --- a/graphics/netpbm/files/patch-by +++ /dev/null @@ -1,43 +0,0 @@ ---- pnm/pnmcrop.c.orig Thu Jul 13 04:41:55 2000 -+++ pnm/pnmcrop.c Sat Jul 15 00:00:00 2000 -@@ -23,6 +23,7 @@ - #include <string.h> - #include <errno.h> - #include "pnm.h" -+#include "shhopt.h" - - enum bg_choice {BG_BLACK, BG_WHITE, BG_DEFAULT}; - -@@ -54,6 +55,15 @@ - - int black_opt, white_opt; - -+ /* 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, "black", OPT_FLAG, &black_opt, 0); - OPTENTRY(0, "white", OPT_FLAG, &white_opt, 0); -@@ -62,6 +72,7 @@ - OPTENTRY(0, "top", OPT_FLAG, &cmdline_p->top, 0); - OPTENTRY(0, "bottom", OPT_FLAG, &cmdline_p->bottom, 0); - OPTENTRY(0, "verbose", OPT_FLAG, &cmdline_p->verbose, 0); -+ option_def[option_def_index].type = OPT_END; - - /* Set the defaults */ - cmdline_p->left = cmdline_p->right = cmdline_p->top = cmdline_p->bottom -@@ -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 (argc-1 == 0) diff --git a/graphics/netpbm/files/patch-bz b/graphics/netpbm/files/patch-bz deleted file mode 100644 index e3408a78d513..000000000000 --- a/graphics/netpbm/files/patch-bz +++ /dev/null @@ -1,43 +0,0 @@ ---- pnm/pamcut.c.orig Fri Aug 4 04:10:14 2000 -+++ pnm/pamcut.c Sat Aug 5 00:00:00 2000 -@@ -12,6 +12,7 @@ - - #include <limits.h> - #include "pam.h" -+#include "shhopt.h" - - #define UNSPEC INT_MAX - /* UNSPEC is the value we use for an argument that is not specified -@@ -86,6 +87,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); -@@ -95,6 +105,7 @@ - OPTENTRY(0, "height", OPT_INT, &cmdline_p->height, 0); - OPTENTRY(0, "pad", OPT_FLAG, &cmdline_p->pad, 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; -@@ -110,7 +121,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-ca b/graphics/netpbm/files/patch-ca deleted file mode 100644 index 05c14d3be7d8..000000000000 --- a/graphics/netpbm/files/patch-ca +++ /dev/null @@ -1,38 +0,0 @@ ---- pnm/pamtopnm.c.orig Fri Aug 4 02:17:03 2000 -+++ pnm/pamtopnm.c Sat Aug 5 00:00:00 2000 -@@ -7,6 +7,7 @@ - -----------------------------------------------------------------------------*/ - - #include "pam.h" -+#include "shhopt.h" - - struct cmdline_info { - /* All the information the user supplied in the command line, -@@ -31,8 +32,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, "assume", OPT_FLAG, &cmdline_p->assume, 0); -+ option_def[option_def_index].type = OPT_END; - - /* Set the defaults */ - cmdline_p->assume = FALSE; -@@ -41,7 +52,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-cb b/graphics/netpbm/files/patch-cb deleted file mode 100644 index c2addc49e961..000000000000 --- a/graphics/netpbm/files/patch-cb +++ /dev/null @@ -1,39 +0,0 @@ ---- pnm/pnminterp.c.orig Sat Jul 22 10:18:38 2000 -+++ pnm/pnminterp.c Sat Aug 5 00:00:00 2000 -@@ -21,6 +21,7 @@ - #include <stdlib.h> - #include <ctype.h> - #include "pnm.h" -+#include "shhopt.h" - - enum an_edge_mode { - EDGE_DROP, -@@ -73,9 +74,19 @@ - - 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('b', "blackedge", OPT_FLAG, &blackedge, 0); - OPTENTRY('d', "dropedge", OPT_FLAG, &dropedge, 0); -+ option_def[option_def_index].type = OPT_END; - - /* Set the defaults */ - blackedge = FALSE; -@@ -85,7 +96,7 @@ - opt.short_allowed = TRUE; /* We have some 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 (blackedge && dropedge) diff --git a/graphics/netpbm/files/patch-cc b/graphics/netpbm/files/patch-cc deleted file mode 100644 index 411a905a1f71..000000000000 --- a/graphics/netpbm/files/patch-cc +++ /dev/null @@ -1,38 +0,0 @@ ---- pnm/pamchannel.c.orig Sun Aug 6 12:54:35 2000 -+++ pnm/pamchannel.c Tue Sep 5 00:00:00 2000 -@@ -7,6 +7,7 @@ - -----------------------------------------------------------------------------*/ - - #include "pam.h" -+#include "shhopt.h" - - #define MAX_CHANNELS 16 - /* The most channels we allow user to specify */ -@@ -37,8 +38,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, "infile", OPT_STRING, &cmdlineP->input_filespec, 0); -+ option_def[option_def_index].type = OPT_END; - - /* Set the defaults */ - cmdlineP->input_filespec = "-"; -@@ -47,7 +58,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. */ - - cmdlineP->n_channel = 0; diff --git a/graphics/netpbm/files/patch-cd b/graphics/netpbm/files/patch-cd deleted file mode 100644 index a7a2a136d5cf..000000000000 --- a/graphics/netpbm/files/patch-cd +++ /dev/null @@ -1,38 +0,0 @@ ---- pnm/pamfile.c.orig Mon Aug 7 03:46:18 2000 -+++ pnm/pamfile.c Tue Sep 5 00:00:00 2000 -@@ -11,6 +11,7 @@ - */ - - #include "pam.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-ce b/graphics/netpbm/files/patch-ce deleted file mode 100644 index 21b465f8955a..000000000000 --- a/graphics/netpbm/files/patch-ce +++ /dev/null @@ -1,40 +0,0 @@ ---- ppm/ppmchange.c.orig Tue Mar 20 12:28:14 2001 -+++ ppm/ppmchange.c Tue Mar 27 00:00:00 2001 -@@ -14,6 +14,7 @@ - */ - - #include "ppm.h" -+#include "shhopt.h" - #define TCOLS 256 - #define SQRT3 1.73205080756887729352 - /* The square root of 3 */ -@@ -50,10 +51,20 @@ - - 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, "closeness", OPT_INT, &cmdlineP->closeness, 0); - OPTENTRY(0, "remainder", OPT_STRING, - &cmdlineP->remainder_colorname, 0); -+ option_def[option_def_index].type = OPT_END; - - /* Set the defaults */ - cmdlineP->closeness = 0; -@@ -63,7 +74,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 *cmdlineP and others. */ - - if ((argc-1) % 2 == 0) diff --git a/graphics/netpbm/files/patch-cf b/graphics/netpbm/files/patch-cf deleted file mode 100644 index 9e4ad5417134..000000000000 --- a/graphics/netpbm/files/patch-cf +++ /dev/null @@ -1,43 +0,0 @@ ---- 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 deleted file mode 100644 index c56c8e8159de..000000000000 --- a/graphics/netpbm/files/patch-cg +++ /dev/null @@ -1,43 +0,0 @@ ---- 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 deleted file mode 100644 index 8422b05184f6..000000000000 --- a/graphics/netpbm/files/patch-ch +++ /dev/null @@ -1,43 +0,0 @@ ---- 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 deleted file mode 100644 index 5e404b9d61a5..000000000000 --- a/graphics/netpbm/files/patch-ci +++ /dev/null @@ -1,41 +0,0 @@ ---- 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-ck b/graphics/netpbm/files/patch-ck deleted file mode 100644 index 80b268ce081c..000000000000 --- a/graphics/netpbm/files/patch-ck +++ /dev/null @@ -1,10 +0,0 @@ ---- 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-cm b/graphics/netpbm/files/patch-cm deleted file mode 100644 index 7f2dd43b1e29..000000000000 --- a/graphics/netpbm/files/patch-cm +++ /dev/null @@ -1,41 +0,0 @@ ---- 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) diff --git a/graphics/netpbm/files/patch-cn b/graphics/netpbm/files/patch-cn deleted file mode 100644 index 705e6d99364e..000000000000 --- a/graphics/netpbm/files/patch-cn +++ /dev/null @@ -1,47 +0,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) - { diff --git a/graphics/netpbm/files/patch-cp b/graphics/netpbm/files/patch-cp deleted file mode 100644 index 969b3aa50f03..000000000000 --- a/graphics/netpbm/files/patch-cp +++ /dev/null @@ -1,42 +0,0 @@ ---- 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) diff --git a/graphics/netpbm/files/patch-cq b/graphics/netpbm/files/patch-cq deleted file mode 100644 index fb7f35e05cab..000000000000 --- a/graphics/netpbm/files/patch-cq +++ /dev/null @@ -1,42 +0,0 @@ ---- pbm/pbmtext.c.orig Tue Jan 30 06:33:13 2001 -+++ pbm/pbmtext.c Sat Feb 24 00:00:00 2001 -@@ -14,6 +14,7 @@ - - #include "pbm.h" - #include "pbmfont.h" -+#include "shhopt.h" - - struct cmdline_info { - /* All the information the user supplied in the command line, -@@ -48,12 +49,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, "font", OPT_STRING, &cmdline_p->font, 0); - OPTENTRY(0, "builtin", OPT_STRING, &cmdline_p->builtin, 0); - OPTENTRY(0, "dump", OPT_INT, &cmdline_p->dump, 0); - OPTENTRY(0, "space", OPT_FLOAT, &cmdline_p->space, 0); - OPTENTRY(0, "width", OPT_INT, &cmdline_p->width, 0); -+ option_def[option_def_index].type = OPT_END; - - /* Set the defaults */ - cmdline_p->font = NULL; -@@ -65,7 +76,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/files/patch-cr b/graphics/netpbm/files/patch-cr deleted file mode 100644 index 9d4dd286acc1..000000000000 --- a/graphics/netpbm/files/patch-cr +++ /dev/null @@ -1,44 +0,0 @@ ---- pnm/pnmtotiff.c.orig Tue Feb 20 14:50:18 2001 -+++ pnm/pnmtotiff.c Sat Feb 24 00:00:00 2001 -@@ -34,6 +34,8 @@ - #include "ppmcmap.h" - #define MAXCOLORS 256 - -+#include "shhopt.h" -+ - struct cmdline_info { - /* All the information the user supplied in the command line, - in a form easy for the program to use. -@@ -67,6 +69,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, "none", OPT_FLAG, &none, 0); - OPTENTRY(0, "packbits", OPT_FLAG, &packbits, 0); -@@ -83,6 +94,7 @@ - OPTENTRY(0, "rowsperstrip", OPT_UINT, &cmdline_p->rowsperstrip, 0); - OPTENTRY(0, "xresolution", OPT_FLOAT, &cmdline_p->xresolution, 0); - OPTENTRY(0, "yresolution", OPT_FLOAT, &cmdline_p->yresolution, 0); -+ option_def[option_def_index].type = OPT_END; - - /* Set the defaults */ - none = packbits = lzw = g3 = g4 = msb2lsb = lsb2msb = opt_2d = FALSE; -@@ -97,7 +109,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 (none + packbits + lzw + g3 + g4 > 1) diff --git a/graphics/netpbm/files/patch-cs b/graphics/netpbm/files/patch-cs deleted file mode 100644 index 105948f98226..000000000000 --- a/graphics/netpbm/files/patch-cs +++ /dev/null @@ -1,38 +0,0 @@ ---- ppm/bmptoppm.c.orig Sat Jan 13 14:19:01 2001 -+++ ppm/bmptoppm.c Sat Feb 24 00:00:00 2001 -@@ -54,6 +54,7 @@ - #include "bmp.h" - #include "ppm.h" - #include "bitio.h" -+#include "shhopt.h" - - /* MAXCOLORS is the maximum size of a color map in a BMP image */ - #define MAXCOLORS 256 -@@ -113,8 +114,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, "verbose", OPT_FLAG, &cmdline_p->verbose, 0); -+ option_def[option_def_index].type = OPT_END; - - /* Set the defaults */ - cmdline_p->verbose = FALSE; -@@ -123,7 +134,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/files/patch-ct b/graphics/netpbm/files/patch-ct index d359ac34e6a8..0861c85581c7 100644 --- a/graphics/netpbm/files/patch-ct +++ b/graphics/netpbm/files/patch-ct @@ -1,42 +1,11 @@ --- ppm/411toppm.c.orig Sun Mar 4 08:23:20 2001 -+++ ppm/411toppm.c Tue Mar 27 00:00:00 2001 -@@ -57,9 +57,9 @@ ++++ ppm/411toppm.c Tue May 15 00:00:00 2001 +@@ -56,8 +56,6 @@ + * HEADER FILES * *==============*/ #include <stdio.h> - #include <stdlib.h> +-#include <stdlib.h> -#include <malloc.h> #include "ppm.h" -+#include "shhopt.h" - typedef unsigned char uint8; - -@@ -91,9 +91,19 @@ - - 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, "width", OPT_INT, &cmdline_p->width, 0); - OPTENTRY(0, "height", OPT_INT, &cmdline_p->height, 0); -+ option_def[option_def_index].type = OPT_END; - - /* Set the defaults */ - cmdline_p->width = 64; -@@ -103,7 +113,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 (cmdline_p->width <= 0) diff --git a/graphics/netpbm/pkg-plist b/graphics/netpbm/pkg-plist index 0a377e0c2145..b90110e4cf60 100644 --- a/graphics/netpbm/pkg-plist +++ b/graphics/netpbm/pkg-plist @@ -212,6 +212,7 @@ bin/spctoppm bin/spottopgm bin/sputoppm bin/tgatoppm +bin/thinkjettopbm bin/tifftopnm bin/wbmptopbm bin/winicontoppm @@ -226,6 +227,7 @@ bin/yuvtoppm bin/zeisstopnm include/pbm.h include/pbmplus.h +include/pbmshhopt.h include/pgm.h include/pnm.h include/ppm.h |