From 90de1b487ad605c0dd6bc3238b1f551a44467c21 Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 10 Aug 2000 10:44:09 +0000 Subject: Update to 9.7. Changes: Many bugfixes, new pam file format. --- graphics/netpbm/Makefile | 4 ++-- graphics/netpbm/files/md5 | 4 ++-- graphics/netpbm/files/patch-sum | 6 +++--- graphics/netpbm/patches/patch-ab | 36 ++++++++++++++++++------------------ graphics/netpbm/patches/patch-ae | 15 +++++++-------- graphics/netpbm/pkg/PLIST | 17 ++++++++++++++--- 6 files changed, 46 insertions(+), 36 deletions(-) diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index a127a70bdbc..0d454a3fb13 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2000/07/10 11:12:09 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2000/08/10 10:44:09 wiz Exp $ DISTNAME= netpbm-${VERS} CATEGORIES= graphics @@ -17,7 +17,7 @@ USE_LIBTOOL= yes INSTALL_TARGET= install-dev install MAKEFILE= GNUmakefile -VERS= 9.5 +VERS= 9.7 PLIST_SUBST+= VERS=${VERS} .include "../../mk/bsd.prefs.mk" diff --git a/graphics/netpbm/files/md5 b/graphics/netpbm/files/md5 index 02effb473a8..b57e7eb3e21 100644 --- a/graphics/netpbm/files/md5 +++ b/graphics/netpbm/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.10 2000/07/10 11:12:10 wiz Exp $ +$NetBSD: md5,v 1.11 2000/08/10 10:44:10 wiz Exp $ -MD5 (netpbm-9.5.tgz) = 978920c632ab4e9a4e5e4ae94dd86fe6 +MD5 (netpbm-9.7.tgz) = d1b07f46e79af3e9e039e3632a343eda diff --git a/graphics/netpbm/files/patch-sum b/graphics/netpbm/files/patch-sum index 3299ff7721d..b8caf6c0899 100644 --- a/graphics/netpbm/files/patch-sum +++ b/graphics/netpbm/files/patch-sum @@ -1,8 +1,8 @@ -$NetBSD: patch-sum,v 1.8 2000/07/10 11:12:10 wiz Exp $ +$NetBSD: patch-sum,v 1.9 2000/08/10 10:44:10 wiz Exp $ MD5 (patch-aa) = 5b4d1d6972ea98e8185ac9c3c64a9ddf -MD5 (patch-ab) = f0c923b676f378fc6f2ca55f7160d742 +MD5 (patch-ab) = 9e666c21fbd3c9782d6084ac3623ab5d MD5 (patch-ac) = 39721b5f833ab984a5a49a8cb11f4a84 MD5 (patch-ad) = 6800c568c8aefaecb72cc5eeb34f10dd -MD5 (patch-ae) = 989347bdabe0650ed7d41c3703dc9bab +MD5 (patch-ae) = 368156c4290e463bf6a8ef5e96a8f8b0 MD5 (patch-ag) = 9b74942dc6e9d1e26fce2ff3bfdfe720 diff --git a/graphics/netpbm/patches/patch-ab b/graphics/netpbm/patches/patch-ab index 38ef014fdff..bd577a3da35 100644 --- a/graphics/netpbm/patches/patch-ab +++ b/graphics/netpbm/patches/patch-ab @@ -1,26 +1,26 @@ -$NetBSD: patch-ab,v 1.8 2000/07/10 11:12:10 wiz Exp $ +$NetBSD: patch-ab,v 1.9 2000/08/10 10:44:10 wiz Exp $ ---- Makefile.common.orig Fri Jun 30 21:59:36 2000 -+++ Makefile.common Sun Jul 9 23:51:05 2000 -@@ -67,7 +67,7 @@ - $(OBJECTS): %.o: %.c - $(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $< +--- Makefile.common.orig Fri Aug 4 02:17:52 2000 ++++ Makefile.common Thu Aug 10 12:16:47 2000 +@@ -68,7 +68,7 @@ + # Note that the user may have configured -I options into CFLAGS. + $(CC) -c $(INCLUDE) $(CFLAGS) -o $@ $< -LIBOPT = $(SRCDIR)/libopt -+LIBOPT = /bin/echo # XXX must exist, can't be ${ECHO} (shell builtin) ++LIBOPT = /bin/echo # XXX must exist, can't be ${ECHO} (shell builtin) # Rules for conventional single-object file executables $(PORTBINARIES): %: %.o $(NETPBMLIBS) $(LIBOPT) -@@ -97,7 +97,7 @@ - # BUILDING NETPBM LIBRARIES +@@ -103,7 +103,7 @@ $(LIBOBJECTS): %.o: %.c -- $(CC) -c $(CFLAGS) $(CFLAGS_SHLIB) $(INCLUDE) -o $@ $< -+ $(LIBTOOL) $(CC) -c $(CFLAGS) $(CFLAGS_SHLIB) $(INCLUDE) $< + # Note that the user may have configured -I options into CFLAGS. +- $(CC) -c $(INCLUDE) $(CFLAGS) $(CFLAGS_SHLIB) -o $@ $< ++ $(LIBTOOL) $(CC) -c $(INCLUDE) $(CFLAGS) $(CFLAGS_SHLIB) $< SONAME = lib$(LIBROOT).so.$(MAJ) -@@ -117,10 +117,8 @@ +@@ -123,10 +123,8 @@ `$(LIBOPT) $(LIBLIBS)` -lc # Static library. Unused by default, but with a small change to make files... @@ -33,7 +33,7 @@ $NetBSD: patch-ab,v 1.8 2000/07/10 11:12:10 wiz Exp $ # Some maintenance notes about $(INSTALL): Some install programs can # install multiple files in one shot; others can take only one file at -@@ -163,7 +161,7 @@ +@@ -169,7 +167,7 @@ # Make and Install know that pbmmake.exe counts as pbmmake. for x in $(BINARIES); \ do \ @@ -42,9 +42,9 @@ $NetBSD: patch-ab,v 1.8 2000/07/10 11:12:10 wiz Exp $ done .PHONY: install.script -@@ -214,8 +212,8 @@ - # built. If a previous make STATICLIB=N didn't build the static - # library, the dependency here will do that. +@@ -222,8 +220,8 @@ + # built. So if you later do a make install.staticlib, the dependency + # 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)/$< @@ -52,8 +52,8 @@ $NetBSD: patch-ab,v 1.8 2000/07/10 11:12:10 wiz Exp $ + $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) lib$(LIBROOT).la $(PREFIX)/lib .PHONY: install.lib.common - ifeq ($(NETPBMLIBSUFFIX),so) -@@ -229,7 +227,7 @@ + # install a shared library +@@ -235,7 +233,7 @@ .PHONY: clean.common clean.common: diff --git a/graphics/netpbm/patches/patch-ae b/graphics/netpbm/patches/patch-ae index 3fd66a724fc..3046ebd1761 100644 --- a/graphics/netpbm/patches/patch-ae +++ b/graphics/netpbm/patches/patch-ae @@ -1,15 +1,14 @@ -$NetBSD: patch-ae,v 1.6 2000/07/10 11:12:10 wiz Exp $ +$NetBSD: patch-ae,v 1.7 2000/08/10 10:44:10 wiz Exp $ ---- ppm/ppmtompeg/parallel.c.orig Fri Jun 30 20:04:09 2000 -+++ ppm/ppmtompeg/parallel.c Mon Jul 10 00:37:49 2000 -@@ -70,10 +70,6 @@ +--- ppm/ppmtompeg/parallel.c.orig Sat Jul 1 09:51:53 2000 ++++ ppm/ppmtompeg/parallel.c Thu Aug 10 12:14:53 2000 +@@ -70,9 +70,6 @@ * */ -#define _POSIX_SOURCE -#define _POSIX_C_SOURCE 2 - /* This makes sure pclose() is in stdio.h */ -- - /*==============* - * HEADER FILES * - *==============*/ + /* 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 diff --git a/graphics/netpbm/pkg/PLIST b/graphics/netpbm/pkg/PLIST index 041a1ca9088..5210ebcf608 100644 --- a/graphics/netpbm/pkg/PLIST +++ b/graphics/netpbm/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2000/07/10 11:12:11 wiz Exp $ +@comment $NetBSD: PLIST,v 1.11 2000/08/10 10:44:10 wiz Exp $ bin/anytopnm bin/asciitopgm bin/atktopbm @@ -7,6 +7,7 @@ bin/bmptoppm bin/brushtopbm bin/cmuwmtopbm bin/eyuvtoppm +bin/fiascotopnm bin/fitstopnm bin/fstopgm bin/g3topbm @@ -27,6 +28,8 @@ bin/macptopbm bin/mdatopbm bin/mgrtopbm bin/mtvtoppm +bin/pamcut +bin/pamtopnm bin/pbmclean bin/pbmlife bin/pbmmake @@ -111,6 +114,7 @@ bin/pnmnlfilt bin/pnmnoraw bin/pnmpad bin/pnmpaste +bin/pnmpsnr bin/pnmrotate bin/pnmscale bin/pnmshear @@ -118,6 +122,7 @@ bin/pnmsplit bin/pnmsmooth bin/pnmtile bin/pnmtoddif +bin/pnmtofiasco bin/pnmtofits bin/pnmtojbig bin/pnmtoplainpnm @@ -218,13 +223,13 @@ include/ppmcmap.h include/shhopt.h lib/libpbm.a lib/libpbm.la -lib/libpbm.so.${VERS} +lib/libpbm.so.9.5 lib/libpgm.a lib/libpgm.la lib/libpgm.so.${VERS} lib/libpnm.a lib/libpnm.la -lib/libpnm.so.${VERS} +lib/libpnm.so.9.5 lib/libppm.a lib/libppm.la lib/libppm.so.${VERS} @@ -236,6 +241,7 @@ man/man1/bmptoppm.1 man/man1/brushtopbm.1 man/man1/cmuwmtopbm.1 man/man1/eyuvtoppm.1 +man/man1/fiascotopnm.1 man/man1/fitstopnm.1 man/man1/fstopgm.1 man/man1/g3topbm.1 @@ -255,6 +261,8 @@ man/man1/macptopbm.1 man/man1/mdatopbm.1 man/man1/mgrtopbm.1 man/man1/mtvtoppm.1 +man/man1/pamcut.1 +man/man1/pamtopnm.1 man/man1/pbmclean.1 man/man1/pbmlife.1 man/man1/pbmmake.1 @@ -338,6 +346,7 @@ man/man1/pnmmargin.1 man/man1/pnmnlfilt.1 man/man1/pnmpad.1 man/man1/pnmpaste.1 +man/man1/pnmpsnr.1 man/man1/pnmrotate.1 man/man1/pnmscale.1 man/man1/pnmshear.1 @@ -345,6 +354,7 @@ man/man1/pnmsmooth.1 man/man1/pnmsplit.1 man/man1/pnmtile.1 man/man1/pnmtoddif.1 +man/man1/pnmtofiasco.1 man/man1/pnmtofits.1 man/man1/pnmtojbig.1 man/man1/pnmtoplainpnm.1 @@ -441,6 +451,7 @@ man/man3/libpbm.3 man/man3/libpgm.3 man/man3/libpnm.3 man/man3/libppm.3 +man/man5/pam.5 man/man5/pbm.5 man/man5/pgm.5 man/man5/pnm.5 -- cgit v1.2.3