From 456782fa52558b4aef4cbb8a8bdd34b790899fc8 Mon Sep 17 00:00:00 2001 From: Neil Blakey-Milner Date: Sun, 6 Aug 2000 15:58:01 +0000 Subject: Upgrade to 9.7 PR: ports/20423 Submitted by: KATO Tsuguru (Ports Fury!) --- graphics/netpbm/Makefile | 2 +- graphics/netpbm/distinfo | 2 +- graphics/netpbm/files/manpages | 3 +++ graphics/netpbm/files/patch-bb | 11 +++++------ graphics/netpbm/files/patch-bd | 22 +++++++++++---------- graphics/netpbm/files/patch-be | 22 ++++++++++----------- graphics/netpbm/files/patch-bf | 45 ++++++++++++++++++++++-------------------- graphics/netpbm/files/patch-bg | 33 +++++++++++++------------------ graphics/netpbm/files/patch-bz | 43 ++++++++++++++++++++++++++++++++++++++++ graphics/netpbm/files/patch-ca | 38 +++++++++++++++++++++++++++++++++++ graphics/netpbm/files/patch-cb | 39 ++++++++++++++++++++++++++++++++++++ graphics/netpbm/pkg-plist | 2 ++ 12 files changed, 192 insertions(+), 70 deletions(-) create mode 100644 graphics/netpbm/files/patch-bz create mode 100644 graphics/netpbm/files/patch-ca create mode 100644 graphics/netpbm/files/patch-cb (limited to 'graphics') diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 4fcb24693863..4cbce090b4b8 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -6,7 +6,7 @@ # PORTNAME= netpbm -PORTVERSION= 9.6 +PORTVERSION= 9.7 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index 746aa00b9387..aeb45124a139 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -1 +1 @@ -MD5 (netpbm-9.6.tgz) = 4814ae9a14f8565e0c4935051d8c1d94 +MD5 (netpbm-9.7.tgz) = d1b07f46e79af3e9e039e3632a343eda diff --git a/graphics/netpbm/files/manpages b/graphics/netpbm/files/manpages index a4fcfa9867f4..7f1f30fcbee2 100644 --- a/graphics/netpbm/files/manpages +++ b/graphics/netpbm/files/manpages @@ -24,6 +24,8 @@ MAN1+= macptopbm.1 MAN1+= mdatopbm.1 MAN1+= mgrtopbm.1 MAN1+= mtvtoppm.1 +MAN1+= pamcut.1 +MAN1+= pamtopnm.1 MAN1+= pbmclean.1 MAN1+= pbmlife.1 MAN1+= pbmmake.1 @@ -205,6 +207,7 @@ MAN3+= libpbm.3 MAN3+= libpgm.3 MAN3+= libpnm.3 MAN3+= libppm.3 +MAN5+= pam.5 MAN5+= pbm.5 MAN5+= pgm.5 MAN5+= pnm.5 diff --git a/graphics/netpbm/files/patch-bb b/graphics/netpbm/files/patch-bb index 08b0ce4e393d..b20f8e7bce66 100644 --- a/graphics/netpbm/files/patch-bb +++ b/graphics/netpbm/files/patch-bb @@ -1,5 +1,5 @@ ---- Makefile.common.orig Sat Jul 8 06:14:26 2000 -+++ Makefile.common Sat Jul 15 00:00:00 2000 +--- Makefile.common.orig Fri Aug 4 09:17:52 2000 ++++ Makefile.common Sat Aug 5 00:00:00 2000 @@ -103,24 +103,20 @@ $(LIBOBJECTS): %.o: %.c @@ -77,15 +77,14 @@ done # Install a static library -@@ -221,16 +217,15 @@ - # library, the dependency here will do that. +@@ -223,15 +219,14 @@ + # here causes the static library to be built at that time. .PHONY: install.staticlib install.staticlib: lib$(LIBROOT).a - $(INSTALL) -c -m $(INSTALL_PERM_LIBS) $< $(INSTALLLIBS)/$< + ${BSD_INSTALL_DATA} $< $(INSTALLLIBS)/$< .PHONY: install.lib.common - ifeq ($(NETPBMLIBSUFFIX),so) # install a shared library -install.lib.common: lib$(LIBROOT).so.$(MAJ).$(MIN) - cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so.$(MAJ).* @@ -95,6 +94,6 @@ + ${BSD_INSTALL_DATA} $< $(INSTALLLIBS) cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so; ln -s $< lib$(LIBROOT).so - cd $(INSTALLLIBS) ; rm -f $(SONAME); ln -s $< $(SONAME) - endif .PHONY: clean.common + clean.common: diff --git a/graphics/netpbm/files/patch-bd b/graphics/netpbm/files/patch-bd index 5dbd9003b2a1..41e7736a0ede 100644 --- a/graphics/netpbm/files/patch-bd +++ b/graphics/netpbm/files/patch-bd @@ -1,6 +1,6 @@ --- pbm/Makefile.orig Thu Jun 29 01:06:06 2000 -+++ pbm/Makefile Sat Jul 15 00:00:00 2000 -@@ -4,13 +4,12 @@ ++++ pbm/Makefile Sat Aug 5 00:00:00 2000 +@@ -4,7 +4,7 @@ include $(SRCDIR)/Makefile.config @@ -9,14 +9,16 @@ # Shared library naming LIBROOT = pbm - LIBPBM = lib$(LIBROOT).$(NETPBMLIBSUFFIX) --MAJ = 9 --MIN = 5 -+SOVER = 1 - +@@ -15,6 +15,8 @@ LIBLIBS = NETPBMLIBS = $(LIBPBM) -@@ -37,11 +36,10 @@ + ++SOVER = 1 ++ + PORTBINARIES = atktopbm brushtopbm cmuwmtopbm g3topbm \ + icontopbm macptopbm mdatopbm mgrtopbm \ + pbmclean pbmlife pbmmake pbmmask pbmpscale \ +@@ -37,11 +39,10 @@ # Library objects to be built and linked by Makefile.common: LIBOBJECTS = libpbm1.o libpbm2.o libpbm3.o libpbm4.o libpbm5.o @@ -29,7 +31,7 @@ MANUALS1 = $(BINARIES) MANUALS3 = libpbm -@@ -53,26 +51,21 @@ +@@ -53,26 +54,21 @@ .PHONY: all all: $(BINARIES) @@ -56,7 +58,7 @@ include $(SRCDIR)/Makefile.common -@@ -80,13 +73,7 @@ +@@ -80,13 +76,7 @@ ../compile.h: $(MAKE) -C $(SRCDIR) compile.h diff --git a/graphics/netpbm/files/patch-be b/graphics/netpbm/files/patch-be index 0712eb3542b0..040d14ba35c1 100644 --- a/graphics/netpbm/files/patch-be +++ b/graphics/netpbm/files/patch-be @@ -1,14 +1,6 @@ ---- pgm/Makefile.orig Thu Jun 29 01:05:55 2000 -+++ pgm/Makefile Sat Jul 15 00:00:00 2000 -@@ -3,14 +3,13 @@ - - LIBROOT = pgm - LIBPGM = lib$(LIBROOT).$(NETPBMLIBSUFFIX) --MAJ = 9 --MIN = 5 -+SOVER = 1 - - PBMDIR = $(SRCDIR)/pbm +--- pgm/Makefile.orig Fri Aug 4 08:45:21 2000 ++++ pgm/Makefile Sat Aug 5 00:00:00 2000 +@@ -10,11 +10,13 @@ INCLUDEPBM = -I$(PBMDIR) LIBPBM = libpbm.$(NETPBMLIBSUFFIX) @@ -17,7 +9,13 @@ NETPBMLIBS = $(LIBPGM) $(PBMDIR)/$(LIBPBM) LIBLIBS = $(PBMDIR)/$(LIBPBM) -@@ -27,6 +26,7 @@ + ++SOVER = 1 ++ + PORTBINARIES = asciitopgm bioradtopgm fstopgm hipstopgm \ + lispmtopgm pbmtopgm pgmbentley pgmenhance pgmhist \ + pgmnoise pgmnorm pgmoil pgmramp pgmslice pgmtofs pgmtolispm \ +@@ -27,6 +29,7 @@ MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES)) LIBOBJECTS = libpgm1.o libpgm2.o diff --git a/graphics/netpbm/files/patch-bf b/graphics/netpbm/files/patch-bf index 7aa5bdb109cb..4cf9c2a05bb3 100644 --- a/graphics/netpbm/files/patch-bf +++ b/graphics/netpbm/files/patch-bf @@ -1,25 +1,27 @@ ---- 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 - LIBPNM = lib$(LIBROOT).$(NETPBMLIBSUFFIX) --MAJ = 9 --MIN = 5 -+SOVER = 1 +--- pnm/Makefile.orig Fri Aug 4 08:46:27 2000 ++++ pnm/Makefile Sat Aug 5 00:00:00 2000 +@@ -47,6 +47,8 @@ + JPEGLD = -L$(JPEGLIB_DIR) -ljpeg + endif - PPMDIR = $(SRCDIR)/ppm - LIBPPM = libppm.$(NETPBMLIBSUFFIX) -@@ -55,20 +54,21 @@ ++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 +@@ -54,21 +56,23 @@ + # This package is so big, it's useful even when some parts won't # build. - PORTBINARIES = fitstopnm gemtopnm giftopnm \ +-PORTBINARIES = fitstopnm gemtopnm giftopnm pamcut pamtopnm \ - pnmalias pnmarith pnmcat pnmcomp pnmconvol pnmcrop \ - pnmcut pnmdepth pnmenlarge pnmfile pnmflip pnmhisteq \ +- pnmhistmap pnminterp pnminvert pnmpad pnmpaste \ +- pnmsmooth pnmsplit pnmtile pnmtoddif pnmtofits \ ++PORTBINARIES = fitstopnm gemtopnm giftopnm \ + pnmalias pnmarith pnmcat pnmcomp pnmconvol \ + pnmdepth pnmenlarge pnmflip pnmhisteq \ - pnmhistmap pnminterp pnminvert pnmpad pnmpaste \ -- pnmsmooth pnmsplit pnmtile pnmtoddif pnmtofits \ ++ pnmhistmap pnminvert pnmpad pnmpaste \ + pnmsmooth pnmtile pnmtoddif pnmtofits \ pnmtoplainpnm pnmtops pnmtorast \ - pnmtosgi pnmtosir pnmtoxwd pstopnm \ @@ -27,7 +29,8 @@ + pnmtosgi pnmtosir pnmtoxwd \ + rasttopnm sgitopnm sirtopnm zeisstopnm MATHBINARIES = pnmgamma pnmnlfilt pnmrotate pnmscale pnmshear -+SHHOPTBINARIES = pnmcrop pnmcut pnmfile pnmsplit pstopnm xwdtopnm ++SHHOPTBINARIES = pamcut 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 @@ -38,16 +41,16 @@ ifneq ($(PNGHDR_DIR),NONE) ifneq ($(PNGLIB_DIR),NONE) NOMERGEBINARIES += pnmtopng pngtopnm -@@ -105,6 +105,8 @@ +@@ -105,6 +109,8 @@ MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES)) - LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o + LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o libpam.o +SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS)) +LIBSHHOPT = $(SRCDIR)/shhopt/libshhopt.a MANUALS1 = $(BINARIES) $(SCRIPTS) MANUALS3 = libpnm -@@ -116,12 +118,12 @@ +@@ -116,12 +122,12 @@ .PHONY: all all: $(BINARIES) @@ -64,7 +67,7 @@ ifeq ($(TIFFLIB_DIR),$(TIFFDIR)) # We're using the internal Tiff library, so make sure it's built -@@ -132,18 +134,18 @@ +@@ -132,18 +138,18 @@ endif # The Tiff library references math functions. @@ -88,7 +91,7 @@ ifeq ($(URTLIB_DIR),$(URTDIR)) # We're using the internal URT library, so make sure it's built -@@ -180,25 +182,20 @@ +@@ -180,25 +186,20 @@ # backward compatibility: program used to be gemtopbm rm -f $(INSTALLBINARIES)/gemtopbm ln -s $(INSTALLBINARIES)/gemtopnm$(EXE) $(INSTALLBINARIES)/gemtopbm diff --git a/graphics/netpbm/files/patch-bg b/graphics/netpbm/files/patch-bg index 2326f083cb01..aba04c91a461 100644 --- a/graphics/netpbm/files/patch-bg +++ b/graphics/netpbm/files/patch-bg @@ -1,16 +1,11 @@ ---- ppm/Makefile.orig Sat Jul 1 03:26:39 2000 -+++ ppm/Makefile Sat Jul 15 00:00:00 2000 -@@ -3,8 +3,7 @@ - - LIBROOT = ppm - LIBPPM = lib$(LIBROOT).$(NETPBMLIBSUFFIX) --MAJ = 9 --MIN = 5 -+SOVER = 1 +--- ppm/Makefile.orig Fri Aug 4 08:45:03 2000 ++++ ppm/Makefile Sat Aug 5 00:00:00 2000 +@@ -21,26 +21,30 @@ + NETPBMLIBS = $(LIBPPM) $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM) + LIBLIBS = $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM) - PGMDIR = $(SRCDIR)/pgm - LIBPGM = libpgm.$(NETPBMLIBSUFFIX) -@@ -24,23 +23,25 @@ ++SOVER = 1 ++ PORTBINARIES = bmptoppm eyuvtoppm gouldtoppm hpcdtoppm ilbmtoppm imgtoppm \ leaftoppm mtvtoppm pcxtoppm pgmtoppm pi1toppm picttoppm \ pjtoppm \ @@ -39,7 +34,7 @@ ifneq ($(JPEGLIB_DIR), NONE) ifneq ($(JPEGHDR_DIR), NONE) NOMERGEBINARIES += ppmtojpeg -@@ -49,7 +50,7 @@ +@@ -49,7 +53,7 @@ MERGEBINARIES = $(PORTBINARIES) $(MATHBINARIES) @@ -48,7 +43,7 @@ BINARIES = $(MERGEBINARIES) $(NOMERGEBINARIES) SCRIPTS = ppmquantall ppmshadow ppmfade -@@ -58,6 +59,8 @@ +@@ -58,6 +62,8 @@ MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES)) LIBOBJECTS = libppm1.o libppm2.o libppm3.o libppm4.o libppm5.o bitio.o @@ -57,7 +52,7 @@ MANUALS1 = $(BINARIES) $(SCRIPTS) MANUALS3 = libppm -@@ -65,18 +68,24 @@ +@@ -65,18 +71,24 @@ MERGENAME= ppmmerge @@ -73,12 +68,12 @@ -ppmtojpeg: %: %.o $(NETPBMLIBS) $(LIBOPT) +$(SHHOPTBINARIES): %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT) - $(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \ -- -L$(JPEGLIB_DIR) -ljpeg $(CDEBUG) ++ $(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \ + $(LIBSHHOPT) $(CDEBUG) + +ppmntsc: %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT) -+ $(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \ + $(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \ +- -L$(JPEGLIB_DIR) -ljpeg $(CDEBUG) + -lm $(LIBSHHOPT) $(CDEBUG) + +ppmtojpeg: %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT) @@ -87,7 +82,7 @@ # And libraries. $(PBMDIR)/$(LIBPBM): FORCE -@@ -89,19 +98,19 @@ +@@ -89,19 +101,19 @@ .PHONY: install.merge install.merge: install.merge.common diff --git a/graphics/netpbm/files/patch-bz b/graphics/netpbm/files/patch-bz new file mode 100644 index 000000000000..e3408a78d513 --- /dev/null +++ b/graphics/netpbm/files/patch-bz @@ -0,0 +1,43 @@ +--- 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 + #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 new file mode 100644 index 000000000000..05c14d3be7d8 --- /dev/null +++ b/graphics/netpbm/files/patch-ca @@ -0,0 +1,38 @@ +--- 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 new file mode 100644 index 000000000000..c2addc49e961 --- /dev/null +++ b/graphics/netpbm/files/patch-cb @@ -0,0 +1,39 @@ +--- 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 + #include + #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/pkg-plist b/graphics/netpbm/pkg-plist index e1d3fe68e2d1..133f45a42f32 100644 --- a/graphics/netpbm/pkg-plist +++ b/graphics/netpbm/pkg-plist @@ -25,6 +25,8 @@ bin/macptopbm bin/mdatopbm bin/mgrtopbm bin/mtvtoppm +bin/pamcut +bin/pamtopnm bin/pbmclean bin/pbmlife bin/pbmmake -- cgit v1.2.3