Date: Mon, 4 Sep 2000 12:13:11 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/21035: Update port: graphics/netpbm to 9.8 Message-ID: <20000904191311.A909A37B423@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 21035
>Category: ports
>Synopsis: Update port: graphics/netpbm to 9.8
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Sep 04 12:20:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 9.8
New file:
patches/patch-cc patches/patch-cd patches/patch-ce
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/netpbm/Makefile graphics/netpbm/Makefile
--- /usr/ports/graphics/netpbm/Makefile Mon Aug 7 20:41:56 2000
+++ graphics/netpbm/Makefile Tue Sep 5 00:00:00 2000
@@ -6,7 +6,7 @@
#
PORTNAME= netpbm
-PORTVERSION= 9.7
+PORTVERSION= 9.8
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff -urN /usr/ports/graphics/netpbm/files/manpages graphics/netpbm/files/manpages
--- /usr/ports/graphics/netpbm/files/manpages Mon Aug 7 20:41:58 2000
+++ graphics/netpbm/files/manpages Tue Sep 5 00:00:00 2000
@@ -24,7 +24,9 @@
MAN1+= mdatopbm.1
MAN1+= mgrtopbm.1
MAN1+= mtvtoppm.1
+MAN1+= pamchannel.1
MAN1+= pamcut.1
+MAN1+= pamfile.1
MAN1+= pamtopnm.1
MAN1+= pbmclean.1
MAN1+= pbmlife.1
diff -urN /usr/ports/graphics/netpbm/files/md5 graphics/netpbm/files/md5
--- /usr/ports/graphics/netpbm/files/md5 Mon Aug 7 20:41:58 2000
+++ graphics/netpbm/files/md5 Tue Sep 5 00:00:00 2000
@@ -1 +1 @@
-MD5 (netpbm-9.7.tgz) = d1b07f46e79af3e9e039e3632a343eda
+MD5 (netpbm-9.8.tgz) = 8aa1beded016f8dd9da13400d660ae68
diff -urN /usr/ports/graphics/netpbm/patches/patch-bb graphics/netpbm/patches/patch-bb
--- /usr/ports/graphics/netpbm/patches/patch-bb Mon Aug 7 20:41:58 2000
+++ graphics/netpbm/patches/patch-bb Tue Sep 5 00:00:00 2000
@@ -1,8 +1,8 @@
---- Makefile.common.orig Fri Aug 4 09:17:52 2000
-+++ Makefile.common Sat Aug 5 00:00:00 2000
-@@ -103,24 +103,20 @@
+--- Makefile.common.orig Sat Sep 2 12:31:58 2000
++++ Makefile.common Tue Sep 5 00:00:00 2000
+@@ -115,24 +115,20 @@
- $(LIBOBJECTS): %.o: %.c
+ $(LIBOBJECTS): %.o: $(SRCSUBDIR)/%.c
# Note that the user may have configured -I options into CFLAGS.
+ $(CC) -c $(INCLUDE) $(CFLAGS) -o $@ $<
+
@@ -32,7 +32,7 @@
# Static library. Unused by default, but with a small change to make files...
lib$(LIBROOT).a: $(LIBOBJECTS) $(LIBOBJECTS_X)
-@@ -148,7 +144,7 @@
+@@ -162,7 +158,7 @@
install.merge.common: $(MERGENAME) $(NOMERGEBINARIES) install.script
cd $(INSTALLBINARIES) ; rm -f $(BINARIES) $(MERGE_ALIASES)
ifneq ($(MERGENAME)x,x)
@@ -41,7 +41,7 @@
cd $(INSTALLBINARIES) ; \
for i in $(MERGEBINARIES) $(MERGE_ALIASES) ; \
do ln -s $(MERGENAME)$(EXE) $$i ; \
-@@ -157,7 +153,7 @@
+@@ -171,7 +167,7 @@
ifneq ($(NOMERGEBINARIES)x,x)
for x in $(NOMERGEBINARIES); \
do \
@@ -50,7 +50,7 @@
done
endif
-@@ -169,7 +165,7 @@
+@@ -181,7 +177,7 @@
# Make and Install know that pbmmake.exe counts as pbmmake.
for x in $(BINARIES); \
do \
@@ -59,25 +59,25 @@
done
.PHONY: install.script
-@@ -177,7 +173,7 @@
+@@ -189,7 +185,7 @@
ifneq ($(SCRIPTS)x,x)
for x in $(SCRIPTS); \
do \
-- $(INSTALL) -c -m $(INSTALL_PERM_BIN) $$x $(INSTALLSCRIPTS); \
-+ ${BSD_INSTALL_SCRIPT} $$x $(INSTALLSCRIPTS); \
+- $(INSTALL) -c -m $(INSTALL_PERM_BIN) $(SRCSUBDIR)/$$x \
++ ${BSD_INSTALL_SCRIPT} $(SRCSUBDIR)/$$x \
+ $(INSTALLSCRIPTS); \
done
endif
-
-@@ -210,7 +206,7 @@
+@@ -226,7 +222,7 @@
# directory when you compile your programs.
for x in $(INTERFACE_HEADERS); \
do \
-- $(INSTALL) -c -m $(INSTALL_PERM_HDR) $$x $(INSTALLHDRS); \
-+ ${BSD_INSTALL_DATA} $$x $(INSTALLHDRS); \
+- $(INSTALL) -c -m $(INSTALL_PERM_HDR) $(SRCSUBDIR)/$$x \
++ ${BSD_INSTALL_DATA} $(SRCSUBDIR)/$$x \
+ $(INSTALLHDRS); \
done
- # Install a static library
-@@ -223,15 +219,14 @@
+@@ -240,15 +236,14 @@
# here causes the static library to be built at that time.
.PHONY: install.staticlib
install.staticlib: lib$(LIBROOT).a
diff -urN /usr/ports/graphics/netpbm/patches/patch-bc graphics/netpbm/patches/patch-bc
--- /usr/ports/graphics/netpbm/patches/patch-bc Mon Jul 3 21:00:40 2000
+++ graphics/netpbm/patches/patch-bc Tue Sep 5 00:00:00 2000
@@ -1,33 +1,33 @@
---- Makefile.config.orig Fri Jun 23 02:48:03 2000
-+++ Makefile.config Sat Jul 1 12:00:00 2000
+--- Makefile.config.orig Sun Aug 20 01:29:00 2000
++++ Makefile.config Tue Sep 5 00:00:00 2000
@@ -39,7 +39,7 @@
#Tru64:
- #CC = cc
- #CC = gcc
--CC = gcc
-+CC ?= gcc
+ #CC = cc
+ #CC = gcc
+-CC = gcc
++CC ?= gcc
# The linker.
LD = $(CC)
-@@ -66,7 +66,7 @@
+@@ -65,7 +65,7 @@
# calls compress or pack. Mantocat, included with Netpbm, is used on
# systems which use man pages in the "cat" format.
-MANCP = $(INSTALL) -m $(INSTALL_PERM_MAN)
+MANCP = ${BSD_INSTALL_MAN}
+ #DJGPP/Windows:
#MANCP = $(SRCDIR)/mantocat
- AR= ar
@@ -79,7 +79,7 @@
# -ansi and -Werror should work too, but are not included
# by default because there's no point in daring the build to fail.
# -pedantic isn't a problem because it causes at worst a warning.
--CFLAGS = -pedantic -O2 -Wall -Wno-uninitialized $(CDEBUG)
+-CFLAGS = -pedantic -O3 -Wall -Wno-uninitialized $(CDEBUG)
+CFLAGS += $(CDEBUG)
# On DEC Tru64 4.0F (at least), you need -DLONG_32 for ppmtompeg.
#Tru64:
#CFLAGS = -O2 -std1 DLONG_32 $(CDEBUG)
-@@ -132,7 +132,7 @@
+@@ -133,7 +133,7 @@
# independent code, so you need -fpic or fPIC here. (The rule is: if
# -fpic works, use it. If it bombs, go to fPIC).
@@ -36,7 +36,7 @@
# Solaris, SunOS, and NetBSD:
#CFLAGS_SHLIB = -fpic
#CFLAGS_SHLIB = -fPIC
-@@ -148,11 +148,11 @@
+@@ -149,11 +149,11 @@
# but otherwise will not.
# Use the Tiff library included with Netpbm:
@@ -52,7 +52,7 @@
# OSF, Tru64:
#TIFFHDR_DIR = /usr/local1/DEC/include
#TIFFLIB_DIR = /usr/local1/DEC/lib
-@@ -173,11 +173,11 @@
+@@ -174,11 +174,11 @@
# at least JPEGLIB_DIR here, or the tiff converters will not build at
# all.
@@ -68,7 +68,7 @@
# OSF, Tru64:
#JPEGLIB_DIR = /usr/local1/DEC/lib
#JPEGHDR_DIR = /usr/local1/DEC/include
-@@ -195,11 +195,11 @@
+@@ -196,11 +196,11 @@
# here. If you do not have the PNG library, and still want to
# successully build everything else, put NONE for these.
@@ -84,7 +84,7 @@
# OSF/Tru64:
#PNGLIB_DIR = /usr/local1/DEC/lib
#PNGHDR_DIR = /usr/local1/DEC/include
-@@ -213,8 +213,10 @@
+@@ -214,8 +214,10 @@
# And the Utah Raster Toolkit (aka URT aka RLE) library:
diff -urN /usr/ports/graphics/netpbm/patches/patch-bd graphics/netpbm/patches/patch-bd
--- /usr/ports/graphics/netpbm/patches/patch-bd Mon Aug 7 20:41:59 2000
+++ graphics/netpbm/patches/patch-bd Tue Sep 5 00:00:00 2000
@@ -1,7 +1,7 @@
---- pbm/Makefile.orig Thu Jun 29 01:06:06 2000
-+++ pbm/Makefile Sat Aug 5 00:00:00 2000
-@@ -4,7 +4,7 @@
- include $(SRCDIR)/Makefile.config
+--- pbm/Makefile.orig Sat Sep 2 12:59:29 2000
++++ pbm/Makefile Tue Sep 5 00:00:00 2000
+@@ -5,7 +5,7 @@
+ include $(BUILDDIR)/Makefile.config
-INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/shhopt
@@ -9,7 +9,7 @@
# Shared library naming
LIBROOT = pbm
-@@ -15,6 +15,8 @@
+@@ -16,6 +16,8 @@
LIBLIBS =
NETPBMLIBS = $(LIBPBM)
@@ -18,7 +18,7 @@
PORTBINARIES = atktopbm brushtopbm cmuwmtopbm g3topbm \
icontopbm macptopbm mdatopbm mgrtopbm \
pbmclean pbmlife pbmmake pbmmask pbmpscale \
-@@ -37,11 +39,10 @@
+@@ -38,11 +40,10 @@
# Library objects to be built and linked by Makefile.common:
LIBOBJECTS = libpbm1.o libpbm2.o libpbm3.o libpbm4.o libpbm5.o
@@ -27,11 +27,11 @@
LIBOBJECTS += libpbmvms.o
endif
-# Library objects to be linked but not built by Makefile.common:
--LIBOBJECTS_X = $(SRCDIR)/shhopt/shhopt.o
+-LIBOBJECTS_X = $(BUILDDIR)/shhopt/shhopt.o
MANUALS1 = $(BINARIES)
MANUALS3 = libpbm
-@@ -53,26 +54,21 @@
+@@ -54,26 +55,21 @@
.PHONY: all
all: $(BINARIES)
@@ -58,13 +58,13 @@
include $(SRCDIR)/Makefile.common
-@@ -80,13 +76,7 @@
+@@ -81,13 +77,7 @@
../compile.h:
$(MAKE) -C $(SRCDIR) compile.h
--$(SRCDIR)/shhopt/shhopt.o:
+-$(BUILDDIR)/shhopt/shhopt.o:
- cd ../shhopt; $(MAKE) shhopt.o
--$(SRCDIR)/shhopt/libshhopt.a:
+-$(BUILDDIR)/shhopt/libshhopt.a:
- cd ../shhopt; $(MAKE) libshhopt.a
-
.PHONY: clean
diff -urN /usr/ports/graphics/netpbm/patches/patch-bf graphics/netpbm/patches/patch-bf
--- /usr/ports/graphics/netpbm/patches/patch-bf Mon Aug 7 20:41:59 2000
+++ graphics/netpbm/patches/patch-bf Tue Sep 5 00:00:00 2000
@@ -1,6 +1,6 @@
---- pnm/Makefile.orig Fri Aug 4 08:46:27 2000
-+++ pnm/Makefile Sat Aug 5 00:00:00 2000
-@@ -47,6 +47,8 @@
+--- pnm/Makefile.orig Sat Sep 2 13:03:27 2000
++++ pnm/Makefile Tue Sep 5 00:00:00 2000
+@@ -48,6 +48,8 @@
JPEGLD = -L$(JPEGLIB_DIR) -ljpeg
endif
@@ -9,11 +9,12 @@
# 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
-@@ -54,21 +56,23 @@
+@@ -55,22 +57,23 @@
# This package is so big, it's useful even when some parts won't
# build.
--PORTBINARIES = fitstopnm gemtopnm giftopnm pamcut pamtopnm \
+-PORTBINARIES = fitstopnm gemtopnm giftopnm pamchannel pamcut \
+- pamfile pamtopnm \
- pnmalias pnmarith pnmcat pnmcomp pnmconvol pnmcrop \
- pnmcut pnmdepth pnmenlarge pnmfile pnmflip pnmhisteq \
- pnmhistmap pnminterp pnminvert pnmpad pnmpaste \
@@ -29,8 +30,8 @@
+ pnmtosgi pnmtosir pnmtoxwd \
+ rasttopnm sgitopnm sirtopnm zeisstopnm
MATHBINARIES = pnmgamma pnmnlfilt pnmrotate pnmscale pnmshear
-+SHHOPTBINARIES = pamcut pamtopnm pnmcrop pnmcut pnmfile pnminterp \
-+ pnmsplit pstopnm xwdtopnm
++SHHOPTBINARIES = pamchannel pamcut pamfile pamtopnm pnmcrop pnmcut \
++ pnmfile pnminterp 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
@@ -41,7 +42,7 @@
ifneq ($(PNGHDR_DIR),NONE)
ifneq ($(PNGLIB_DIR),NONE)
NOMERGEBINARIES += pnmtopng pngtopnm
-@@ -105,6 +109,8 @@
+@@ -107,6 +110,8 @@
MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o libpam.o
@@ -50,7 +51,7 @@
MANUALS1 = $(BINARIES) $(SCRIPTS)
MANUALS3 = libpnm
-@@ -116,12 +122,12 @@
+@@ -118,12 +123,12 @@
.PHONY: all
all: $(BINARIES)
@@ -67,7 +68,7 @@
ifeq ($(TIFFLIB_DIR),$(TIFFDIR))
# We're using the internal Tiff library, so make sure it's built
-@@ -132,18 +138,18 @@
+@@ -134,18 +139,18 @@
endif
# The Tiff library references math functions.
@@ -91,7 +92,7 @@
ifeq ($(URTLIB_DIR),$(URTDIR))
# We're using the internal URT library, so make sure it's built
-@@ -180,25 +186,20 @@
+@@ -182,25 +187,20 @@
# backward compatibility: program used to be gemtopbm
rm -f $(INSTALLBINARIES)/gemtopbm
ln -s $(INSTALLBINARIES)/gemtopnm$(EXE) $(INSTALLBINARIES)/gemtopbm
diff -urN /usr/ports/graphics/netpbm/patches/patch-bg graphics/netpbm/patches/patch-bg
--- /usr/ports/graphics/netpbm/patches/patch-bg Mon Aug 7 20:42:00 2000
+++ graphics/netpbm/patches/patch-bg Tue Sep 5 00:00:00 2000
@@ -10,7 +10,7 @@
leaftoppm mtvtoppm pcxtoppm pgmtoppm pi1toppm picttoppm \
pjtoppm \
- ppm3d ppmbrighten ppmchange ppmcolormask \
-+ ppm3d ppmbrighten ppmchange \
++ ppm3d ppmbrighten \
ppmdim ppmdist ppmdither \
ppmflash ppmhist ppmmake ppmmix ppmnorm \
ppmquant ppmrelief ppmshift ppmspread ppmtoacad \
@@ -25,7 +25,7 @@
- sputoppm tgatoppm winicontoppm ximtoppm xpmtoppm xvminitoppm \
+ sputoppm winicontoppm xpmtoppm xvminitoppm \
yuvtoppm yuvsplittoppm
-+SHHOPTBINARIES = ppmcolormask ppmtobmp tgatoppm ximtoppm
++SHHOPTBINARIES = ppmchange ppmcolormask ppmtobmp tgatoppm ximtoppm
# We don't build vidtoppm by default, because it requires special libraries
# and there is no known requirement for vidtoppm.
diff -urN /usr/ports/graphics/netpbm/patches/patch-bl graphics/netpbm/patches/patch-bl
--- /usr/ports/graphics/netpbm/patches/patch-bl Fri May 19 19:14:35 2000
+++ graphics/netpbm/patches/patch-bl Tue Sep 5 00:00:00 2000
@@ -1,6 +1,6 @@
---- pnm/jpegtopnm.c.orig Sun Apr 9 07:46:08 2000
-+++ pnm/jpegtopnm.c Mon May 8 00:00:00 2000
-@@ -112,12 +112,22 @@
+--- pnm/jpegtopnm.c.orig Mon Aug 28 04:56:27 2000
++++ pnm/jpegtopnm.c Tue Sep 5 00:00:00 2000
+@@ -161,6 +161,15 @@
char ** const argv_parse = malloc(argc*sizeof(char *));
/* argv, except we modify it as we parse */
@@ -16,19 +16,20 @@
option_def_index = 0; /* incremented by OPTENTRY */
OPTENTRY(0, "verbose", OPT_FLAG, &cmdline_p->verbose, 0);
OPTENTRY(0, "dct", OPT_STRING, &dctval, 0);
- OPTENTRY(0, "maxmemory", OPT_STRING, &maxmemory, 0);
+@@ -170,6 +179,7 @@
+ OPTENTRY(0, "adobe", OPT_FLAG, &adobe, 0);
+ OPTENTRY(0, "notadobe", OPT_FLAG, ¬adobe, 0);
OPTENTRY(0, "nosmooth", OPT_FLAG, &cmdline_p->nosmooth, 0);
- OPTENTRY(0, "tracelevel", OPT_UINT, &cmdline_p->trace_level, 0);
+ option_def[option_def_index].type = OPT_END;
/* Set the defaults */
cmdline_p->verbose = FALSE;
-@@ -130,7 +140,7 @@
+@@ -188,7 +198,7 @@
argc_parse = argc;
for (i=0; i < argc; i++) argv_parse[i] = argv[i];
-- pm_optParseOptions(&argc_parse, argv_parse, option_def, 0);
-+ optParseOptions(&argc_parse, argv_parse, option_def, 0);
- /* Uses and sets argc_parse, argv_parse and all of *cmdline_p. */
+- 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. */
- if (argc_parse - 1 == 0)
diff -urN /usr/ports/graphics/netpbm/patches/patch-cc graphics/netpbm/patches/patch-cc
--- /usr/ports/graphics/netpbm/patches/patch-cc Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/patches/patch-cc Tue Sep 5 00:00:00 2000
@@ -0,0 +1,38 @@
+--- 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 -urN /usr/ports/graphics/netpbm/patches/patch-cd graphics/netpbm/patches/patch-cd
--- /usr/ports/graphics/netpbm/patches/patch-cd Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/patches/patch-cd Tue Sep 5 00:00:00 2000
@@ -0,0 +1,38 @@
+--- 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 -urN /usr/ports/graphics/netpbm/patches/patch-ce graphics/netpbm/patches/patch-ce
--- /usr/ports/graphics/netpbm/patches/patch-ce Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/patches/patch-ce Tue Sep 5 00:00:00 2000
@@ -0,0 +1,38 @@
+--- ppm/ppmchange.c.orig Sun Aug 6 14:44:44 2000
++++ ppm/ppmchange.c Tue Sep 5 00:00:00 2000
+@@ -14,6 +14,7 @@
+ */
+
+ #include "ppm.h"
++#include "shhopt.h"
+ #define TCOLS 256
+ #define SQRT3 1.73205080756887729352
+ /* The square root of 3 */
+@@ -45,8 +46,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, "closeness", OPT_INT, &cmdlineP->closeness, 0);
++ option_def[option_def_index].type = OPT_END;
+
+ /* Set the defaults */
+ cmdlineP->closeness = 0;
+@@ -55,7 +66,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 -urN /usr/ports/graphics/netpbm/pkg/PLIST graphics/netpbm/pkg/PLIST
--- /usr/ports/graphics/netpbm/pkg/PLIST Mon Aug 7 20:42:01 2000
+++ graphics/netpbm/pkg/PLIST Tue Sep 5 00:00:00 2000
@@ -25,7 +25,9 @@
bin/mdatopbm
bin/mgrtopbm
bin/mtvtoppm
+bin/pamchannel
bin/pamcut
+bin/pamfile
bin/pamtopnm
bin/pbmclean
bin/pbmlife
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000904191311.A909A37B423>