Date: Tue, 4 Sep 2001 14:07:56 -0700 (PDT) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/30323: Update port: graphics/netpbm to 9.17 Message-ID: <200109042107.f84L7uU57383@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 30323
>Category: ports
>Synopsis: Update port: graphics/netpbm to 9.17
>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: Tue Sep 04 14:10:02 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.3-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 9.17
Remove file:
files/patch-cl
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/netpbm/Makefile graphics/netpbm/Makefile
--- /usr/ports/graphics/netpbm/Makefile Tue Jul 24 23:07:58 2001
+++ graphics/netpbm/Makefile Wed Sep 5 00:00:00 2001
@@ -6,7 +6,7 @@
#
PORTNAME= netpbm
-PORTVERSION= 9.16
+PORTVERSION= 9.17
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -21,8 +21,6 @@
USE_GMAKE= yes
MAKE_ENV= LN="${LN}" RANLIB="${RANLIB}"
MAKEFILE= GNUmakefile
-ALL_TARGET= merge
-INSTALL_TARGET= install-merge install-dev
INSTALLS_SHLIB= yes
.include <bsd.port.pre.mk>
@@ -32,7 +30,6 @@
post-patch:
@${PERL} -pi -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/pm_config.h
@${PERL} -pi -e 's|<shhopt.h>|<pm_shhopt.h>|g' ${WRKSRC}/pbm/pm.h
- @${ECHO} '#include "pm.h"' > ${WRKSRC}/pbmplus.h
@${CP} ${FILESDIR}/Makefile.config.FreeBSD ${WRKSRC}/Makefile.config
@${LN} -sf ${WRKSRC}/shhopt/shhopt.h ${WRKSRC}/shhopt/pm_shhopt.h
diff -urN /usr/ports/graphics/netpbm/distinfo graphics/netpbm/distinfo
--- /usr/ports/graphics/netpbm/distinfo Tue Jul 24 23:07:58 2001
+++ graphics/netpbm/distinfo Wed Sep 5 00:00:00 2001
@@ -1 +1 @@
-MD5 (netpbm-9.16.tgz) = c023bfb5d2cc7c1675b91588b27f4463
+MD5 (netpbm-9.17.tgz) = ac6dcf7810c32fba1f444629eb515f0a
diff -urN /usr/ports/graphics/netpbm/files/Makefile.config.FreeBSD graphics/netpbm/files/Makefile.config.FreeBSD
--- /usr/ports/graphics/netpbm/files/Makefile.config.FreeBSD Tue Jul 24 23:07:58 2001
+++ graphics/netpbm/files/Makefile.config.FreeBSD Wed Sep 5 00:00:00 2001
@@ -1,5 +1,5 @@
+DEFAULT_TARGET = merge
BUILD_FIASCO = Y
-STATICLIB = N
LD = ${CC}
SYMLINK = ${LN} -sf
MANCP = ${BSD_INSTALL_MAN}
@@ -20,6 +20,7 @@
INSTALLBINARIES = $(INSTALL_PREFIX)/bin
INSTALLSCRIPTS = $(INSTALLBINARIES)
INSTALLLIBS = $(INSTALL_PREFIX)/lib
+INSTALLSTATICLIBS = $(INSTALLLIBS)
INSTALLMANUALS1 = $(INSTALL_PREFIX)/man/man1
SUFFIXMANUALS1 = 1
INSTALLMANUALS3 = $(INSTALL_PREFIX)/man/man3
@@ -28,7 +29,8 @@
SUFFIXMANUALS5 = 5
INSTALLHDRS = $(INSTALL_PREFIX)/include
INSTALLDATA = $(INSTALL_PREFIX)/share/netpbm
-LIB_SUFFIX = a
NETPBMLIBTYPE = unixshared
NETPBMLIBSUFFIX = so
+STATICLIB_TOO = y
+STATICLIBSUFFIX = a
SOVER = 1
diff -urN /usr/ports/graphics/netpbm/files/manpages graphics/netpbm/files/manpages
--- /usr/ports/graphics/netpbm/files/manpages Tue Jul 24 23:07:58 2001
+++ graphics/netpbm/files/manpages Wed Sep 5 00:00:00 2001
@@ -25,9 +25,10 @@
MAN1+= lispmtopgm.1
MAN1+= macptopbm.1
MAN1+= mdatopbm.1
-MAN1+= netpbm.1
MAN1+= mgrtopbm.1
MAN1+= mtvtoppm.1
+MAN1+= netpbm.1
+MAN1+= neotoppm.1
MAN1+= palmtopnm.1
MAN1+= pamchannel.1
MAN1+= pamcut.1
@@ -179,6 +180,7 @@
MAN1+= ppmtomap.1
MAN1+= ppmtomitsu.1
MAN1+= ppmtompeg.1
+MAN1+= ppmtoneo.1
MAN1+= ppmtopcx.1
MAN1+= ppmtopgm.1
MAN1+= ppmtopi1.1
diff -urN /usr/ports/graphics/netpbm/files/patch-ba graphics/netpbm/files/patch-ba
--- /usr/ports/graphics/netpbm/files/patch-ba Wed Jun 27 20:28:01 2001
+++ graphics/netpbm/files/patch-ba Wed Sep 5 00:00:00 2001
@@ -1,16 +1,23 @@
---- GNUmakefile.orig Sat Jun 2 11:42:02 2001
-+++ GNUmakefile Tue Jun 26 00:00:00 2001
-@@ -153,10 +153,12 @@
+--- GNUmakefile.orig Fri Aug 17 13:34:44 2001
++++ GNUmakefile Wed Sep 5 00:00:00 2001
+@@ -69,7 +69,7 @@
+
+ default: $(DEFAULT_TARGET)
+
+-all: nonmerge
++all: default
+
+ .PHONY: nonmerge
+ nonmerge: $(SUBDIRS)
+@@ -160,10 +160,10 @@
+
.PHONY: install.hdr
- install.hdr:
- $(SRCDIR)/mkinstalldirs $(INSTALLHDRS)
+ install.hdr: $(INSTALLHDRS) $(SRCDIR)/pm_config.h
- $(INSTALL) -c -m$(INSTALL_PERM_HDR) \
+ ${BSD_INSTALL_DATA} \
- $(SRCDIR)/pbmplus.h $(INSTALLHDRS)
+ $(SRCDIR)/pm_config.h $(INSTALLHDRS)
- $(INSTALL) -c -m$(INSTALL_PERM_HDR) \
- $(SRCDIR)/shhopt/shhopt.h $(INSTALLHDRS)
-+ ${BSD_INSTALL_DATA} \
-+ $(SRCDIR)/pm_config.h $(INSTALLHDRS)
+ ${BSD_INSTALL_DATA} \
+ $(SRCDIR)/shhopt/pm_shhopt.h $(INSTALLHDRS)
for i in $(SUBDIRS) ; do \
diff -urN /usr/ports/graphics/netpbm/files/patch-bb graphics/netpbm/files/patch-bb
--- /usr/ports/graphics/netpbm/files/patch-bb Tue Jul 24 23:07:58 2001
+++ graphics/netpbm/files/patch-bb Wed Sep 5 00:00:00 2001
@@ -1,6 +1,6 @@
---- Makefile.common.orig Thu Jul 12 14:27:12 2001
-+++ Makefile.common Tue Jul 24 00:00:00 2001
-@@ -157,28 +157,23 @@
+--- Makefile.common.orig Tue Sep 4 08:29:05 2001
++++ Makefile.common Wed Sep 5 00:00:00 2001
+@@ -174,9 +174,12 @@
$(LIBOBJECTS): %.o: $(SRCSUBDIR)/%.c $(HEADERLINKS)
# Note that the user may have configured -I options into CFLAGS.
@@ -14,12 +14,10 @@
ifeq ($(NETPBMLIBTYPE),unixshared)
# The libxxx.so link is needed to link the executables.
- lib$(LIBROOT).$(NETPBMLIBSUFFIX): $(SONAME)
- rm -f $@
- $(SYMLINK) $< $@
--# The $(SONAME) link is only needed to test the programs without
--# installing the libraries (in that case, you also need to direct the
--# dynamic linker to the source directories, e.g. set LD_LIBRARY_PATH).
+@@ -186,13 +189,10 @@
+ # The $(SONAME) link is only needed to test the programs without
+ # installing the libraries (in that case, you also need to direct the
+ # dynamic linker to the source directories, e.g. set LD_LIBRARY_PATH).
-$(SONAME): lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ).$(MIN)
- rm -f $@
- $(SYMLINK) $< $@
@@ -27,18 +25,14 @@
- $(LIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT)
- $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
- `$(LIBOPT) $(LIBLIBS)` -lc $(CDEBUG)
--endif
--ifeq ($(NETPBMLIBTYPE),unixstatic)
--lib$(LIBROOT).$(NETPBMLIBSUFFIX): $(LIBOBJECTS) $(LIBOBJECTS_X)
-+$(SONAME): lib$(LIBROOT).$(LIB_SUFFIX) \
++$(SONAME): \
+ $(SHLIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT)
+ $(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \
+ `$(LIBOPT) $(LIBLIBS)` $(LDFLAGS) $(CDEBUG)
-+lib$(LIBROOT).$(LIB_SUFFIX): $(LIBOBJECTS) $(LIBOBJECTS_X)
- -rm -f $@
- ar rc $@ $(LIBOBJECTS) $(LIBOBJECTS_X)
- ifneq ($(RANLIB)x,x)
-@@ -238,7 +233,7 @@
+ endif
+
+ ifeq ($(NETPBMLIBTYPE),dll)
+@@ -281,7 +281,7 @@
install.merge.common: $(MERGENAME) $(NOMERGEBINARIES) install.script
cd $(INSTALLBINARIES) ; rm -f $(BINARIES) $(MERGE_ALIASES)
ifneq ($(MERGENAME)x,x)
@@ -47,7 +41,7 @@
$(MERGENAME) $(INSTALLBINARIES)
cd $(INSTALLBINARIES) ; \
for i in $(MERGEBINARIES) $(MERGE_ALIASES) ; \
-@@ -248,7 +243,7 @@
+@@ -291,7 +291,7 @@
ifneq ($(NOMERGEBINARIES)x,x)
for x in $(NOMERGEBINARIES); \
do \
@@ -56,7 +50,7 @@
$$x $(INSTALLBINARIES); \
done
endif
-@@ -259,7 +254,7 @@
+@@ -302,7 +302,7 @@
# Make and Install know that pbmmake.exe counts as pbmmake.
for x in $(BINARIES); \
do \
@@ -65,7 +59,7 @@
$$x $(INSTALLBINARIES); \
done
-@@ -268,7 +263,7 @@
+@@ -311,7 +311,7 @@
ifneq ($(SCRIPTS)x,x)
for x in $(SCRIPTS); \
do \
@@ -74,7 +68,7 @@
$(INSTALLSCRIPTS); \
done
endif
-@@ -305,7 +300,7 @@
+@@ -348,7 +348,7 @@
# directory when you compile your programs.
for x in $(INTERFACE_HEADERS); \
do \
@@ -83,13 +77,15 @@
$(INSTALLHDRS); \
done
-@@ -313,17 +308,17 @@
+@@ -356,19 +356,19 @@
#
.PHONY: install.staticlib
- install.staticlib: lib$(LIBROOT).$(LIB_SUFFIX)
-- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) $< $(INSTALLLIBS)/$<
-+ ${BSD_INSTALL_DATA} $< $(INSTALLLIBS)/$<
+ install.staticlib: lib$(LIBROOT).$(STATICLIBSUFFIX)
+- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) $< $(INSTALLSTATICLIBS)/$<
++ ${BSD_INSTALL_DATA} $< $(INSTALLSTATICLIBS)/$<
+ # Install a shared library
+ #
.PHONY: install.lib.common
ifeq ($(NETPBMLIBTYPE),unixshared)
# install a Unix-style shared library
@@ -100,8 +96,9 @@
+ cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).$(NETPBMLIBSUFFIX).*
+ ${BSD_INSTALL_DATA} $< $(INSTALLLIBS)
cd $(INSTALLLIBS) ; \
- rm -f lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ); \
+- rm -f lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ); \
- $(SYMLINK) $< lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ)
++ rm -f lib$(LIBROOT).$(NETPBMLIBSUFFIX); \
+ $(SYMLINK) $< lib$(LIBROOT).$(NETPBMLIBSUFFIX)
endif
ifeq ($(NETPBMLIBTYPE),dll)
diff -urN /usr/ports/graphics/netpbm/files/patch-bd graphics/netpbm/files/patch-bd
--- /usr/ports/graphics/netpbm/files/patch-bd Wed Jun 27 20:28:01 2001
+++ graphics/netpbm/files/patch-bd Wed Sep 5 00:00:00 2001
@@ -1,6 +1,6 @@
---- pbm/Makefile.orig Wed May 30 14:59:56 2001
-+++ pbm/Makefile Tue Jun 26 00:00:00 2001
-@@ -47,6 +47,7 @@
+--- pbm/Makefile.orig Fri Aug 17 13:40:04 2001
++++ pbm/Makefile Wed Sep 5 00:00:00 2001
+@@ -52,6 +52,7 @@
# Library objects to be built and linked by Makefile.common:
LIBOBJECTS = libpm.o libpbm1.o libpbm2.o libpbm3.o libpbm4.o libpbm5.o
@@ -8,20 +8,16 @@
ifneq (${VMS}x,x)
LIBOBJECTS += libpbmvms.o
endif
-@@ -59,30 +60,25 @@
-
- MERGENAME = pbmmerge
-
--INTERFACE_HEADERS = pbm.h
-+INTERFACE_HEADERS = pbm.h pm.h
+@@ -68,26 +69,21 @@
.PHONY: all
- all: $(BINARIES)
+ all: $(LIBPBM) $(BINARIES) $(EXTRA_STATICLIB)
- $(MAKE) -C pbmtoppa all
.PHONY: merge
- merge: $(MERGENAME)
+-merge: $(MERGENAME)
- $(MAKE) -C pbmtoppa all
++merge: $(MERGENAME) $(EXTRA_STATICLIB)
.PHONY: install.bin
install.bin: install.bin.common
@@ -40,7 +36,7 @@
HEADERLINKS = pm_config.h version.h compile.h
-@@ -104,6 +100,5 @@
+@@ -109,6 +105,5 @@
.PHONY: clean
clean: clean.common
rm -f thinkjettopbm.c
diff -urN /usr/ports/graphics/netpbm/files/patch-be graphics/netpbm/files/patch-be
--- /usr/ports/graphics/netpbm/files/patch-be Tue Jun 12 02:53:53 2001
+++ graphics/netpbm/files/patch-be Wed Sep 5 00:00:00 2001
@@ -1,6 +1,6 @@
---- pgm/Makefile.orig Thu Jan 18 12:39:28 2001
-+++ pgm/Makefile Tue May 15 00:00:00 2001
-@@ -27,6 +27,7 @@
+--- pgm/Makefile.orig Fri Aug 17 13:42:24 2001
++++ pgm/Makefile Wed Sep 5 00:00:00 2001
+@@ -33,6 +33,7 @@
MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
LIBOBJECTS = libpgm1.o libpgm2.o
@@ -8,3 +8,12 @@
MANUALS1 = $(BINARIES)
MANUALS3 = libpgm
+@@ -45,7 +46,7 @@
+ .PHONY: all
+ all: $(PGMLIB) $(BINARIES) $(EXTRA_STATICLIB)
+ .PHONY: merge
+-merge: $(MERGENAME)
++merge: $(MERGENAME) $(EXTRA_STATICLIB) $(EXTRA_STATICLIB)
+
+ # LIBRARIES
+
diff -urN /usr/ports/graphics/netpbm/files/patch-bf graphics/netpbm/files/patch-bf
--- /usr/ports/graphics/netpbm/files/patch-bf Tue Jun 12 02:53:53 2001
+++ graphics/netpbm/files/patch-bf Wed Sep 5 00:00:00 2001
@@ -1,6 +1,6 @@
---- pnm/Makefile.orig Thu May 10 06:48:25 2001
-+++ pnm/Makefile Tue May 15 00:00:00 2001
-@@ -108,6 +108,7 @@
+--- pnm/Makefile.orig Mon Sep 3 09:45:17 2001
++++ pnm/Makefile Wed Sep 5 00:00:00 2001
+@@ -155,6 +155,7 @@
MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o libpam.o
@@ -8,3 +8,21 @@
MANUALS1 = $(BINARIES) $(SCRIPTS)
MANUALS3 = libpnm
+@@ -172,7 +173,7 @@
+ $(MAKE) -C jbig all
+ $(MAKE) -C pnmtopalm all
+ PHONY: merge
+-merge: $(MERGENAME) $(NOMERGEBINARIES)
++merge: $(MERGENAME) $(NOMERGEBINARIES) $(EXTRA_STATICLIB)
+ ifneq ($(BUILD_FIASCO), N)
+ $(MAKE) -C fiasco all
+ endif
+@@ -190,7 +191,7 @@
+
+ jpegtopnm: %: %.o exif.o $(NETPBMLIBS) $(LIBOPT)
+ $(LD) $(LDFLAGS) -o $@ $< exif.o `$(LIBOPT) $(NETPBMLIBS)` $(JPEGLD) \
+- $(CDEBUG)
++ -lm $(CDEBUG)
+
+ ifeq ($(URTLIB_DIR),$(URTDIR))
+ # We're using the internal URT library, so make sure it's built
diff -urN /usr/ports/graphics/netpbm/files/patch-bg graphics/netpbm/files/patch-bg
--- /usr/ports/graphics/netpbm/files/patch-bg Tue Jun 12 02:53:53 2001
+++ graphics/netpbm/files/patch-bg Wed Sep 5 00:00:00 2001
@@ -1,6 +1,6 @@
---- ppm/Makefile.orig Mon May 14 07:56:12 2001
-+++ ppm/Makefile Tue May 15 00:00:00 2001
-@@ -60,6 +60,7 @@
+--- ppm/Makefile.orig Fri Aug 17 13:43:06 2001
++++ ppm/Makefile Wed Sep 5 00:00:00 2001
+@@ -67,6 +67,7 @@
LIBOBJECTS = libppm1.o libppm2.o libppmcmap.o libppm4.o libppm5.o \
libppmfloyd.o bitio.o
@@ -8,7 +8,7 @@
MANUALS1 = $(BINARIES) $(SCRIPTS)
MANUALS3 = libppm
-@@ -67,7 +68,7 @@
+@@ -74,14 +75,14 @@
MERGENAME= ppmmerge
@@ -16,4 +16,12 @@
+INTERFACE_HEADERS = ppm.h ppmcmap.h ppmdraw.h ppmfloyd.h
.PHONY: all
- all: $(BINARIES)
+ all: $(LIBPPM) $(BINARIES) $(EXTRA_STATICLIB)
+ $(MAKE) -C ppmtompeg all
+ $(MAKE) -C hpcdtoppm all
+ .PHONY: merge
+-merge: $(MERGENAME) $(NOMERGEBINARIES)
++merge: $(MERGENAME) $(NOMERGEBINARIES) $(EXTRA_STATICLIB)
+ $(MAKE) -C ppmtompeg all
+ $(MAKE) -C hpcdtoppm all
+
diff -urN /usr/ports/graphics/netpbm/files/patch-cl graphics/netpbm/files/patch-cl
--- /usr/ports/graphics/netpbm/files/patch-cl Mon Jan 29 23:20:44 2001
+++ graphics/netpbm/files/patch-cl Thu Jan 1 09:00:00 1970
@@ -1,28 +0,0 @@
---- ppm/ppmtompeg/parallel.c.orig Sat Jul 1 16:51:53 2000
-+++ ppm/ppmtompeg/parallel.c Sat Jan 13 00:00:00 2001
-@@ -70,9 +70,6 @@
- *
- */
-
--#define _POSIX_SOURCE
--#define _POSIX_C_SOURCE 2
-- /* This makes sure pclose() is in stdio.h */
- /* 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/pkg-plist graphics/netpbm/pkg-plist
--- /usr/ports/graphics/netpbm/pkg-plist Tue Jul 24 23:07:58 2001
+++ graphics/netpbm/pkg-plist Wed Sep 5 00:00:00 2001
@@ -28,6 +28,7 @@
bin/mdatopbm
bin/mgrtopbm
bin/mtvtoppm
+bin/neotoppm
bin/palmtopnm
bin/pamchannel
bin/pamcut
@@ -184,6 +185,7 @@
bin/ppmtomap
bin/ppmtomitsu
bin/ppmtompeg
+bin/ppmtoneo
bin/ppmtopcx
bin/ppmtopgm
bin/ppmtopi1
@@ -229,7 +231,6 @@
bin/yuvtoppm
bin/zeisstopnm
include/pbm.h
-include/pbmplus.h
include/pgm.h
include/pm.h
include/pm_config.h
>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?200109042107.f84L7uU57383>