Date: Fri, 15 Mar 2002 21:40:06 -0800 (PST) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/35960: Update port: graphics/netpbm to 9.25 Message-ID: <200203160540.g2G5e6F62013@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 35960
>Category: ports
>Synopsis: Update port: graphics/netpbm to 9.25
>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 Mar 15 21:50:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 9.25
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/netpbm/Makefile graphics/netpbm/Makefile
--- /usr/ports/graphics/netpbm/Makefile Wed Jan 30 19:24:26 2002
+++ graphics/netpbm/Makefile Sat Mar 16 00:00:00 2002
@@ -6,7 +6,7 @@
#
PORTNAME= netpbm
-PORTVERSION= 9.24
+PORTVERSION= 9.25
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,9 +14,10 @@
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
+LIB_DEPENDS= jbig.1:${PORTSDIR}/graphics/jbigkit \
jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.5:${PORTSDIR}/graphics/png
+ png.5:${PORTSDIR}/graphics/png \
+ tiff.4:${PORTSDIR}/graphics/tiff
USE_GMAKE= yes
MAKE_ENV= LN="${LN}" RANLIB="${RANLIB}"
diff -urN /usr/ports/graphics/netpbm/distinfo graphics/netpbm/distinfo
--- /usr/ports/graphics/netpbm/distinfo Wed Jan 30 19:24:26 2002
+++ graphics/netpbm/distinfo Sat Mar 16 00:00:00 2002
@@ -1 +1 @@
-MD5 (netpbm-9.24.tgz) = 4c73dbf91b8ee858f9e2fe688d7b0fff
+MD5 (netpbm-9.25.tgz) = cb8036f3649c93cf51ee377971ddbf1c
diff -urN /usr/ports/graphics/netpbm/files/Makefile.config.FreeBSD graphics/netpbm/files/Makefile.config.FreeBSD
--- /usr/ports/graphics/netpbm/files/Makefile.config.FreeBSD Wed Jan 30 19:24:27 2002
+++ graphics/netpbm/files/Makefile.config.FreeBSD Sat Mar 16 00:00:00 2002
@@ -1,6 +1,8 @@
DEFAULT_TARGET = merge
BUILD_FIASCO = Y
LD = ${CC}
+CC_FOR_BUILD = ${CC}
+LD_FOR_BUILD = ${CC}
SYMLINK = ${LN} -sf
MANCP = ${BSD_INSTALL_MAN}
LDFLAGS = -Wl,--rpath,$(INSTALLLIBS)
@@ -14,6 +16,8 @@
PNGHDR_DIR = ${LOCALBASE}/include
ZLIB_DIR = /usr/lib
ZHDR_DIR = /usr/include
+JBIGLIB_DIR = ${LOCALBASE}/lib
+JBIGHDR_DIR = ${LOCALBASE}/include
URTLIB_DIR = NONE
URTHDR_DIR = NONE
LINUXSVGALIB_DIR = NONE
diff -urN /usr/ports/graphics/netpbm/files/manpages graphics/netpbm/files/manpages
--- /usr/ports/graphics/netpbm/files/manpages Wed Jan 9 19:33:24 2002
+++ graphics/netpbm/files/manpages Sat Mar 16 00:00:00 2002
@@ -3,7 +3,7 @@
MAN1+= asciitopgm.1
MAN1+= atktopbm.1
MAN1+= bioradtopgm.1
-MAN1+= bmptoppm.1
+MAN1+= bmptopnm.1
MAN1+= brushtopbm.1
MAN1+= cmuwmtopbm.1
MAN1+= eyuvtoppm.1
@@ -27,12 +27,13 @@
MAN1+= mdatopbm.1
MAN1+= mgrtopbm.1
MAN1+= mtvtoppm.1
-MAN1+= netpbm.1
MAN1+= neotoppm.1
+MAN1+= netpbm.1
MAN1+= palmtopnm.1
MAN1+= pamchannel.1
MAN1+= pamcut.1
MAN1+= pamdeinterlace.1
+MAN1+= pamdice.1
MAN1+= pamfile.1
MAN1+= pamoil.1
MAN1+= pamstretch-gen.1
@@ -69,6 +70,7 @@
MAN1+= pbmtopi3.1
MAN1+= pbmtopk.1
MAN1+= pbmtoplot.1
+MAN1+= pbmtoppa.1
MAN1+= pbmtopsg3.1
MAN1+= pbmtoptx.1
MAN1+= pbmtowbmp.1
@@ -86,7 +88,6 @@
MAN1+= pgmhist.1
MAN1+= pgmkernel.1
MAN1+= pgmnoise.1
-MAN1+= pgmnorm.1
MAN1+= pgmramp.1
MAN1+= pgmslice.1
MAN1+= pgmtexture.1
@@ -120,6 +121,7 @@
MAN1+= pnmmargin.1
MAN1+= pnmmontage.1
MAN1+= pnmnlfilt.1
+MAN1+= pnmnorm.1
MAN1+= pnmpad.1
MAN1+= pnmpaste.1
MAN1+= pnmpsnr.1
@@ -137,7 +139,7 @@
MAN1+= pnmtofits.1
MAN1+= pnmtojbig.1
MAN1+= pnmtojpeg.1
-MAN1+= pnmtopalm.1
+MAN1+= pnmtopalm.1
MAN1+= pnmtoplainpnm.1
MAN1+= pnmtopng.1
MAN1+= pnmtops.1
@@ -163,7 +165,6 @@
MAN1+= ppmlabel.1
MAN1+= ppmmake.1
MAN1+= ppmmix.1
-MAN1+= ppmnorm.1
MAN1+= ppmntsc.1
MAN1+= ppmpat.1
MAN1+= ppmquant.1
diff -urN /usr/ports/graphics/netpbm/files/patch-bd graphics/netpbm/files/patch-bd
--- /usr/ports/graphics/netpbm/files/patch-bd Sun Dec 9 07:09:56 2001
+++ graphics/netpbm/files/patch-bd Sat Mar 16 00:00:00 2002
@@ -1,45 +1,19 @@
---- pbm/Makefile.orig Fri Nov 16 02:33:04 2001
-+++ pbm/Makefile Sat Dec 8 00:00:00 2001
+--- pbm/Makefile.orig Mon Feb 18 04:18:04 2002
++++ pbm/Makefile Sat Mar 16 00:00:00 2002
@@ -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
+ LIBOBJECTS = libpm.o libpbm1.o libpbm2.o libpbm3.o libpbm4.o libpbm5.o bitio.o
+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
ifneq (${VMS}x,x)
LIBOBJECTS += libpbmvms.o
endif
-@@ -68,26 +69,21 @@
-
- .PHONY: all
- all: $(LIBPBM) $(BINARIES) $(EXTRA_STATICLIB)
-- $(MAKE) -C pbmtoppa all
+@@ -71,7 +72,7 @@
+ $(MAKE) -C pbmtoppa all
.PHONY: merge
-merge: $(MERGENAME)
-- $(MAKE) -C pbmtoppa all
+merge: $(MERGENAME) $(EXTRA_STATICLIB)
+ $(MAKE) -C pbmtoppa all
.PHONY: install.bin
- install.bin: install.bin.common
-- $(MAKE) -C pbmtoppa install.bin
-
- .PHONY: install.merge
- install.merge: install.merge.common
-- $(MAKE) -C pbmtoppa install.bin
-
- .PHONY: install.lib
- install.lib: install.lib.common
-
- .PHONY: install.man
- install.man: install.man.common
-- $(MAKE) -C pbmtoppa install.man
-
- HEADERLINKS = pm_config.h version.h compile.h
-
-@@ -110,6 +106,5 @@
- clean: clean.common
- rm -f thinkjettopbm.c
- rm -f compile.h
-- $(MAKE) -C pbmtoppa clean
-
- FORCE:
diff -urN /usr/ports/graphics/netpbm/files/patch-bg graphics/netpbm/files/patch-bg
--- /usr/ports/graphics/netpbm/files/patch-bg Wed Jan 30 19:24:27 2002
+++ graphics/netpbm/files/patch-bg Sat Mar 16 00:00:00 2002
@@ -1,23 +1,22 @@
---- ppm/Makefile.orig Mon Jan 7 07:04:08 2002
-+++ ppm/Makefile Mon Jan 28 00:00:00 2002
+--- ppm/Makefile.orig Wed Mar 13 11:09:21 2002
++++ ppm/Makefile Sat Mar 16 00:00:00 2002
@@ -74,6 +74,7 @@
LIBOBJECTS = libppm1.o libppm2.o libppmcmap.o libppm4.o libppm5.o \
- libppmfloyd.o bitio.o
+ libppmfloyd.o
+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
MANUALS1 = $(BINARIES) $(SCRIPTS)
MANUALS3 = libppm
-@@ -81,7 +82,7 @@
+@@ -81,14 +82,14 @@
MERGENAME= ppmmerge
-INTERFACE_HEADERS = ppm.h ppmcmap.h ppmfloyd.h
+INTERFACE_HEADERS = ppm.h ppmcmap.h ppmdraw.h ppmfloyd.h
- ppmsvgalib: %: %.o $(NETPBMLIBS) $(LIBOPT)
- $(LD) $(LDFLAGS) -o $@ $< `$(LIBOPT) $(NETPBMLIBS)` $(LINUXSVGALD) \
-@@ -92,7 +93,7 @@
+ .PHONY: all
+ all: $(LIBPPM) $(BINARIES) $(EXTRA_STATICLIB)
$(MAKE) -C ppmtompeg all
$(MAKE) -C hpcdtoppm all
.PHONY: merge
diff -urN /usr/ports/graphics/netpbm/pkg-plist graphics/netpbm/pkg-plist
--- /usr/ports/graphics/netpbm/pkg-plist Wed Jan 30 19:24:28 2002
+++ graphics/netpbm/pkg-plist Sat Mar 16 00:00:00 2002
@@ -3,7 +3,7 @@
bin/asciitopgm
bin/atktopbm
bin/bioradtopgm
-bin/bmptoppm
+bin/bmptopnm
bin/brushtopbm
bin/cmuwmtopbm
bin/eyuvtoppm
@@ -32,6 +32,7 @@
bin/pamchannel
bin/pamcut
bin/pamdeinterlace
+bin/pamdice
bin/pamfile
bin/pamoil
bin/pamstretch
@@ -69,6 +70,7 @@
bin/pbmtopi3
bin/pbmtopk
bin/pbmtoplot
+bin/pbmtoppa
bin/pbmtopsg3
bin/pbmtoptx
bin/pbmtowbmp
@@ -87,7 +89,6 @@
bin/pgmkernel
bin/pgmmerge
bin/pgmnoise
-bin/pgmnorm
bin/pgmramp
bin/pgmslice
bin/pgmtexture
@@ -122,6 +123,7 @@
bin/pnmmerge
bin/pnmmontage
bin/pnmnlfilt
+bin/pnmnorm
bin/pnmpad
bin/pnmpaste
bin/pnmpsnr
@@ -166,7 +168,6 @@
bin/ppmmake
bin/ppmmerge
bin/ppmmix
-bin/ppmnorm
bin/ppmntsc
bin/ppmpat
bin/ppmquant
@@ -233,6 +234,7 @@
bin/yuvsplittoppm
bin/yuvtoppm
bin/zeisstopnm
+include/bitio.h
include/pam.h
include/pammap.h
include/pbm.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?200203160540.g2G5e6F62013>