Date: Fri, 14 Jul 2000 09:41:26 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/19929: Update port: graphics/netpbm to 9.6 Message-ID: <20000714164126.4B36137C8CC@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 19929
>Category: ports
>Synopsis: Update port: graphics/netpbm to 9.6
>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: Fri Jul 14 09:50:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.0-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 9.6
New file:
patches/patch-by
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/netpbm/Makefile graphics/netpbm/Makefile
--- /usr/ports/graphics/netpbm/Makefile Tue Jul 4 19:01:32 2000
+++ graphics/netpbm/Makefile Sat Jul 15 00:00:00 2000
@@ -6,7 +6,7 @@
#
PORTNAME= netpbm
-PORTVERSION= 9.5
+PORTVERSION= 9.6
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff -urN /usr/ports/graphics/netpbm/files/md5 graphics/netpbm/files/md5
--- /usr/ports/graphics/netpbm/files/md5 Mon Jul 3 21:00:37 2000
+++ graphics/netpbm/files/md5 Sat Jul 15 00:00:00 2000
@@ -1 +1 @@
-MD5 (netpbm-9.5.tgz) = 978920c632ab4e9a4e5e4ae94dd86fe6
+MD5 (netpbm-9.6.tgz) = 4814ae9a14f8565e0c4935051d8c1d94
diff -urN /usr/ports/graphics/netpbm/patches/patch-bb graphics/netpbm/patches/patch-bb
--- /usr/ports/graphics/netpbm/patches/patch-bb Mon Jul 3 21:00:39 2000
+++ graphics/netpbm/patches/patch-bb Sat Jul 15 00:00:00 2000
@@ -1,13 +1,13 @@
---- Makefile.common.orig Sat Jul 1 04:59:36 2000
-+++ Makefile.common Sat Jul 1 12:00:00 2000
-@@ -97,24 +97,20 @@
- # BUILDING NETPBM LIBRARIES
+--- Makefile.common.orig Sat Jul 8 06:14:26 2000
++++ Makefile.common Sat Jul 15 00:00:00 2000
+@@ -103,24 +103,20 @@
$(LIBOBJECTS): %.o: %.c
-+ $(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
+ # Note that the user may have configured -I options into CFLAGS.
++ $(CC) -c $(INCLUDE) $(CFLAGS) -o $@ $<
+
-+$(LIBSOBJECTS): %.so: %.c
- $(CC) -c $(CFLAGS) $(CFLAGS_SHLIB) $(INCLUDE) -o $@ $<
++$(SHLIBOBJECTS): %.lo: %.c
+ $(CC) -c $(INCLUDE) $(CFLAGS) $(CFLAGS_SHLIB) -o $@ $<
-SONAME = lib$(LIBROOT).so.$(MAJ)
+SONAME = lib$(LIBROOT).so.$(SOVER)
@@ -26,13 +26,13 @@
- $(LIBOPT)
- $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
- `$(LIBOPT) $(LIBLIBS)` -lc
-+$(SONAME): $(LIBSOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT) lib$(LIBROOT).a
-+ $(LD) $(LDSHLIB) -o $@ $(LIBSOBJECTS) $(LIBOBJECTS_X) \
++$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT) lib$(LIBROOT).a
++ $(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \
+ `$(LIBOPT) $(LIBLIBS)`
# Static library. Unused by default, but with a small change to make files...
lib$(LIBROOT).a: $(LIBOBJECTS) $(LIBOBJECTS_X)
-@@ -142,7 +138,7 @@
+@@ -148,7 +144,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 ; \
-@@ -151,7 +147,7 @@
+@@ -157,7 +153,7 @@
ifneq ($(NOMERGEBINARIES)x,x)
for x in $(NOMERGEBINARIES); \
do \
@@ -50,7 +50,7 @@
done
endif
-@@ -163,7 +159,7 @@
+@@ -169,7 +165,7 @@
# Make and Install know that pbmmake.exe counts as pbmmake.
for x in $(BINARIES); \
do \
@@ -59,7 +59,7 @@
done
.PHONY: install.script
-@@ -171,7 +167,7 @@
+@@ -177,7 +173,7 @@
ifneq ($(SCRIPTS)x,x)
for x in $(SCRIPTS); \
do \
@@ -68,7 +68,7 @@
done
endif
-@@ -204,7 +200,7 @@
+@@ -210,7 +206,7 @@
# directory when you compile your programs.
for x in $(INTERFACE_HEADERS); \
do \
@@ -77,7 +77,7 @@
done
# Install a static library
-@@ -215,16 +211,15 @@
+@@ -221,16 +217,15 @@
# library, the dependency here will do that.
.PHONY: install.staticlib
install.staticlib: lib$(LIBROOT).a
diff -urN /usr/ports/graphics/netpbm/patches/patch-bd graphics/netpbm/patches/patch-bd
--- /usr/ports/graphics/netpbm/patches/patch-bd Mon Jul 3 21:00:40 2000
+++ graphics/netpbm/patches/patch-bd Sat Jul 15 00:00:00 2000
@@ -1,5 +1,5 @@
--- pbm/Makefile.orig Thu Jun 29 01:06:06 2000
-+++ pbm/Makefile Sat Jul 1 12:00:00 2000
++++ pbm/Makefile Sat Jul 15 00:00:00 2000
@@ -4,13 +4,12 @@
include $(SRCDIR)/Makefile.config
@@ -20,7 +20,7 @@
# Library objects to be built and linked by Makefile.common:
LIBOBJECTS = libpbm1.o libpbm2.o libpbm3.o libpbm4.o libpbm5.o
-+LIBSOBJECTS = $(patsubst %.o, %.so, $(LIBOBJECTS))
++SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
ifneq (${VMS}x,x)
LIBOBJECTS += libpbmvms.o
endif
diff -urN /usr/ports/graphics/netpbm/patches/patch-be graphics/netpbm/patches/patch-be
--- /usr/ports/graphics/netpbm/patches/patch-be Mon Jul 3 21:00:40 2000
+++ graphics/netpbm/patches/patch-be Sat Jul 15 00:00:00 2000
@@ -1,5 +1,5 @@
--- pgm/Makefile.orig Thu Jun 29 01:05:55 2000
-+++ pgm/Makefile Sat Jul 1 12:00:00 2000
++++ pgm/Makefile Sat Jul 15 00:00:00 2000
@@ -3,14 +3,13 @@
LIBROOT = pgm
@@ -21,7 +21,7 @@
MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
LIBOBJECTS = libpgm1.o libpgm2.o
-+LIBSOBJECTS = $(patsubst %.o, %.so, $(LIBOBJECTS))
++SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
MANUALS1 = $(BINARIES)
MANUALS3 = libpgm
diff -urN /usr/ports/graphics/netpbm/patches/patch-bf graphics/netpbm/patches/patch-bf
--- /usr/ports/graphics/netpbm/patches/patch-bf Mon Jul 3 21:00:41 2000
+++ graphics/netpbm/patches/patch-bf Sat Jul 15 00:00:00 2000
@@ -1,5 +1,5 @@
---- pnm/Makefile.orig Thu Jun 29 02:23:53 2000
-+++ pnm/Makefile Sat Jul 1 12:00:00 2000
+--- pnm/Makefile.orig Fri Jul 7 15:24:20 2000
++++ pnm/Makefile Sat Jul 15 00:00:00 2000
@@ -3,8 +3,7 @@
LIBROOT = pnm
@@ -10,11 +10,13 @@
PPMDIR = $(SRCDIR)/ppm
LIBPPM = libppm.$(NETPBMLIBSUFFIX)
-@@ -56,19 +55,20 @@
+@@ -55,20 +54,21 @@
+ # build.
PORTBINARIES = fitstopnm gemtopnm giftopnm \
- pnmalias pnmarith pnmcat pnmcomp pnmconvol pnmcrop \
+- pnmalias pnmarith pnmcat pnmcomp pnmconvol pnmcrop \
- pnmcut pnmdepth pnmenlarge pnmfile pnmflip pnmhisteq \
++ pnmalias pnmarith pnmcat pnmcomp pnmconvol \
+ pnmdepth pnmenlarge pnmflip pnmhisteq \
pnmhistmap pnminterp pnminvert pnmpad pnmpaste \
- pnmsmooth pnmsplit pnmtile pnmtoddif pnmtofits \
@@ -25,7 +27,7 @@
+ pnmtosgi pnmtosir pnmtoxwd \
+ rasttopnm sgitopnm sirtopnm zeisstopnm
MATHBINARIES = pnmgamma pnmnlfilt pnmrotate pnmscale pnmshear
-+SHHOPTBINARIES = pnmcut pnmfile pnmsplit pstopnm xwdtopnm
++SHHOPTBINARIES = pnmcrop pnmcut pnmfile 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
@@ -40,19 +42,21 @@
MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o
-+LIBSOBJECTS = $(patsubst %.o, %.so, $(LIBOBJECTS))
++SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
+LIBSHHOPT = $(SRCDIR)/shhopt/libshhopt.a
MANUALS1 = $(BINARIES) $(SCRIPTS)
MANUALS3 = libpnm
-@@ -116,10 +118,12 @@
+@@ -116,12 +118,12 @@
.PHONY: all
all: $(BINARIES)
- $(MAKE) -C jbig all
+- $(MAKE) -C fiasco all
PHONY: merge
merge: $(MERGENAME) $(NOMERGEBINARIES)
- $(MAKE) -C jbig all
+- $(MAKE) -C fiasco all
+
+$(SHHOPTBINARIES): %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT)
+ $(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \
@@ -60,7 +64,7 @@
ifeq ($(TIFFLIB_DIR),$(TIFFDIR))
# We're using the internal Tiff library, so make sure it's built
-@@ -130,18 +134,18 @@
+@@ -132,18 +134,18 @@
endif
# The Tiff library references math functions.
@@ -84,15 +88,17 @@
ifeq ($(URTLIB_DIR),$(URTDIR))
# We're using the internal URT library, so make sure it's built
-@@ -178,22 +182,20 @@
+@@ -180,25 +182,20 @@
# backward compatibility: program used to be gemtopbm
rm -f $(INSTALLBINARIES)/gemtopbm
ln -s $(INSTALLBINARIES)/gemtopnm$(EXE) $(INSTALLBINARIES)/gemtopbm
- $(MAKE) -C jbig install.bin
+- $(MAKE) -C fiasco install.bin
.PHONY: install.merge
install.merge: install.merge.common
- $(MAKE) -C jbig install.bin
+- $(MAKE) -C fiasco install.bin
.PHONY: install.lib
install.lib: install.lib.common
@@ -100,12 +106,14 @@
.PHONY: install.man
install.man: install.man.common
- $(MAKE) -C jbig install.man
-
-+$(SRCDIR)/shhopt/libshhopt.a:
+- $(MAKE) -C fiasco install.man
++
++$(SRCDIR)/shhopt/libshhopt.a:
+ cd ../shhopt; $(MAKE) libshhopt.a
.PHONY: clean
clean: clean.common
- $(MAKE) -C jbig clean
+- $(MAKE) -C fiasco clean
FORCE:
diff -urN /usr/ports/graphics/netpbm/patches/patch-bg graphics/netpbm/patches/patch-bg
--- /usr/ports/graphics/netpbm/patches/patch-bg Mon Jul 3 21:00:41 2000
+++ graphics/netpbm/patches/patch-bg Sat Jul 15 00:00:00 2000
@@ -1,5 +1,5 @@
--- ppm/Makefile.orig Sat Jul 1 03:26:39 2000
-+++ ppm/Makefile Sat Jul 1 12:00:00 2000
++++ ppm/Makefile Sat Jul 15 00:00:00 2000
@@ -3,8 +3,7 @@
LIBROOT = ppm
@@ -52,7 +52,7 @@
MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
LIBOBJECTS = libppm1.o libppm2.o libppm3.o libppm4.o libppm5.o bitio.o
-+LIBSOBJECTS = $(patsubst %.o, %.so, $(LIBOBJECTS))
++SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
+LIBSHHOPT = $(SRCDIR)/shhopt/libshhopt.a
MANUALS1 = $(BINARIES) $(SCRIPTS)
diff -urN /usr/ports/graphics/netpbm/patches/patch-by graphics/netpbm/patches/patch-by
--- /usr/ports/graphics/netpbm/patches/patch-by Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/patches/patch-by Sat Jul 15 00:00:00 2000
@@ -0,0 +1,43 @@
+--- 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)
>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?20000714164126.4B36137C8CC>