FreeBSD Bugzilla – Attachment 12611 Details for
Bug 24284
Update port: graphics/netpbm to 9.10
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 25.17 KB, created by
tkato
on 2001-01-12 20:10:01 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
tkato
Created:
2001-01-12 20:10:01 UTC
Size:
25.17 KB
patch
obsolete
>diff -urN /usr/ports/graphics/netpbm/Makefile graphics/netpbm/Makefile >--- /usr/ports/graphics/netpbm/Makefile Mon Dec 11 20:24:18 2000 >+++ graphics/netpbm/Makefile Sat Jan 13 00:00:00 2001 >@@ -6,7 +6,7 @@ > # > > PORTNAME= netpbm >-PORTVERSION= 9.9 >+PORTVERSION= 9.10 > CATEGORIES= graphics > MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} > MASTER_SITE_SUBDIR= ${PORTNAME} >diff -urN /usr/ports/graphics/netpbm/distinfo graphics/netpbm/distinfo >--- /usr/ports/graphics/netpbm/distinfo Mon Dec 11 20:24:19 2000 >+++ graphics/netpbm/distinfo Sat Jan 13 00:00:00 2001 >@@ -1 +1 @@ >-MD5 (netpbm-9.9.tgz) = dd80d319eaad3ad9930e9078dee20219 >+MD5 (netpbm-9.10.tgz) = b39c20ffcc83d5d8474ba4af204caec6 >diff -urN /usr/ports/graphics/netpbm/files/manpages graphics/netpbm/files/manpages >--- /usr/ports/graphics/netpbm/files/manpages Tue Dec 12 22:53:53 2000 >+++ graphics/netpbm/files/manpages Sat Jan 13 00:00:00 2001 >@@ -26,6 +26,7 @@ > MAN1+= mdatopbm.1 > MAN1+= mgrtopbm.1 > MAN1+= mtvtoppm.1 >+MAN1+= palmtopnm.1 > MAN1+= pamchannel.1 > MAN1+= pamcut.1 > MAN1+= pamfile.1 >@@ -111,6 +112,7 @@ > MAN1+= pnminterp.1 > MAN1+= pnminvert.1 > MAN1+= pnmmargin.1 >+MAN1+= pnmmontage.1 > MAN1+= pnmnlfilt.1 > MAN1+= pnmpad.1 > MAN1+= pnmpaste.1 >@@ -126,6 +128,7 @@ > MAN1+= pnmtofiasco.1 > MAN1+= pnmtofits.1 > MAN1+= pnmtojbig.1 >+MAN1+= pnmtopalm.1 > MAN1+= pnmtoplainpnm.1 > MAN1+= pnmtopng.1 > MAN1+= pnmtops.1 >diff -urN /usr/ports/graphics/netpbm/files/patch-ba graphics/netpbm/files/patch-ba >--- /usr/ports/graphics/netpbm/files/patch-ba Sat Jun 10 08:49:42 2000 >+++ graphics/netpbm/files/patch-ba Sat Jan 13 00:00:00 2001 >@@ -1,12 +1,14 @@ >---- GNUmakefile.orig Mon Jun 5 13:30:53 2000 >-+++ GNUmakefile Sat Jun 10 00:00:00 2000 >-@@ -116,8 +116,7 @@ >+--- GNUmakefile.orig Thu Jan 11 12:01:03 2001 >++++ GNUmakefile Sat Jan 13 00:00:00 2001 >+@@ -128,10 +128,8 @@ > .PHONY: install.hdr > install.hdr: >- ./mkinstalldirs $(INSTALLHDRS) >-- $(INSTALL) -c -m$(INSTALL_PERM_HDR) pbmplus.h $(INSTALLHDRS) >-- $(INSTALL) -c -m$(INSTALL_PERM_HDR) shhopt/shhopt.h $(INSTALLHDRS) >-+ ${BSD_INSTALL_DATA} pbmplus.h $(INSTALLHDRS) >+ $(SRCDIR)/mkinstalldirs $(INSTALLHDRS) >+- $(INSTALL) -c -m$(INSTALL_PERM_HDR) \ >++ ${BSD_INSTALL_DATA} \ >+ $(SRCDIR)/pbmplus.h $(INSTALLHDRS) >+- $(INSTALL) -c -m$(INSTALL_PERM_HDR) \ >+- $(SRCDIR)/shhopt/shhopt.h $(INSTALLHDRS) > for i in $(SUBDIRS) ; do \ >- $(MAKE) -C $$i install.hdr ; \ >+ $(MAKE) -C $$i -f $(SRCDIR)/$$i/Makefile install.hdr ; \ > done >diff -urN /usr/ports/graphics/netpbm/files/patch-bb graphics/netpbm/files/patch-bb >--- /usr/ports/graphics/netpbm/files/patch-bb Mon Dec 11 20:24:19 2000 >+++ graphics/netpbm/files/patch-bb Sat Jan 13 00:00:00 2001 >@@ -1,6 +1,6 @@ >---- Makefile.common.orig Sun Dec 3 07:36:01 2000 >-+++ Makefile.common Fri Dec 8 00:00:00 2000 >-@@ -115,24 +115,20 @@ >+--- 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. >@@ -28,11 +28,11 @@ > - `$(LIBOPT) $(LIBLIBS)` -lc > +$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT) lib$(LIBROOT).a > + $(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \ >-+ `$(LIBOPT) $(LIBLIBS)` >++ `$(LIBOPT) $(LIBLIBS)` $(LDFLAGS) > > # Static library. Unused by default, but with a small change to make files... > lib$(LIBROOT).a: $(LIBOBJECTS) $(LIBOBJECTS_X) >-@@ -162,7 +158,7 @@ >+@@ -164,7 +160,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) ; \ >-@@ -172,7 +168,7 @@ >+@@ -174,7 +170,7 @@ > ifneq ($(NOMERGEBINARIES)x,x) > for x in $(NOMERGEBINARIES); \ > do \ >@@ -50,7 +50,7 @@ > $$x $(INSTALLBINARIES); \ > done > endif >-@@ -183,7 +179,7 @@ >+@@ -185,7 +181,7 @@ > # Make and Install know that pbmmake.exe counts as pbmmake. > for x in $(BINARIES); \ > do \ >@@ -59,7 +59,7 @@ > $$x $(INSTALLBINARIES); \ > done > >-@@ -192,7 +188,7 @@ >+@@ -194,7 +190,7 @@ > ifneq ($(SCRIPTS)x,x) > for x in $(SCRIPTS); \ > do \ >@@ -68,7 +68,7 @@ > $(INSTALLSCRIPTS); \ > done > endif >-@@ -229,7 +225,7 @@ >+@@ -231,7 +227,7 @@ > # directory when you compile your programs. > for x in $(INTERFACE_HEADERS); \ > do \ >@@ -77,7 +77,7 @@ > $(INSTALLHDRS); \ > done > >-@@ -243,15 +239,14 @@ >+@@ -245,15 +241,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/files/patch-bc graphics/netpbm/files/patch-bc >--- /usr/ports/graphics/netpbm/files/patch-bc Tue Sep 5 10:11:53 2000 >+++ graphics/netpbm/files/patch-bc Sat Jan 13 00:00:00 2001 >@@ -1,7 +1,7 @@ >---- Makefile.config.orig Sun Aug 20 01:29:00 2000 >-+++ Makefile.config Tue Sep 5 00:00:00 2000 >+--- Makefile.config.orig Mon Jan 8 03:52:54 2001 >++++ Makefile.config Sat Jan 13 00:00:00 2001 > @@ -39,7 +39,7 @@ >- #Tru64: >+ #Tru64 (= Digital Unix): > #CC = cc > #CC = gcc > -CC = gcc >@@ -9,7 +9,7 @@ > > # The linker. > LD = $(CC) >-@@ -65,7 +65,7 @@ >+@@ -71,7 +71,7 @@ > # calls compress or pack. Mantocat, included with Netpbm, is used on > # systems which use man pages in the "cat" format. > >@@ -18,7 +18,7 @@ > #DJGPP/Windows: > #MANCP = $(SRCDIR)/mantocat > >-@@ -79,7 +79,7 @@ >+@@ -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. >@@ -27,7 +27,25 @@ > # On DEC Tru64 4.0F (at least), you need -DLONG_32 for ppmtompeg. > #Tru64: > #CFLAGS = -O2 -std1 DLONG_32 $(CDEBUG) >-@@ -133,7 +133,7 @@ >+@@ -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). > >@@ -36,7 +54,7 @@ > # Solaris, SunOS, and NetBSD: > #CFLAGS_SHLIB = -fpic > #CFLAGS_SHLIB = -fPIC >-@@ -149,11 +149,11 @@ >+@@ -155,11 +155,11 @@ > # but otherwise will not. > > # Use the Tiff library included with Netpbm: >@@ -52,7 +70,7 @@ > # OSF, Tru64: > #TIFFHDR_DIR = /usr/local1/DEC/include > #TIFFLIB_DIR = /usr/local1/DEC/lib >-@@ -174,11 +174,11 @@ >+@@ -186,11 +186,11 @@ > # at least JPEGLIB_DIR here, or the tiff converters will not build at > # all. > >@@ -68,7 +86,7 @@ > # OSF, Tru64: > #JPEGLIB_DIR = /usr/local1/DEC/lib > #JPEGHDR_DIR = /usr/local1/DEC/include >-@@ -196,11 +196,11 @@ >+@@ -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. > >@@ -84,7 +102,7 @@ > # OSF/Tru64: > #PNGLIB_DIR = /usr/local1/DEC/lib > #PNGHDR_DIR = /usr/local1/DEC/include >-@@ -214,8 +214,10 @@ >+@@ -226,8 +226,10 @@ > > # And the Utah Raster Toolkit (aka URT aka RLE) library: > >@@ -97,3 +115,12 @@ > > # 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 >diff -urN /usr/ports/graphics/netpbm/files/patch-bf graphics/netpbm/files/patch-bf >--- /usr/ports/graphics/netpbm/files/patch-bf Mon Dec 11 20:24:21 2000 >+++ graphics/netpbm/files/patch-bf Sat Jan 13 00:00:00 2001 >@@ -1,5 +1,5 @@ >---- pnm/Makefile.orig Sun Dec 3 07:48:46 2000 >-+++ pnm/Makefile Fri Dec 8 00:00:00 2000 >+--- 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 >@@ -9,7 +9,7 @@ > # 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,23 @@ >+@@ -55,22 +57,24 @@ > # This package is so big, it's useful even when some parts won't > # build. > >@@ -17,9 +17,9 @@ > - pamfile pamtopnm \ > - pnmalias pnmarith pnmcat pnmcomp pnmconvol pnmcrop \ > - pnmcut pnmdepth pnmenlarge pnmfile pnmflip pnmhisteq \ >-- pnmhistmap pnminterp pnminvert pnmpad pnmpaste \ >+- pnmhistmap pnminterp pnminvert pnmmontage pnmpad pnmpaste \ > - pnmsmooth pnmsplit pnmtile pnmtoddif pnmtofits \ >-+PORTBINARIES = fitstopnm gemtopnm giftopnm \ >++PORTBINARIES = fitstopnm gemtopnm \ > + pnmalias pnmarith pnmcat pnmcomp pnmconvol \ > + pnmdepth pnmenlarge pnmflip pnmhisteq \ > + pnmhistmap pnminvert pnmpad pnmpaste \ >@@ -31,8 +31,9 @@ > + pnmtosgi pnmtosir pnmtoxwd \ > + rasttopnm sgitopnm sirtopnm zeisstopnm > +MATHBINARIES = pnmgamma pnmnlfilt pnmrotate pnmshear >-+SHHOPTBINARIES = pamchannel pamcut pamfile pamtopnm pnmcrop pnmcut \ >-+ pnmfile pnminterp pnmsplit pstopnm xwdtopnm >++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 >@@ -43,7 +44,7 @@ > ifneq ($(PNGHDR_DIR),NONE) > ifneq ($(PNGLIB_DIR),NONE) > NOMERGEBINARIES += pnmtopng pngtopnm >-@@ -107,6 +110,8 @@ >+@@ -107,6 +111,8 @@ > MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES)) > > LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o libpam.o >@@ -52,9 +53,9 @@ > > MANUALS1 = $(BINARIES) $(SCRIPTS) > MANUALS3 = libpnm >-@@ -125,6 +130,14 @@ >+@@ -127,6 +133,14 @@ > $(MAKE) -C jbig all >- $(MAKE) -C fiasco all >+ $(MAKE) -C pnmtopalm all > > +$(SHHOPTBINARIES): %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT) > + $(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \ >@@ -67,7 +68,7 @@ > ifeq ($(TIFFLIB_DIR),$(TIFFDIR)) > # We're using the internal Tiff library, so make sure it's built > TIFFLIB_DEP = $(TIFFDIR)/$(LIBTIFF) >-@@ -135,17 +148,18 @@ >+@@ -137,17 +151,18 @@ > > # The Tiff library references math functions. > tifftopnm pnmtotiff pnmtotiffcmyk: %: %.o \ >@@ -90,10 +91,10 @@ > > ifeq ($(URTLIB_DIR),$(URTDIR)) > # We're using the internal URT library, so make sure it's built >-@@ -197,6 +211,9 @@ >- install.man: install.man.common >- $(MAKE) -C jbig install.man >+@@ -202,6 +217,9 @@ > $(MAKE) -C fiasco install.man >+ $(MAKE) -C jbig install.man >+ $(MAKE) -C pnmtopalm install.man > + > +$(SRCDIR)/shhopt/libshhopt.a: > + cd ../shhopt; $(MAKE) libshhopt.a >diff -urN /usr/ports/graphics/netpbm/files/patch-bg graphics/netpbm/files/patch-bg >--- /usr/ports/graphics/netpbm/files/patch-bg Mon Dec 11 20:24:21 2000 >+++ graphics/netpbm/files/patch-bg Sat Jan 13 00:00:00 2001 >@@ -1,5 +1,5 @@ > --- ppm/Makefile.orig Sun Dec 3 07:41:51 2000 >-+++ ppm/Makefile Fri Dec 8 00:00:00 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) >@@ -16,7 +16,7 @@ > + ppmflash ppmmake ppmmix ppmnorm \ > ppmquant ppmrelief ppmshift ppmspread ppmtoacad \ > - ppmtobmp ppmtoeyuv ppmtogif ppmtoleaf \ >-+ ppmtoeyuv ppmtogif ppmtoleaf \ >++ ppmtoeyuv ppmtoleaf \ > ppmtoicr ppmtoilbm ppmtolj ppmtomitsu \ > ppmtopcx ppmtopgm ppmtopi1 ppmtopict ppmtopj \ > ppmtopjxl ppmtopuzz ppmtorgb3 ppmtosixel \ >@@ -26,8 +26,8 @@ > - sputoppm tgatoppm winicontoppm ximtoppm xpmtoppm xvminitoppm \ > + sputoppm winicontoppm xpmtoppm xvminitoppm \ > yuvtoppm yuvsplittoppm >-+SHHOPTBINARIES = ppmchange ppmcolormask ppmhist ppmtobmp tgatoppm \ >-+ ximtoppm >++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. >diff -urN /usr/ports/graphics/netpbm/files/patch-bl graphics/netpbm/files/patch-bl >--- /usr/ports/graphics/netpbm/files/patch-bl Tue Sep 5 10:11:53 2000 >+++ graphics/netpbm/files/patch-bl Sat Jan 13 00:00:00 2001 >@@ -1,6 +1,6 @@ >---- 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 @@ >+--- 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 */ > >@@ -16,15 +16,15 @@ > option_def_index = 0; /* incremented by OPTENTRY */ > OPTENTRY(0, "verbose", OPT_FLAG, &cmdline_p->verbose, 0); > OPTENTRY(0, "dct", OPT_STRING, &dctval, 0); >-@@ -170,6 +179,7 @@ >+@@ -171,6 +180,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, "comments", OPT_FLAG, &cmdline_p->comments, 0); > + option_def[option_def_index].type = OPT_END; > > /* Set the defaults */ > cmdline_p->verbose = FALSE; >-@@ -188,7 +198,7 @@ >+@@ -190,7 +200,7 @@ > argc_parse = argc; > for (i=0; i < argc; i++) argv_parse[i] = argv[i]; > >diff -urN /usr/ports/graphics/netpbm/files/patch-bo graphics/netpbm/files/patch-bo >--- /usr/ports/graphics/netpbm/files/patch-bo Fri May 19 17:34:12 2000 >+++ graphics/netpbm/files/patch-bo Sat Jan 13 00:00:00 2001 >@@ -1,6 +1,6 @@ >---- ppm/ppmtojpeg.c.orig Sun Apr 9 07:44:01 2000 >-+++ ppm/ppmtojpeg.c Mon May 8 00:00:00 2000 >-@@ -325,6 +325,15 @@ >+--- 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 */ > >@@ -16,20 +16,20 @@ > 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); >-@@ -344,6 +353,7 @@ >- OPTENTRY(0, "optimize", OPT_FLAG, &cmdline_p->optimize, 0); >+@@ -354,6 +363,7 @@ > OPTENTRY(0, "optimise", OPT_FLAG, &cmdline_p->optimize, 0); > OPTENTRY(0, "restart", OPT_STRING, &restart, 0); >-+ option_def[option_def_index].type = OPT_END; >+ OPTENTRY(0, "comment", OPT_STRING, &cmdline_p->comment, 0); >++ option_def[option_def_index].type = OPT_END; > > /* Set the defaults */ > cmdline_p->verbose = FALSE; >-@@ -367,7 +377,7 @@ >- argc_parse = argc; >- for (i=0; i < argc; i++) argv_parse[i] = argv[i]; >+@@ -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_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, 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 -urN /usr/ports/graphics/netpbm/files/patch-ce graphics/netpbm/files/patch-ce >--- /usr/ports/graphics/netpbm/files/patch-ce Tue Sep 5 10:11:53 2000 >+++ graphics/netpbm/files/patch-ce Sat Jan 13 00:00:00 2001 >@@ -1,5 +1,5 @@ >---- ppm/ppmchange.c.orig Sun Aug 6 14:44:44 2000 >-+++ ppm/ppmchange.c Tue Sep 5 00:00:00 2000 >+--- 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 @@ > */ > >@@ -8,9 +8,9 @@ > #define TCOLS 256 > #define SQRT3 1.73205080756887729352 > /* The square root of 3 */ >-@@ -45,8 +46,18 @@ >+@@ -53,9 +54,19 @@ > >- unsigned int option_def_index; >+ char * remainder_color; /* value of -remainder option */ > > + /* Create the OptStruct structure describing our options */ > + #define OPTENTRY(shortvalue,longvalue,typevalue,outputvalue,flagvalue) {\ >@@ -22,12 +22,13 @@ > + option_def_index++; \ > + } > option_def_index = 0; /* incremented by OPTENTRY */ >- OPTENTRY(0, "closeness", OPT_INT, &cmdlineP->closeness, 0); >+ 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; >-@@ -55,7 +66,7 @@ >+@@ -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 */ > >@@ -35,4 +36,4 @@ > + optParseOptions2(&argc, argv, opt, 0); > /* Uses and sets argc, argv, and some of *cmdlineP and others. */ > >- if ((argc-1) % 2 == 0) >+ if (remainder_color) { >diff -urN /usr/ports/graphics/netpbm/files/patch-cl graphics/netpbm/files/patch-cl >--- /usr/ports/graphics/netpbm/files/patch-cl Sat Dec 9 15:39:51 2000 >+++ graphics/netpbm/files/patch-cl Sat Jan 13 00:00:00 2001 >@@ -1,5 +1,5 @@ > --- ppm/ppmtompeg/parallel.c.orig Sat Jul 1 16:51:53 2000 >-+++ ppm/ppmtompeg/parallel.c Fri Dec 8 00:00:00 2000 >++++ ppm/ppmtompeg/parallel.c Sat Jan 13 00:00:00 2001 > @@ -70,9 +70,6 @@ > * > */ >@@ -10,3 +10,19 @@ > /* 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 >diff -urN /usr/ports/graphics/netpbm/files/patch-cm graphics/netpbm/files/patch-cm >--- /usr/ports/graphics/netpbm/files/patch-cm Thu Jan 1 09:00:00 1970 >+++ graphics/netpbm/files/patch-cm Sat Jan 13 00:00:00 2001 >@@ -0,0 +1,41 @@ >+--- 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 -urN /usr/ports/graphics/netpbm/files/patch-cn graphics/netpbm/files/patch-cn >--- /usr/ports/graphics/netpbm/files/patch-cn Thu Jan 1 09:00:00 1970 >+++ graphics/netpbm/files/patch-cn Sat Jan 13 00:00:00 2001 >@@ -0,0 +1,47 @@ >+--- 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 -urN /usr/ports/graphics/netpbm/files/patch-co graphics/netpbm/files/patch-co >--- /usr/ports/graphics/netpbm/files/patch-co Thu Jan 1 09:00:00 1970 >+++ graphics/netpbm/files/patch-co Sat Jan 13 00:00:00 2001 >@@ -0,0 +1,11 @@ >+--- pnm/pnmtopalm/Makefile.orig Thu Jan 11 11:59:53 2001 >++++ pnm/pnmtopalm/Makefile Sat Jan 13 00:00:00 2001 >+@@ -48,7 +48,7 @@ >+ $(SRCDIR)/mkinstalldirs $(INSTALLDATA) >+ for x in palmcolor8.map palmgray1.map palmgray2.map palmgray4.map ;\ >+ do \ >+- $(INSTALL) -c -m $(INSTALL_PERM_DATA) $(SRCSUBDIR)/$$x \ >++ ${BSD_INSTALL_DATA} $(SRCSUBDIR)/$$x \ >+ $(INSTALLDATA); \ >+ done >+ >diff -urN /usr/ports/graphics/netpbm/files/patch-cp graphics/netpbm/files/patch-cp >--- /usr/ports/graphics/netpbm/files/patch-cp Thu Jan 1 09:00:00 1970 >+++ graphics/netpbm/files/patch-cp Sat Jan 13 00:00:00 2001 >@@ -0,0 +1,42 @@ >+--- 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 -urN /usr/ports/graphics/netpbm/pkg-plist graphics/netpbm/pkg-plist >--- /usr/ports/graphics/netpbm/pkg-plist Tue Dec 12 22:53:57 2000 >+++ graphics/netpbm/pkg-plist Sat Jan 13 00:00:00 2001 >@@ -27,6 +27,7 @@ > bin/mdatopbm > bin/mgrtopbm > bin/mtvtoppm >+bin/palmtopnm > bin/pamchannel > bin/pamcut > bin/pamfile >@@ -115,6 +116,7 @@ > bin/pnminvert > bin/pnmmargin > bin/pnmmerge >+bin/pnmmontage > bin/pnmnlfilt > bin/pnmnoraw > bin/pnmpad >@@ -131,6 +133,7 @@ > bin/pnmtofiasco > bin/pnmtofits > bin/pnmtojbig >+bin/pnmtopalm > bin/pnmtoplainpnm > bin/pnmtopng > bin/pnmtops >@@ -240,3 +243,8 @@ > 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
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=12611">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 24284
: 12611