Date: Mon, 16 Apr 2001 13:40:02 -0700 (PDT) From: "KATO Tsuguru" <tkato@prontomail.ne.jp> To: freebsd-ports@FreeBSD.org Subject: Re: ports/26122: Update port: graphics/netpbm to 9.12 Message-ID: <200104162040.f3GKe2x68343@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/26122; it has been noted by GNATS.
From: "KATO Tsuguru" <tkato@prontomail.ne.jp>
To: Peter Pentchev <roam@orbitel.bg>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/26122: Update port: graphics/netpbm to 9.12
Date: Tue, 17 Apr 2001 05:30:00 +0900
> Are you sure you did not mean to add a patch to 411topbm.c, instead of
> resubmitting the already-existing patch-ce, adding options parsing to
> ppm/ppmchange.c?
Ah, well, It's sure that patch-ct should be a patch to 411topbm.c....
Here is a fixed diff.
diff -urN /usr/ports/graphics/netpbm/Makefile graphics/netpbm/Makefile
--- /usr/ports/graphics/netpbm/Makefile Mon Feb 26 19:19:32 2001
+++ graphics/netpbm/Makefile Tue Mar 27 00:00:00 2001
@@ -6,7 +6,7 @@
#
PORTNAME= netpbm
-PORTVERSION= 9.11
+PORTVERSION= 9.12
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 Feb 26 19:19:33 2001
+++ graphics/netpbm/distinfo Tue Mar 27 00:00:00 2001
@@ -1 +1 @@
-MD5 (netpbm-9.11.tgz) = 12ed6446d08aee8088744f9f9216f8cd
+MD5 (netpbm-9.12.tgz) = 6de9fb5133763d30f1ae707b4b115cfe
diff -urN /usr/ports/graphics/netpbm/files/manpages graphics/netpbm/files/manpages
--- /usr/ports/graphics/netpbm/files/manpages Mon Feb 26 19:19:39 2001
+++ graphics/netpbm/files/manpages Tue Mar 27 00:00:00 2001
@@ -1,3 +1,4 @@
+MAN1+= 411toppm.1
MAN1+= anytopnm.1
MAN1+= asciitopgm.1
MAN1+= atktopbm.1
diff -urN /usr/ports/graphics/netpbm/files/patch-bb graphics/netpbm/files/patch-bb
--- /usr/ports/graphics/netpbm/files/patch-bb Mon Feb 26 19:19:39 2001
+++ graphics/netpbm/files/patch-bb Tue Mar 27 00:00:00 2001
@@ -1,23 +1,6 @@
---- Makefile.common.orig Wed Feb 21 13:04:34 2001
-+++ Makefile.common Sat Feb 24 00:00:00 2001
-@@ -135,14 +135,14 @@
-
- # MERGE STUFF
-
--$(MERGE_OBJECTS): %.o2: $(SRCSUBDIR)/%.c
-+$(MERGE_OBJECTS): %.o2: $(SRCSUBDIR)/%.c $(HEADERLINKS)
- # Note that the user may have configured -I options into CFLAGS.
- $(CC) -c $(INCLUDE) $(CFLAGS) "-Dmain=$*_main" -o $@ $<
-
- merge.h:
- $(SRCDIR)/make_merge.sh $(MERGEBINARIES)
-
--$(MERGENAME).o: $(SRCSUBDIR)/$(MERGENAME).c merge.h
-+$(MERGENAME).o: $(SRCSUBDIR)/$(MERGENAME).c merge.h $(HEADERLINKS)
- $(CC) $(CFLAGS) -Wno-implicit $(INCLUDE) -c -o $@ $<
-
- $(MERGENAME): $(MERGENAME).o $(MERGE_OBJECTS) $(NETPBMLIBS) $(LIBOPT)
-@@ -155,24 +155,20 @@
+--- Makefile.common.orig Tue Mar 27 00:25:04 2001
++++ Makefile.common Tue Mar 27 00:00:00 2001
+@@ -151,24 +151,20 @@
$(LIBOBJECTS): %.o: $(SRCSUBDIR)/%.c $(HEADERLINKS)
# Note that the user may have configured -I options into CFLAGS.
@@ -49,7 +32,7 @@
# Static library. Unused by default, but with a small change to make files...
lib$(LIBROOT).a: $(LIBOBJECTS) $(LIBOBJECTS_X)
-@@ -202,7 +198,7 @@
+@@ -200,7 +196,7 @@
install.merge.common: $(MERGENAME) $(NOMERGEBINARIES) install.script
cd $(INSTALLBINARIES) ; rm -f $(BINARIES) $(MERGE_ALIASES)
ifneq ($(MERGENAME)x,x)
@@ -58,7 +41,7 @@
$(MERGENAME) $(INSTALLBINARIES)
cd $(INSTALLBINARIES) ; \
for i in $(MERGEBINARIES) $(MERGE_ALIASES) ; \
-@@ -212,7 +208,7 @@
+@@ -210,7 +206,7 @@
ifneq ($(NOMERGEBINARIES)x,x)
for x in $(NOMERGEBINARIES); \
do \
@@ -67,7 +50,7 @@
$$x $(INSTALLBINARIES); \
done
endif
-@@ -223,7 +219,7 @@
+@@ -221,7 +217,7 @@
# Make and Install know that pbmmake.exe counts as pbmmake.
for x in $(BINARIES); \
do \
@@ -76,7 +59,7 @@
$$x $(INSTALLBINARIES); \
done
-@@ -232,7 +228,7 @@
+@@ -230,7 +226,7 @@
ifneq ($(SCRIPTS)x,x)
for x in $(SCRIPTS); \
do \
@@ -85,7 +68,7 @@
$(INSTALLSCRIPTS); \
done
endif
-@@ -269,7 +265,7 @@
+@@ -267,7 +263,7 @@
# directory when you compile your programs.
for x in $(INTERFACE_HEADERS); \
do \
@@ -94,7 +77,7 @@
$(INSTALLHDRS); \
done
-@@ -277,15 +273,14 @@
+@@ -275,15 +271,14 @@
#
.PHONY: install.staticlib
install.staticlib: lib$(LIBROOT).a
diff -urN /usr/ports/graphics/netpbm/files/patch-bd graphics/netpbm/files/patch-bd
--- /usr/ports/graphics/netpbm/files/patch-bd Mon Feb 26 19:19:40 2001
+++ graphics/netpbm/files/patch-bd Tue Mar 27 00:00:00 2001
@@ -1,5 +1,5 @@
---- pbm/Makefile.orig Wed Feb 21 13:05:01 2001
-+++ pbm/Makefile Sat Feb 24 00:00:00 2001
+--- 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)
@@ -14,18 +14,17 @@
pbmto10x pbmto4425 pbmtoascii pbmtoatk \
pbmtobbnbg pbmtocmuwm \
pbmtoepsi pbmtoepson \
-@@ -29,21 +31,26 @@
- pbmtopi3 pbmtoplot pbmtoptx pbmtowbmp \
+@@ -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)
+
- MATHBINARIES = pbmpage pbmtopk
--BINARIES = $(PORTBINARIES) $(MATHBINARIES)
+BINARIES = $(MERGEBINARIES) $(NOMERGEBINARIES)
OBJECTS = $(patsubst %, %.o, $(BINARIES))
@@ -36,7 +35,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 = $(SRCDIR)/shhopt/libshhopt.a
++LIBSHHOPT = $(BUILDDIR)/shhopt/libshhopt.a
ifneq (${VMS}x,x)
LIBOBJECTS += libpbmvms.o
endif
@@ -45,12 +44,12 @@
MANUALS1 = $(BINARIES)
MANUALS3 = libpbm
-@@ -55,26 +62,24 @@
+@@ -55,26 +62,25 @@
.PHONY: all
- all: $(BINARIES)
+ all: $(BINARIES)
- $(MAKE) -C pbmtoppa all
--
+
.PHONY: merge
-merge: $(MERGENAME)
- $(MAKE) -C pbmtoppa all
@@ -77,7 +76,7 @@
HEADERLINKS = pbmplus.h version.h compile.h
-@@ -88,13 +93,10 @@
+@@ -88,13 +94,10 @@
compile.h:
$(SRCDIR)/stamp-date
diff -urN /usr/ports/graphics/netpbm/files/patch-be graphics/netpbm/files/patch-be
--- /usr/ports/graphics/netpbm/files/patch-be Mon Feb 26 19:19:40 2001
+++ graphics/netpbm/files/patch-be Tue Mar 27 00:00:00 2001
@@ -1,5 +1,5 @@
--- pgm/Makefile.orig Thu Jan 18 12:39:28 2001
-+++ pgm/Makefile Sat Feb 24 00:00:00 2001
++++ pgm/Makefile Tue Mar 27 00:00:00 2001
@@ -15,18 +15,27 @@
NETPBMLIBS = $(LIBPGM) $(PBMDIR)/$(LIBPBM)
LIBLIBS = $(PBMDIR)/$(LIBPBM)
@@ -27,7 +27,7 @@
LIBOBJECTS = libpgm1.o libpgm2.o
+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
-+LIBSHHOPT = $(SRCDIR)/shhopt/libshhopt.a
++LIBSHHOPT = $(BUILDDIR)/shhopt/libshhopt.a
MANUALS1 = $(BINARIES)
MANUALS3 = libpgm
diff -urN /usr/ports/graphics/netpbm/files/patch-bf graphics/netpbm/files/patch-bf
--- /usr/ports/graphics/netpbm/files/patch-bf Mon Feb 26 19:19:41 2001
+++ graphics/netpbm/files/patch-bf Tue Mar 27 00:00:00 2001
@@ -1,6 +1,6 @@
---- pnm/Makefile.orig Tue Jan 23 14:05:35 2001
-+++ pnm/Makefile Sat Feb 24 00:00:00 2001
-@@ -47,6 +47,8 @@
+--- 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
@@ -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
-@@ -54,22 +56,24 @@
+@@ -55,23 +57,24 @@
# This package is so big, it's useful even when some parts won't
# build.
@@ -27,10 +27,11 @@
pnmtoplainpnm pnmtops pnmtorast \
- pnmtosgi pnmtosir pnmtoxwd pstopnm \
- rasttopnm sgitopnm sirtopnm xwdtopnm zeisstopnm
--MATHBINARIES = pnmgamma pnmnlfilt pnmrotate pnmscale pnmscalefixed pnmshear
+-MATHBINARIES = pnmgamma pnmnlfilt pnmpsnr pnmrotate \
+- pnmscale pnmscalefixed pnmshear
+ pnmtosgi pnmtosir pnmtoxwd \
+ rasttopnm sgitopnm sirtopnm zeisstopnm
-+MATHBINARIES = pnmgamma pnmnlfilt pnmrotate pnmshear
++MATHBINARIES = pnmgamma pnmnlfilt pnmpsnr pnmrotate pnmshear
+SHHOPTBINARIES = giftopnm pamchannel pamcut pamfile pamtopnm pnmcrop \
+ pnmcut pnmfile pnminterp pnmmontage pnmsplit pstopnm \
+ xwdtopnm
@@ -44,16 +45,16 @@
ifneq ($(PNGHDR_DIR),NONE)
ifneq ($(PNGLIB_DIR),NONE)
NOMERGEBINARIES += pnmtopng pngtopnm
-@@ -106,6 +110,8 @@
+@@ -108,6 +111,8 @@
MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o libpam.o
+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
-+LIBSHHOPT = $(SRCDIR)/shhopt/libshhopt.a
++LIBSHHOPT = $(BUILDDIR)/shhopt/libshhopt.a
MANUALS1 = $(BINARIES) $(SCRIPTS)
MANUALS3 = libpnm
-@@ -126,6 +132,14 @@
+@@ -128,6 +133,14 @@
$(MAKE) -C jbig all
$(MAKE) -C pnmtopalm all
@@ -68,7 +69,7 @@
ifeq ($(TIFFLIB_DIR),$(TIFFDIR))
# We're using the internal Tiff library, so make sure it's built
TIFFLIB_DEP = $(TIFFDIR)/$(LIBTIFF)
-@@ -136,17 +150,18 @@
+@@ -138,17 +151,18 @@
# The Tiff library references math functions.
tifftopnm pnmtotiff pnmtotiffcmyk: %: %.o \
@@ -81,7 +82,7 @@
pngtopnm pnmtopng: %: %.o $(NETPBMLIBS) $(LIBOPT)
$(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \
- -L$(PNGLIB_DIR) -lpng -lz -lm $(CDEBUG)
+ -L$(ZLIB_DIR), -lz -L$(PNGLIB_DIR) -lpng -lm $(CDEBUG)
-jpegtopnm: %: %.o $(NETPBMLIBS) $(LIBOPT)
+jpegtopnm: %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT)
@@ -91,7 +92,7 @@
ifeq ($(URTLIB_DIR),$(URTDIR))
# We're using the internal URT library, so make sure it's built
-@@ -203,6 +218,9 @@
+@@ -205,6 +219,9 @@
$(MAKE) -C fiasco install.man
$(MAKE) -C jbig install.man
$(MAKE) -C pnmtopalm install.man
diff -urN /usr/ports/graphics/netpbm/files/patch-bg graphics/netpbm/files/patch-bg
--- /usr/ports/graphics/netpbm/files/patch-bg Mon Feb 26 19:19:41 2001
+++ graphics/netpbm/files/patch-bg Tue Mar 27 00:00:00 2001
@@ -1,10 +1,10 @@
---- ppm/Makefile.orig Thu Jan 25 13:38:27 2001
-+++ ppm/Makefile Sat Feb 24 00:00:00 2001
+--- 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 = bmptoppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \
+-PORTBINARIES = 411toppm bmptoppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \
+SOVER = 1
+
+PORTBINARIES = eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \
@@ -27,8 +27,8 @@
- sputoppm tgatoppm winicontoppm ximtoppm xpmtoppm xvminitoppm \
+ sputoppm winicontoppm xpmtoppm xvminitoppm \
yuvtoppm yuvsplittoppm
-+SHHOPTBINARIES = bmptoppm ppmchange ppmcolormask ppmhist ppmtobmp \
-+ ppmtogif tgatoppm ximtoppm
++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.
@@ -46,25 +46,25 @@
BINARIES = $(MERGEBINARIES) $(NOMERGEBINARIES)
SCRIPTS = ppmquantall ppmshadow ppmfade
-@@ -59,6 +64,8 @@
- MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
+@@ -60,6 +65,8 @@
- LIBOBJECTS = libppm1.o libppm2.o libppm3.o libppm4.o libppm5.o bitio.o
+ LIBOBJECTS = libppm1.o libppm2.o libppmcmap.o libppm4.o libppm5.o \
+ libppmfloyd.o bitio.o
+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
-+LIBSHHOPT = $(SRCDIR)/shhopt/libshhopt.a
++LIBSHHOPT = $(BUILDDIR)/shhopt/libshhopt.a
MANUALS1 = $(BINARIES) $(SCRIPTS)
MANUALS3 = libppm
-@@ -66,7 +73,7 @@
+@@ -67,7 +74,7 @@
MERGENAME= ppmmerge
--INTERFACE_HEADERS = ppm.h ppmcmap.h
-+INTERFACE_HEADERS = ppm.h ppmcmap.h ppmdraw.h
+-INTERFACE_HEADERS = ppm.h ppmcmap.h ppmfloyd.h
++INTERFACE_HEADERS = ppm.h ppmcmap.h ppmdraw.h ppmfloyd.h
.PHONY: all
all: $(BINARIES)
-@@ -77,9 +84,17 @@
+@@ -78,9 +85,17 @@
$(MAKE) -C ppmtompeg all
$(MAKE) -C hpcdtoppm all
@@ -84,7 +84,7 @@
# And libraries.
$(PBMDIR)/$(LIBPBM): FORCE
-@@ -108,6 +123,9 @@
+@@ -109,6 +124,9 @@
HEADERLINKS = pbmplus.h pbm.h libpbm.h pbmfont.h pgm.h libpgm.h
include $(SRCDIR)/Makefile.common
diff -urN /usr/ports/graphics/netpbm/files/patch-ce graphics/netpbm/files/patch-ce
--- /usr/ports/graphics/netpbm/files/patch-ce Tue Jan 30 21:06:28 2001
+++ graphics/netpbm/files/patch-ce Tue Mar 27 00:00:00 2001
@@ -1,5 +1,5 @@
---- ppm/ppmchange.c.orig Mon Jan 8 05:12:30 2001
-+++ ppm/ppmchange.c Sat Jan 13 00:00:00 2001
+--- 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 @@
*/
@@ -8,9 +8,9 @@
#define TCOLS 256
#define SQRT3 1.73205080756887729352
/* The square root of 3 */
-@@ -53,9 +54,19 @@
+@@ -50,10 +51,20 @@
- char * remainder_color; /* value of -remainder option */
+ unsigned int option_def_index;
+ /* Create the OptStruct structure describing our options */
+ #define OPTENTRY(shortvalue,longvalue,typevalue,outputvalue,flagvalue) {\
@@ -23,12 +23,13 @@
+ }
option_def_index = 0; /* incremented by OPTENTRY */
OPTENTRY(0, "closeness", OPT_INT, &cmdlineP->closeness, 0);
- OPTENTRY(0, "remainder", OPT_STRING, &remainder_color, 0);
+ OPTENTRY(0, "remainder", OPT_STRING,
+ &cmdlineP->remainder_colorname, 0);
+ option_def[option_def_index].type = OPT_END;
/* Set the defaults */
cmdlineP->closeness = 0;
-@@ -65,7 +76,7 @@
+@@ -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 */
@@ -36,4 +37,4 @@
+ optParseOptions2(&argc, argv, opt, 0);
/* Uses and sets argc, argv, and some of *cmdlineP and others. */
- if (remainder_color) {
+ if ((argc-1) % 2 == 0)
diff -urN /usr/ports/graphics/netpbm/files/patch-ct graphics/netpbm/files/patch-ct
--- /usr/ports/graphics/netpbm/files/patch-ct Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/files/patch-ct Tue Mar 27 00:00:00 2001
@@ -0,0 +1,42 @@
+--- 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 @@
+ *==============*/
+ #include <stdio.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 -urN /usr/ports/graphics/netpbm/pkg-plist graphics/netpbm/pkg-plist
--- /usr/ports/graphics/netpbm/pkg-plist Mon Feb 26 19:19:42 2001
+++ graphics/netpbm/pkg-plist Tue Mar 27 00:00:00 2001
@@ -1,3 +1,4 @@
+bin/411toppm
bin/anytopnm
bin/asciitopgm
bin/atktopbm
@@ -230,6 +231,7 @@
include/ppm.h
include/ppmcmap.h
include/ppmdraw.h
+include/ppmfloyd.h
lib/libpbm.a
lib/libpbm.so
lib/libpbm.so.1
--
KATO Tsuguru / tkato@prontomail.ne.jp
Sent by Japanese ProntoMail
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?200104162040.f3GKe2x68343>