Date: Tue, 18 Jun 2002 13:28:01 -0700 (PDT) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/39482: Update port: graphics/netpbm to 10.2 Message-ID: <200206182028.g5IKS1ra018112@www.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 39482
>Category: ports
>Synopsis: Update port: graphics/netpbm to 10.2
>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 Jun 18 13:30:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.6-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 10.2
New file:
files/patch-GNUmakefile
files/patch-Makefile.common
files/patch-converter::other::pnmtopalm::Makefile
files/patch-converter::other::pnmtopng.c
files/patch-converter::other::pnmtotiffcmyk.c
files/patch-converter::other::ppm::ppmtompeg::Makefile
files/patch-lib::Makefile
files/patch-other::pnmarith.c
files/patch-pm_config.h
Remove file:
files/manpages
files/patch-aj
files/patch-ap
files/patch-ay
files/patch-ba
files/patch-bb
files/patch-bd
files/patch-be
files/patch-bf
files/patch-bg
files/patch-bi
files/patch-co
files/patch-cp
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/netpbm/Makefile graphics/netpbm/Makefile
--- /usr/ports/graphics/netpbm/Makefile Mon May 27 21:06:16 2002
+++ graphics/netpbm/Makefile Tue Jun 18 00:00:00 2002
@@ -6,8 +6,7 @@
#
PORTNAME= netpbm
-PORTVERSION= 9.25
-PORTREVISION= 1
+PORTVERSION= 10.2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -23,16 +22,14 @@
USE_GMAKE= yes
MAKE_ENV= LN="${LN}" RANLIB="${RANLIB}"
MAKEFILE= GNUmakefile
+INSTALL_TARGET= install.bin install.lib install-dev
INSTALLS_SHLIB= yes
-.include <bsd.port.pre.mk>
-
-.include "${FILESDIR}/manpages"
-
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
+ @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/pm_config.h
+ @${REINPLACE_CMD} -e 's|<shhopt.h>|<pm_shhopt.h>|g' ${WRKSRC}/lib/pm.h
@${CP} ${FILESDIR}/Makefile.config.FreeBSD ${WRKSRC}/Makefile.config
- @${LN} -sf ${WRKSRC}/shhopt/shhopt.h ${WRKSRC}/shhopt/pm_shhopt.h
+ @${LN} -sf ${WRKSRC}/lib/util/shhopt.h ${WRKSRC}/lib/util/pm_shhopt.h
+ @${LN} -sf ${WRKSRC}/lib/util/nstring.h ${WRKSRC}/lib/util/pm_nstring.h
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/graphics/netpbm/distinfo graphics/netpbm/distinfo
--- /usr/ports/graphics/netpbm/distinfo Sun Mar 17 01:25:49 2002
+++ graphics/netpbm/distinfo Tue Jun 18 00:00:00 2002
@@ -1 +1 @@
-MD5 (netpbm-9.25.tgz) = cb8036f3649c93cf51ee377971ddbf1c
+MD5 (netpbm-10.2.tgz) = 871cf2c42f101fcd57c51ad415160819
diff -urN /usr/ports/graphics/netpbm/files/Makefile.config.FreeBSD graphics/netpbm/files/Makefile.config.FreeBSD
--- /usr/ports/graphics/netpbm/files/Makefile.config.FreeBSD Mon May 27 21:06:17 2002
+++ graphics/netpbm/files/Makefile.config.FreeBSD Tue Jun 18 00:00:00 2002
@@ -1,40 +1,26 @@
-DEFAULT_TARGET = merge
+DEFAULT_TARGET = nomerge
BUILD_FIASCO = Y
LD = ${CC}
CC_FOR_BUILD = ${CC}
LD_FOR_BUILD = ${CC}
SYMLINK = ${LN} -sf
-MANCP = ${BSD_INSTALL_MAN}
LDFLAGS = -Wl,--rpath,$(INSTALLLIBS)
LDSHLIB = -shared -Wl,-soname,$(SONAME)
CFLAGS_SHLIB = -fpic -DPIC
-TIFFLIB_DIR = ${LOCALBASE}/lib
+TIFFLIB = ${LOCALBASE}/lib/libtiff.so
TIFFHDR_DIR = ${LOCALBASE}/include
-JPEGLIB_DIR = ${LOCALBASE}/lib
+JPEGLIB = ${LOCALBASE}/lib/libjpeg.so
JPEGHDR_DIR = ${LOCALBASE}/include
-PNGLIB_DIR = ${LOCALBASE}/lib
+PNGLIB = ${LOCALBASE}/lib/libpng.so
PNGHDR_DIR = ${LOCALBASE}/include
-ZLIB_DIR = /usr/lib
+ZLIB = /usr/lib/libz.so
ZHDR_DIR = /usr/include
-JBIGLIB_DIR = ${LOCALBASE}/lib
+JBIGLIB = ${LOCALBASE}/lib/libjbig.so
JBIGHDR_DIR = ${LOCALBASE}/include
-URTLIB_DIR = $(SRCDIR)/urt
+URTLIB = $(BUILDDIR)/urt/librle.a
URTHDR_DIR = $(SRCDIR)/urt
-LINUXSVGALIB_DIR = NONE
+LINUXSVGALIB = NONE
LINUXSVGAHDR_DIR = NONE
-INSTALL_PREFIX = ${PREFIX}
-INSTALLBINARIES = $(INSTALL_PREFIX)/bin
-INSTALLSCRIPTS = $(INSTALLBINARIES)
-INSTALLLIBS = $(INSTALL_PREFIX)/lib
-INSTALLSTATICLIBS = $(INSTALLLIBS)
-INSTALLMANUALS1 = $(INSTALL_PREFIX)/man/man1
-SUFFIXMANUALS1 = 1
-INSTALLMANUALS3 = $(INSTALL_PREFIX)/man/man3
-SUFFIXMANUALS3 = 3
-INSTALLMANUALS5 = $(INSTALL_PREFIX)/man/man5
-SUFFIXMANUALS5 = 5
-INSTALLHDRS = $(INSTALL_PREFIX)/include
-INSTALLDATA = $(INSTALL_PREFIX)/share/netpbm
NETPBMLIBTYPE = unixshared
NETPBMLIBSUFFIX = so
STATICLIB_TOO = y
@@ -42,3 +28,4 @@
SHLIBPREFIXLIST = lib
NETPBMSHLIBPREFIX = $(firstword $(SHLIBPREFIXLIST))
SOVER = 1
+pkgdir = ${PREFIX}
diff -urN /usr/ports/graphics/netpbm/files/manpages graphics/netpbm/files/manpages
--- /usr/ports/graphics/netpbm/files/manpages Mon May 27 21:06:17 2002
+++ graphics/netpbm/files/manpages Thu Jan 1 09:00:00 1970
@@ -1,244 +0,0 @@
-MAN1+= 411toppm.1
-MAN1+= anytopnm.1
-MAN1+= asciitopgm.1
-MAN1+= atktopbm.1
-MAN1+= bioradtopgm.1
-MAN1+= bmptopnm.1
-MAN1+= brushtopbm.1
-MAN1+= cmuwmtopbm.1
-MAN1+= eyuvtoppm.1
-MAN1+= fiascotopnm.1
-MAN1+= fitstopnm.1
-MAN1+= fstopgm.1
-MAN1+= g3topbm.1
-MAN1+= gemtopnm.1
-MAN1+= giftopnm.1
-MAN1+= gouldtoppm.1
-MAN1+= hipstopgm.1
-MAN1+= hpcdtoppm.1
-MAN1+= icontopbm.1
-MAN1+= ilbmtoppm.1
-MAN1+= imgtoppm.1
-MAN1+= jbigtopnm.1
-MAN1+= jpegtopnm.1
-MAN1+= leaftoppm.1
-MAN1+= lispmtopgm.1
-MAN1+= macptopbm.1
-MAN1+= mdatopbm.1
-MAN1+= mgrtopbm.1
-MAN1+= mtvtoppm.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
-MAN1+= pamstretch.1
-MAN1+= pamtopnm.1
-MAN1+= pbmclean.1
-MAN1+= pbmlife.1
-MAN1+= pbmmake.1
-MAN1+= pbmmask.1
-MAN1+= pbmpage.1
-MAN1+= pbmpscale.1
-MAN1+= pbmreduce.1
-MAN1+= pbmtext.1
-MAN1+= pbmto10x.1
-MAN1+= pbmto4425.1
-MAN1+= pbmtoascii.1
-MAN1+= pbmtoatk.1
-MAN1+= pbmtobbnbg.1
-MAN1+= pbmtocmuwm.1
-MAN1+= pbmtoepsi.1
-MAN1+= pbmtoepson.1
-MAN1+= pbmtog3.1
-MAN1+= pbmtogem.1
-MAN1+= pbmtogo.1
-MAN1+= pbmtoicon.1
-MAN1+= pbmtolj.1
-MAN1+= pbmtoln03.1
-MAN1+= pbmtolps.1
-MAN1+= pbmtomacp.1
-MAN1+= pbmtomda.1
-MAN1+= pbmtomgr.1
-MAN1+= pbmtonokia.1
-MAN1+= pbmtopgm.1
-MAN1+= pbmtopi3.1
-MAN1+= pbmtopk.1
-MAN1+= pbmtoplot.1
-MAN1+= pbmtoppa.1
-MAN1+= pbmtopsg3.1
-MAN1+= pbmtoptx.1
-MAN1+= pbmtowbmp.1
-MAN1+= pbmtox10bm.1
-MAN1+= pbmtoxbm.1
-MAN1+= pbmtoybm.1
-MAN1+= pbmtozinc.1
-MAN1+= pbmupc.1
-MAN1+= pcdindex.1
-MAN1+= pcxtoppm.1
-MAN1+= pgmbentley.1
-MAN1+= pgmcrater.1
-MAN1+= pgmedge.1
-MAN1+= pgmenhance.1
-MAN1+= pgmhist.1
-MAN1+= pgmkernel.1
-MAN1+= pgmnoise.1
-MAN1+= pgmramp.1
-MAN1+= pgmslice.1
-MAN1+= pgmtexture.1
-MAN1+= pgmtofs.1
-MAN1+= pgmtolispm.1
-MAN1+= pgmtopbm.1
-MAN1+= pgmtoppm.1
-MAN1+= pi1toppm.1
-MAN1+= pi3topbm.1
-MAN1+= picttoppm.1
-MAN1+= pjtoppm.1
-MAN1+= pktopbm.1
-MAN1+= pngtopnm.1
-MAN1+= pnmalias.1
-MAN1+= pnmarith.1
-MAN1+= pnmcat.1
-MAN1+= pnmcolormap.1
-MAN1+= pnmcomp.1
-MAN1+= pnmconvol.1
-MAN1+= pnmcrop.1
-MAN1+= pnmcut.1
-MAN1+= pnmdepth.1
-MAN1+= pnmenlarge.1
-MAN1+= pnmfile.1
-MAN1+= pnmflip.1
-MAN1+= pnmgamma.1
-MAN1+= pnmhisteq.1
-MAN1+= pnmhistmap.1
-MAN1+= pnmindex.1
-MAN1+= pnminvert.1
-MAN1+= pnmmargin.1
-MAN1+= pnmmontage.1
-MAN1+= pnmnlfilt.1
-MAN1+= pnmnorm.1
-MAN1+= pnmpad.1
-MAN1+= pnmpaste.1
-MAN1+= pnmpsnr.1
-MAN1+= pnmquant.1
-MAN1+= pnmremap.1
-MAN1+= pnmrotate.1
-MAN1+= pnmscale.1
-MAN1+= pnmscalefixed.1
-MAN1+= pnmshear.1
-MAN1+= pnmsmooth.1
-MAN1+= pnmsplit.1
-MAN1+= pnmtile.1
-MAN1+= pnmtoddif.1
-MAN1+= pnmtofiasco.1
-MAN1+= pnmtofits.1
-MAN1+= pnmtojbig.1
-MAN1+= pnmtojpeg.1
-MAN1+= pnmtopalm.1
-MAN1+= pnmtoplainpnm.1
-MAN1+= pnmtopng.1
-MAN1+= pnmtops.1
-MAN1+= pnmtorast.1
-MAN1+= pnmtorle.1
-MAN1+= pnmtosgi.1
-MAN1+= pnmtosir.1
-MAN1+= pnmtotiff.1
-MAN1+= pnmtotiffcmyk.1
-MAN1+= pnmtoxwd.1
-MAN1+= ppm3d.1
-MAN1+= ppmbrighten.1
-MAN1+= ppmchange.1
-MAN1+= ppmcie.1
-MAN1+= ppmcolormask.1
-MAN1+= ppmcolors.1
-MAN1+= ppmdim.1
-MAN1+= ppmdist.1
-MAN1+= ppmdither.1
-MAN1+= ppmfade.1
-MAN1+= ppmflash.1
-MAN1+= ppmforge.1
-MAN1+= ppmhist.1
-MAN1+= ppmlabel.1
-MAN1+= ppmmake.1
-MAN1+= ppmmix.1
-MAN1+= ppmntsc.1
-MAN1+= ppmpat.1
-MAN1+= ppmquant.1
-MAN1+= ppmquantall.1
-MAN1+= ppmqvga.1
-MAN1+= ppmrainbow.1
-MAN1+= ppmrelief.1
-MAN1+= ppmshadow.1
-MAN1+= ppmshift.1
-MAN1+= ppmspread.1
-MAN1+= ppmtoacad.1
-MAN1+= ppmtobmp.1
-MAN1+= ppmtoeyuv.1
-MAN1+= ppmtogif.1
-MAN1+= ppmtoicr.1
-MAN1+= ppmtoilbm.1
-MAN1+= ppmtoleaf.1
-MAN1+= ppmtolj.1
-MAN1+= ppmtomap.1
-MAN1+= ppmtomitsu.1
-MAN1+= ppmtompeg.1
-MAN1+= ppmtoneo.1
-MAN1+= ppmtopcx.1
-MAN1+= ppmtopgm.1
-MAN1+= ppmtopi1.1
-MAN1+= ppmtopict.1
-MAN1+= ppmtopj.1
-MAN1+= ppmtopjxl.1
-MAN1+= ppmtopuzz.1
-MAN1+= ppmtorgb3.1
-MAN1+= ppmtosixel.1
-MAN1+= ppmtotga.1
-MAN1+= ppmtouil.1
-MAN1+= ppmtowinicon.1
-MAN1+= ppmtoxpm.1
-MAN1+= ppmtoyuv.1
-MAN1+= ppmtoyuvsplit.1
-MAN1+= ppmtv.1
-MAN1+= psidtopgm.1
-MAN1+= pstopnm.1
-MAN1+= qrttoppm.1
-MAN1+= rasttopnm.1
-MAN1+= rawtopgm.1
-MAN1+= rawtoppm.1
-MAN1+= rgb3toppm.1
-MAN1+= rletopnm.1
-MAN1+= sbigtopgm.1
-MAN1+= sgitopnm.1
-MAN1+= sirtopnm.1
-MAN1+= sldtoppm.1
-MAN1+= spctoppm.1
-MAN1+= spottopgm.1
-MAN1+= sputoppm.1
-MAN1+= tgatoppm.1
-MAN1+= thinkjettopbm.1
-MAN1+= tifftopnm.1
-MAN1+= wbmptopbm.1
-MAN1+= winicontoppm.1
-MAN1+= xbmtopbm.1
-MAN1+= ximtoppm.1
-MAN1+= xpmtoppm.1
-MAN1+= xvminitoppm.1
-MAN1+= xwdtopnm.1
-MAN1+= ybmtopbm.1
-MAN1+= yuvsplittoppm.1
-MAN1+= yuvtoppm.1
-MAN1+= zeisstopnm.1
-MAN3+= libpbm.3
-MAN3+= libpgm.3
-MAN3+= libpnm.3
-MAN3+= libppm.3
-MAN5+= pam.5
-MAN5+= pbm.5
-MAN5+= pgm.5
-MAN5+= pnm.5
-MAN5+= ppm.5
diff -urN /usr/ports/graphics/netpbm/files/patch-GNUmakefile graphics/netpbm/files/patch-GNUmakefile
--- /usr/ports/graphics/netpbm/files/patch-GNUmakefile Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/files/patch-GNUmakefile Tue Jun 18 00:00:00 2002
@@ -0,0 +1,11 @@
+--- GNUmakefile.orig Fri Jun 14 11:57:11 2002
++++ GNUmakefile Tue Jun 18 00:00:00 2002
+@@ -236,7 +236,7 @@
+ install.hdr: $(PKGDIR)/include
+ $(MAKE) -C lib -f $(SRCDIR)/lib/Makefile \
+ SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) install.hdr
+- $(INSTALL) -c -m $(INSTALL_PERM_HDR) \
++ ${BSD_INSTALL_DATA} \
+ $(SRCDIR)/pm_config.h $(PKGDIR)/include
+
+ ifeq ($(STATICLIB_TOO),y)
diff -urN /usr/ports/graphics/netpbm/files/patch-Makefile.common graphics/netpbm/files/patch-Makefile.common
--- /usr/ports/graphics/netpbm/files/patch-Makefile.common Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/files/patch-Makefile.common Tue Jun 18 00:00:00 2002
@@ -0,0 +1,16 @@
+--- Makefile.common.orig Fri Jun 14 11:55:58 2002
++++ Makefile.common Tue Jun 18 00:00:00 2002
+@@ -209,11 +209,11 @@
+ INSTALLBIN_TARGETS = $(BINARIES:%=%_installbin) netpbm_installbin
+ .PHONY: $(INSTALLBIN_TARGETS)
+ $(INSTALLBIN_TARGETS): $(PKGDIR)/bin
+- $(INSTALL) -c $(STRIPFLAG) -m $(INSTALL_PERM_BIN) \
++ ${BSD_INSTALL_PROGRAM} \
+ $(@:%_installbin=%) $<
+
+ $(SCRIPTS:%=%_installscript): $(PKGDIR)/bin
+- $(INSTALL) -c -m $(INSTALL_PERM_BIN) \
++ ${BSD_INSTALL_SCRIPT} \
+ $(SRCDIR)/$(SUBDIR)/$(@:%_installscript=%) $<
+
+ .PHONY: install.man install.man1 install.man3 install.man5
diff -urN /usr/ports/graphics/netpbm/files/patch-aj graphics/netpbm/files/patch-aj
--- /usr/ports/graphics/netpbm/files/patch-aj Wed Jun 27 20:28:01 2001
+++ graphics/netpbm/files/patch-aj Thu Jan 1 09:00:00 1970
@@ -1,35 +0,0 @@
---- pm_config.h.orig Mon Jun 11 08:37:08 2001
-+++ pm_config.h Mon Tue Jun 26 00:00:00 2001
-@@ -19,6 +19,10 @@
-
- **************************************************************************/
-
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
- #if defined(USG) || defined(SVR4) || defined(VMS) || defined(__SVR4)
- #define SYSV
- #endif
-@@ -28,7 +32,7 @@
- ** and if you run on an Amiga, set AMIGA. If your compiler is ANSI C, you're
- ** probably better off setting SYSV - all it affects is string handling.
- */
--#define BSD
-+/* #define BSD */
- /* #define SYSV */
- /* #define MSDOS */
- /* #define AMIGA */
-@@ -48,9 +52,9 @@
- #define RGB_DB2 "PBMplus_Dir:RGB.TXT"
- #define RGB_DB3 "PBMplus_Dir:RGB.TXT"
- #else
--#define RGB_DB1 "/usr/lib/X11/rgb.txt"
--#define RGB_DB2 "/usr/openwin/lib/rgb.txt"
--#define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt"
-+#define RGB_DB1 "%%X11BASE%%/lib/X11/rgb.txt"
-+#define RGB_DB2 "%%X11BASE%%/lib/X11/rgb.txt"
-+#define RGB_DB3 "%%X11BASE%%/lib/X11/rgb.txt"
- #endif
-
- /* CONFIGURE: This is the name of an environment variable that tells
diff -urN /usr/ports/graphics/netpbm/files/patch-ap graphics/netpbm/files/patch-ap
--- /usr/ports/graphics/netpbm/files/patch-ap Mon Nov 1 10:14:37 1999
+++ graphics/netpbm/files/patch-ap Thu Jan 1 09:00:00 1970
@@ -1,15 +0,0 @@
---- pnm/pnmarith.c.orig Sun Aug 13 13:08:04 1995
-+++ pnm/pnmarith.c Sat Oct 16 02:39:24 1999
-@@ -147,9 +147,9 @@
- break;
-
- case '*':
-- r1 = r1 * r2 / maxval3;
-- g1 = g1 * g2 / maxval3;
-- b1 = b1 * b2 / maxval3;
-+ r1 = (unsigned) r1 * r2 / maxval3;
-+ g1 = (unsigned) g1 * g2 / maxval3;
-+ b1 = (unsigned) b1 * b2 / maxval3;
- break;
-
- case 'D':
diff -urN /usr/ports/graphics/netpbm/files/patch-ay graphics/netpbm/files/patch-ay
--- /usr/ports/graphics/netpbm/files/patch-ay Sat Dec 9 15:39:51 2000
+++ graphics/netpbm/files/patch-ay Thu Jan 1 09:00:00 1970
@@ -1,15 +0,0 @@
---- pnm/pnmtotiffcmyk.c.orig Sat May 13 09:29:45 2000
-+++ pnm/pnmtotiffcmyk.c Fri Dec 8 00:00:00 2000
-@@ -71,8 +71,12 @@
- #define VERSION 1.01
-
- /* beware - these evaluate more than once */
-+#ifndef MAX
- #define MAX(x, y) ( ( x ) > ( y ) ? ( x ) : ( y ) )
-+#endif
-+#ifndef MIN
- #define MIN(x, y) ( ( x ) < ( y ) ? ( x ) : ( y ) )
-+#endif
-
- /* only support 8 bit values */
- #define MAXTIFFBITS 8
diff -urN /usr/ports/graphics/netpbm/files/patch-ba graphics/netpbm/files/patch-ba
--- /usr/ports/graphics/netpbm/files/patch-ba Wed Oct 10 19:54:46 2001
+++ graphics/netpbm/files/patch-ba Thu Jan 1 09:00:00 1970
@@ -1,25 +0,0 @@
---- GNUmakefile.orig Sat Sep 22 01:26:48 2001
-+++ GNUmakefile Wed Oct 10 00:00:00 2001
-@@ -69,7 +69,7 @@
-
- default: $(DEFAULT_TARGET)
-
--all: nonmerge
-+all: default
-
- .PHONY: nonmerge
- nonmerge: $(SUBDIRS)
-@@ -160,10 +160,10 @@
- install.hdr: $(INSTALLHDRS) $(SRCDIR)/pm_config.h
- # See notes in Makefile.common about how $(INSTALL) varies from one
- # platform to another.
-- $(INSTALL) -c -m $(INSTALL_PERM_HDR) \
-+ ${BSD_INSTALL_DATA} \
- $(SRCDIR)/pm_config.h $(INSTALLHDRS)
-- $(INSTALL) -c -m $(INSTALL_PERM_HDR) \
-- $(SRCDIR)/shhopt/shhopt.h $(INSTALLHDRS)
-+ ${BSD_INSTALL_DATA} \
-+ $(SRCDIR)/shhopt/pm_shhopt.h $(INSTALLHDRS)
- for i in $(SUBDIRS) ; do \
- $(MAKE) -C $$i -f $(SRCDIR)/$$i/Makefile install.hdr ; \
- done
diff -urN /usr/ports/graphics/netpbm/files/patch-bb graphics/netpbm/files/patch-bb
--- /usr/ports/graphics/netpbm/files/patch-bb Wed Jan 9 19:33:26 2002
+++ graphics/netpbm/files/patch-bb Thu Jan 1 09:00:00 1970
@@ -1,113 +0,0 @@
---- Makefile.common.orig Sat Jan 5 09:10:54 2002
-+++ Makefile.common Sun Jan 6 00:00:00 2002
-@@ -175,9 +175,12 @@
-
- $(LIBOBJECTS): %.o: $(SRCSUBDIR)/%.c $(HEADERLINKS)
- # Note that the user may have configured -I options into CFLAGS.
-+ $(CC) -c $(INCLUDE) $(CFLAGS) $(CDEBUG) -o $@ $<
-+
-+$(SHLIBOBJECTS): %.lo: $(SRCSUBDIR)/%.c $(HEADERLINKS)
- $(CC) -c $(INCLUDE) $(CFLAGS) $(CFLAGS_SHLIB) $(CDEBUG) -o $@ $<
-
--SONAME = lib$(LIBROOT).so.$(MAJ)
-+SONAME = lib$(LIBROOT).so.$(SOVER)
-
- ifeq ($(NETPBMLIBTYPE),unixshared)
- # The libxxx.so link is needed to link the executables.
-@@ -187,13 +190,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) $< $@
--lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): \
-- $(LIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT)
-- $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
-- `$(LIBOPT) $(LIBLIBS)` -lc $(CDEBUG)
-+$(SONAME): \
-+ $(SHLIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT)
-+ $(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \
-+ `$(LIBOPT) $(LIBLIBS)` $(LDFLAGS) $(CDEBUG)
- endif
-
- ifeq ($(NETPBMLIBTYPE),dll)
-@@ -282,7 +282,7 @@
- install.merge.common: $(MERGENAME) $(NOMERGEBINARIES) install.script
- cd $(INSTALLBINARIES) ; rm -f $(BINARIES) $(MERGE_ALIASES)
- ifneq ($(MERGENAME)x,x)
-- $(INSTALL) -c $(STRIPFLAG) -m $(INSTALL_PERM_BIN) \
-+ ${BSD_INSTALL_PROGRAM} \
- $(MERGENAME) $(INSTALLBINARIES)
- cd $(INSTALLBINARIES) ; \
- for i in $(MERGEBINARIES) $(MERGE_ALIASES) ; \
-@@ -292,7 +292,7 @@
- ifneq ($(NOMERGEBINARIES)x,x)
- for x in $(NOMERGEBINARIES); \
- do \
-- $(INSTALL) -c $(STRIPFLAG) -m $(INSTALL_PERM_BIN) \
-+ ${BSD_INSTALL_PROGRAM} \
- $$x $(INSTALLBINARIES); \
- done
- endif
-@@ -303,7 +303,7 @@
- # Make and Install know that pbmmake.exe counts as pbmmake.
- for x in $(BINARIES); \
- do \
-- $(INSTALL) -c $(STRIPFLAG) -m $(INSTALL_PERM_BIN) \
-+ ${BSD_INSTALL_PROGRAM} \
- $$x $(INSTALLBINARIES); \
- done
-
-@@ -312,7 +312,7 @@
- ifneq ($(SCRIPTS)x,x)
- for x in $(SCRIPTS); \
- do \
-- $(INSTALL) -c -m $(INSTALL_PERM_BIN) $(SRCSUBDIR)/$$x \
-+ ${BSD_INSTALL_SCRIPT} $(SRCSUBDIR)/$$x \
- $(INSTALLSCRIPTS); \
- done
- endif
-@@ -349,7 +349,7 @@
- # directory when you compile your programs.
- for x in $(INTERFACE_HEADERS); \
- do \
-- $(INSTALL) -c -m $(INSTALL_PERM_HDR) $(SRCSUBDIR)/$$x \
-+ ${BSD_INSTALL_DATA} $(SRCSUBDIR)/$$x \
- $(INSTALLHDRS); \
- done
-
-@@ -357,7 +357,7 @@
- #
- .PHONY: install.staticlib
- install.staticlib: lib$(LIBROOT).$(STATICLIBSUFFIX)
-- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) $< $(INSTALLSTATICLIBS)/$<
-+ ${BSD_INSTALL_DATA} $< $(INSTALLSTATICLIBS)/$<
-
- # Install a shared library stub -- the ".so" file used at link time to
- # prepare a program for dynamically linking a library at run time
-@@ -367,7 +367,7 @@
- install.sharedlibstub:
- cd $(INSTALLSTATICLIBS) ; \
- rm -f lib$(LIBROOT).$(NETPBMLIBSUFFIX); \
-- $(SYMLINK) $(INSTALLLIBS)/lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ) \
-+ $(SYMLINK) $(SONAME) \
- lib$(LIBROOT).$(NETPBMLIBSUFFIX)
- else
- # I have no idea what link-time stuff is required for other library types.
-@@ -381,12 +381,9 @@
- .PHONY: install.lib.common
- ifeq ($(NETPBMLIBTYPE),unixshared)
- # install a Unix-style shared library
--install.lib.common: lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ).$(MIN)
-- cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ).*
-- $(INSTALL) -c -m $(INSTALL_PERM_LIBD) $< $(INSTALLLIBS)
-- cd $(INSTALLLIBS) ; \
-- rm -f lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ); \
-- $(SYMLINK) $< lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ)
-+install.lib.common: $(SONAME)
-+ cd $(INSTALLLIBS) ; rm -f $(SONAME)
-+ ${BSD_INSTALL_DATA} $< $(INSTALLLIBS)
- endif
- ifeq ($(NETPBMLIBTYPE),dll)
- #install a Windows DLL shared library
diff -urN /usr/ports/graphics/netpbm/files/patch-bd graphics/netpbm/files/patch-bd
--- /usr/ports/graphics/netpbm/files/patch-bd Sun Mar 17 01:25:49 2002
+++ graphics/netpbm/files/patch-bd Thu Jan 1 09:00:00 1970
@@ -1,19 +0,0 @@
---- 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 bitio.o
-+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
- ifneq (${VMS}x,x)
- LIBOBJECTS += libpbmvms.o
- endif
-@@ -71,7 +72,7 @@
- $(MAKE) -C pbmtoppa all
-
- .PHONY: merge
--merge: $(MERGENAME)
-+merge: $(MERGENAME) $(EXTRA_STATICLIB)
- $(MAKE) -C pbmtoppa all
-
- .PHONY: install.bin
diff -urN /usr/ports/graphics/netpbm/files/patch-be graphics/netpbm/files/patch-be
--- /usr/ports/graphics/netpbm/files/patch-be Wed Jan 30 19:24:27 2002
+++ graphics/netpbm/files/patch-be Thu Jan 1 09:00:00 1970
@@ -1,19 +0,0 @@
---- pgm/Makefile.orig Sun Sep 9 04:31:29 2001
-+++ pgm/Makefile Mon Jan 28 00:00:00 2002
-@@ -33,6 +33,7 @@
- MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
-
- LIBOBJECTS = libpgm1.o libpgm2.o
-+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
-
- MANUALS1 = $(BINARIES)
- MANUALS3 = libpgm
-@@ -45,7 +46,7 @@
- .PHONY: all
- all: $(PGMLIB) $(BINARIES) $(EXTRA_STATICLIB)
- .PHONY: merge
--merge: $(MERGENAME)
-+merge: $(MERGENAME) $(EXTRA_STATICLIB)
-
- # LIBRARIES
-
diff -urN /usr/ports/graphics/netpbm/files/patch-bf graphics/netpbm/files/patch-bf
--- /usr/ports/graphics/netpbm/files/patch-bf Wed Jan 9 19:33:26 2002
+++ graphics/netpbm/files/patch-bf Thu Jan 1 09:00:00 1970
@@ -1,38 +0,0 @@
---- pnm/Makefile.orig Sat Jan 5 06:33:42 2002
-+++ pnm/Makefile Sun Jan 6 00:00:00 2002
-@@ -146,13 +146,14 @@
- # MERGE_ALIASES is additional names to be linked to the merge binary which are
- # alternate names for a program whose source is called something else.
- # Every name here must be referenced in pnmmerge.c.
--MERGE_ALIASES = pnmnoraw gemtopbm
-+MERGE_ALIASES =
-
- OBJECTS = $(patsubst %, %.o, $(BINARIES)) exif.o
-
- MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
-
- LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o libpam.o libpammap.o
-+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
-
- MANUALS1 = $(BINARIES) $(SCRIPTS)
- MANUALS3 = libpnm
-@@ -170,7 +171,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
-@@ -260,10 +261,6 @@
-
- .PHONY: install.man
- install.man: install.man.common
--# The following are for programs that have been renamed
-- rm -f $(INSTALLMANUALS1)/pnmnoraw.*
-- rm -f $(INSTALLMANUALS1)/gemtopnm.*
-- rm -f $(INSTALLMANUALS1)/pnminterp.*
- ifneq ($(BUILD_FIASCO), N)
- $(MAKE) -C fiasco install.man
- endif
diff -urN /usr/ports/graphics/netpbm/files/patch-bg graphics/netpbm/files/patch-bg
--- /usr/ports/graphics/netpbm/files/patch-bg Sun Mar 17 01:25:49 2002
+++ graphics/netpbm/files/patch-bg Thu Jan 1 09:00:00 1970
@@ -1,27 +0,0 @@
---- 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
-+SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
-
- MANUALS1 = $(BINARIES) $(SCRIPTS)
- MANUALS3 = libppm
-@@ -81,14 +82,14 @@
-
- MERGENAME= ppmmerge
-
--INTERFACE_HEADERS = ppm.h ppmcmap.h ppmfloyd.h
-+INTERFACE_HEADERS = ppm.h ppmcmap.h ppmdraw.h ppmfloyd.h
-
- .PHONY: all
- 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-bi graphics/netpbm/files/patch-bi
--- /usr/ports/graphics/netpbm/files/patch-bi Sat Apr 8 15:12:34 2000
+++ graphics/netpbm/files/patch-bi Thu Jan 1 09:00:00 1970
@@ -1,13 +0,0 @@
---- pbm/pbmtog3.1.orig Mon Oct 4 18:10:48 1993
-+++ pbm/pbmtog3.1 Sat Apr 8 12:00:00 2000
-@@ -6,8 +6,8 @@
- .B pbmtog3
- .RI [ pbmfile ]
- .SH DESCRIPTION
--Reads a portable bitmap as output.
--Produces a Group 3 fax file as input.
-+Reads a portable bitmap as input.
-+Produces a Group 3 fax file as output.
- .IX "Group 3 fax"
- .IX fax
- .SH REFERENCES
diff -urN /usr/ports/graphics/netpbm/files/patch-co graphics/netpbm/files/patch-co
--- /usr/ports/graphics/netpbm/files/patch-co Mon Jan 29 23:20:44 2001
+++ graphics/netpbm/files/patch-co Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- pnm/pnmtopalm/Makefile.orig Thu Jan 11 11:59:53 2001
-+++ pnm/pnmtopalm/Makefile Sat Jan 13 00:00:00 2001
-@@ -48,7 +48,7 @@
- $(SRCDIR)/mkinstalldirs $(INSTALLDATA)
- for x in palmcolor8.map palmgray1.map palmgray2.map palmgray4.map ;\
- do \
-- $(INSTALL) -c -m $(INSTALL_PERM_DATA) $(SRCSUBDIR)/$$x \
-+ ${BSD_INSTALL_DATA} $(SRCSUBDIR)/$$x \
- $(INSTALLDATA); \
- done
-
diff -urN /usr/ports/graphics/netpbm/files/patch-converter::other::pnmtopalm::Makefile graphics/netpbm/files/patch-converter::other::pnmtopalm::Makefile
--- /usr/ports/graphics/netpbm/files/patch-converter::other::pnmtopalm::Makefile Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/files/patch-converter::other::pnmtopalm::Makefile Tue Jun 18 00:00:00 2002
@@ -0,0 +1,22 @@
+--- converter/other/pnmtopalm/Makefile.orig Mon Jun 10 13:40:28 2002
++++ converter/other/pnmtopalm/Makefile Tue Jun 18 00:00:00 2002
+@@ -35,15 +35,15 @@
+
+ install.bin: install.bin.local
+ .PHONY: install.bin.local
+-install.bin.local: $(PKGDIR)/misc $(DATAFILE:%=%_installdata)
++install.bin.local: $(PKGDIR)/share/netpbm $(DATAFILE:%=%_installdata)
+
+ install.merge: install.merge.local
+ .PHONY: install.merge.local
+-install.merge.local: $(PKGDIR)/misc $(DATAFILE:%=%_installdata)
++install.merge.local: $(PKGDIR)/share/netpbm $(DATAFILE:%=%_installdata)
+
+ %_installdata:
+- $(INSTALL) -c -m $(INSTALL_PERM_DATA) \
+- $(SRCDIR)/$(SUBDIR)/$(@:%_installdata=%) $(PKGDIR)/misc;
++ ${BSD_INSTALL_DATA} \
++ $(SRCDIR)/$(SUBDIR)/$(@:%_installdata=%) $(PKGDIR)/share/netpbm;
+
+
+ clean: cleanspecial
diff -urN /usr/ports/graphics/netpbm/files/patch-converter::other::pnmtopng.c graphics/netpbm/files/patch-converter::other::pnmtopng.c
--- /usr/ports/graphics/netpbm/files/patch-converter::other::pnmtopng.c Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/files/patch-converter::other::pnmtopng.c Tue Jun 18 00:00:00 2002
@@ -0,0 +1,16 @@
+--- converter/other/pnmtopng.c.orig Thu Apr 25 09:37:11 2002
++++ converter/other/pnmtopng.c Tue Jun 18 00:00:00 2002
+@@ -1857,8 +1857,13 @@
+ fprintf(stderr,"pnmtopng version %s.\n", VERSION);
+ fprintf(stderr, " Compiled with libpng %s; using libpng %s.\n",
+ PNG_LIBPNG_VER_STRING, png_libpng_ver);
++#ifdef zlib_version
+ fprintf(stderr, " Compiled with zlib %s; using zlib %s.\n",
+ ZLIB_VERSION, zlib_version);
++#else
++ fprintf(stderr, " Compiled with zlib %s.\n",
++ ZLIB_VERSION);
++#endif
+ fprintf(stderr,
+ " Compiled with %d-bit netpbm support (PPM_OVERALLMAXVAL = %d).\n",
+ pm_maxvaltobits (PPM_OVERALLMAXVAL), PPM_OVERALLMAXVAL);
diff -urN /usr/ports/graphics/netpbm/files/patch-converter::other::pnmtotiffcmyk.c graphics/netpbm/files/patch-converter::other::pnmtotiffcmyk.c
--- /usr/ports/graphics/netpbm/files/patch-converter::other::pnmtotiffcmyk.c Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/files/patch-converter::other::pnmtotiffcmyk.c Tue Jun 18 00:00:00 2002
@@ -0,0 +1,15 @@
+--- converter/other/pnmtotiffcmyk.c.orig Sat May 13 09:29:45 2000
++++ converter/other/pnmtotiffcmyk.c Tue Jun 18 00:00:00 2002
+@@ -71,8 +71,12 @@
+ #define VERSION 1.01
+
+ /* beware - these evaluate more than once */
++#ifndef MAX
+ #define MAX(x, y) ( ( x ) > ( y ) ? ( x ) : ( y ) )
++#endif
++#ifndef MIN
+ #define MIN(x, y) ( ( x ) < ( y ) ? ( x ) : ( y ) )
++#endif
+
+ /* only support 8 bit values */
+ #define MAXTIFFBITS 8
diff -urN /usr/ports/graphics/netpbm/files/patch-converter::ppm::ppmtompeg::Makefile graphics/netpbm/files/patch-converter::ppm::ppmtompeg::Makefile
--- /usr/ports/graphics/netpbm/files/patch-converter::ppm::ppmtompeg::Makefile Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/files/patch-converter::ppm::ppmtompeg::Makefile Tue Jun 18 00:00:00 2002
@@ -0,0 +1,23 @@
+--- converter/ppm/ppmtompeg/Makefile.orig Mon Jun 10 13:35:38 2002
++++ converter/ppm/ppmtompeg/Makefile Tue Jun 18 00:00:00 2002
+@@ -8,18 +8,12 @@
+ include $(BUILDDIR)/Makefile.config
+
+ JPEGLD =
+-ifeq ($(JPEGLIB_DIR),NONE)
++ifeq ($(JPEGLIB),NONE)
+ # 'nojpeg' is a module that implements all the jpeg access routines as
+ # error messages that tell you we don't have jpeg capability
+ JPEG_MODULE = nojpeg
+ else
+- ifneq ($(JPEGLIB_DIR)x,x)
+- JPEGLD += -L$(JPEGLIB_DIR)
+- ifeq ($(NEED_RUNTIME_PATH),Y)
+- JPEGLD += -R$(JPEGLIB_DIR)
+- endif
+- endif
+- JPEGLD += -ljpeg
++ JPEGLD += `$(LIBOPT) $(LIBOPTOPT) $(JPEGLIB)`
+ # 'jpeg' is a module that accesses J-movies via the JPEG library.
+ JPEG_MODULE = jpeg
+ endif
diff -urN /usr/ports/graphics/netpbm/files/patch-cp graphics/netpbm/files/patch-cp
--- /usr/ports/graphics/netpbm/files/patch-cp Sun Dec 9 04:41:33 2001
+++ graphics/netpbm/files/patch-cp Thu Jan 1 09:00:00 1970
@@ -1,16 +0,0 @@
---- pnm/pnmtopng.c.orig Sun Jul 22 12:32:22 2001
-+++ pnm/pnmtopng.c Sat Dec 8 00:00:00 2001
-@@ -1441,8 +1441,13 @@
- fprintf(stderr,"pnmtopng version %s.\n", VERSION);
- fprintf(stderr, " Compiled with libpng %s; using libpng %s.\n",
- PNG_LIBPNG_VER_STRING, png_libpng_ver);
-+#ifdef zlib_version
- fprintf(stderr, " Compiled with zlib %s; using zlib %s.\n",
- ZLIB_VERSION, zlib_version);
-+#else
-+ fprintf(stderr, " Compiled with zlib %s.\n",
-+ ZLIB_VERSION);
-+#endif
- fprintf(stderr,
- " Compiled with %d-bit netpbm support (PPM_OVERALLMAXVAL = %d).\n",
- pm_maxvaltobits (PPM_OVERALLMAXVAL), PPM_OVERALLMAXVAL);
diff -urN /usr/ports/graphics/netpbm/files/patch-lib::Makefile graphics/netpbm/files/patch-lib::Makefile
--- /usr/ports/graphics/netpbm/files/patch-lib::Makefile Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/files/patch-lib::Makefile Tue Jun 18 00:00:00 2002
@@ -0,0 +1,103 @@
+--- lib/Makefile.orig Wed Jun 12 13:00:32 2002
++++ lib/Makefile Tue Jun 18 00:00:00 2002
+@@ -31,12 +31,14 @@
+ # Library objects to be linked but not built by Makefile.common:
+ LIBOBJECTS_X = util/shhopt.o util/nstring.o
+
++SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
++
+ MANUALS3 = libnetpbm
+ MANUALS5 = pbm pgm ppm pnm pam
+
+ INTERFACE_HEADERS = pm.h pbm.h bitio.h pbmfont.h \
+- pgm.h ppm.h ppm.h ppmcmap.h ppmfloyd.h colorname.h \
+- pnm.h pam.h pammap.h util/shhopt.h util/nstring.h
++ pgm.h ppm.h ppm.h ppmcmap.h ppmdraw.h ppmfloyd.h colorname.h \
++ pnm.h pam.h pammap.h util/pm_shhopt.h util/pm_nstring.h
+
+ HEADERLINKS = pm_config.h version.h compile.h shhopt.h
+
+@@ -57,6 +59,9 @@
+
+ $(LIBOBJECTS): %.o: %.c $(HEADERLINKS)
+ # Note that the user may have configured -I options into CFLAGS.
++ $(CC) -c $(INCLUDE) $(CFLAGS) $(CADD) -o $@ $<
++
++$(SHLIBOBJECTS): %.lo: %.c $(HEADERLINKS)
+ $(CC) -c $(INCLUDE) $(CFLAGS) $(CFLAGS_SHLIB) $(CADD) -o $@ $<
+
+ SUBDIRS = util
+@@ -67,7 +72,7 @@
+ MAJ = $(NETPBM_MAJOR_RELEASE)
+ MIN = $(NETPBM_MINOR_RELEASE)
+
+-SONAME = libnetpbm.so.$(MAJ)
++SONAME = libnetpbm.so.$(SOVER)
+
+ ifeq ($(NETPBMLIBTYPE),irixshared)
+ # The libxxx.so link is needed to link the executables.
+@@ -97,12 +102,9 @@
+ # 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): libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN)
+- rm -f $@
+- $(SYMLINK) $< $@
+-libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X)
+- $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
+- -lc $(CADD)
++$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X)
++ $(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \
++ $(CADD)
+ endif
+
+ ifeq ($(NETPBMLIBTYPE),dll)
+@@ -181,13 +183,10 @@
+ .PHONY: install.lib
+ ifeq ($(NETPBMLIBTYPE),unixshared)
+ # install a Unix-style shared library
+-install.lib: $(PKGDIR)/lib $(PKGDIR)/link
+- cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).*
+- $(INSTALL) -c -m $(INSTALL_PERM_LIBD) \
+- libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(PKGDIR)/lib/
+- cd $(PKGDIR)/lib/ ; \
+- rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ); \
+- $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(SONAME)
++install.lib: $(PKGDIR)/lib
++ cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).*
++ ${BSD_INSTALL_DATA} \
++ $(SONAME) $(PKGDIR)/lib/
+ endif
+ ifeq ($(NETPBMLIBTYPE),dll)
+ #install a Windows DLL shared library
+@@ -217,23 +216,23 @@
+ # directory when you compile your programs.
+
+ %_installhdr: $(PKGDIR)/include
+- $(INSTALL) -c -m $(INSTALL_PERM_HDR) \
++ ${BSD_INSTALL_DATA} \
+ $(SRCDIR)/lib/$(@:%_installhdr=%) $(PKGDIR)/include/;
+
+ .PHONY: install.staticlib
+-install.staticlib: $(PKGDIR)/link
+- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
+- $(PKGDIR)/link
++install.staticlib: $(PKGDIR)/lib
++ ${BSD_INSTALL_DATA} libnetpbm.$(STATICLIBSUFFIX) \
++ $(PKGDIR)/lib
+
+ # Install a shared library stub -- the ".so" file used at link time to
+ # prepare a program for dynamically linking a library at run time
+ .PHONY: install.sharedlibstub
+-install.sharedlibstub: $(PKGDIR)/link
++install.sharedlibstub: $(PKGDIR)/lib
+ ifeq ($(NETPBMLIBTYPE),unixshared)
+ # install the link-time (.so) links to the runtime libraries
+- cd $(PKGDIR)/link ; \
++ cd $(PKGDIR)/lib ; \
+ rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
+- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
++ $(SYMLINK) $(SONAME) \
+ libnetpbm.$(NETPBMLIBSUFFIX)
+ endif
+ ifeq ($(NETPBMLIBTYPE),dll)
diff -urN /usr/ports/graphics/netpbm/files/patch-other::pnmarith.c graphics/netpbm/files/patch-other::pnmarith.c
--- /usr/ports/graphics/netpbm/files/patch-other::pnmarith.c Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/files/patch-other::pnmarith.c Tue Jun 18 00:00:00 2002
@@ -0,0 +1,15 @@
+--- other/pnmarith.c.orig Sun Aug 13 13:08:04 1995
++++ other/pnmarith.c Tue Jun 18 00:00:00 2002
+@@ -147,9 +147,9 @@
+ break;
+
+ case '*':
+- r1 = r1 * r2 / maxval3;
+- g1 = g1 * g2 / maxval3;
+- b1 = b1 * b2 / maxval3;
++ r1 = (unsigned) r1 * r2 / maxval3;
++ g1 = (unsigned) g1 * g2 / maxval3;
++ b1 = (unsigned) b1 * b2 / maxval3;
+ break;
+
+ case 'D':
diff -urN /usr/ports/graphics/netpbm/files/patch-pm_config.h graphics/netpbm/files/patch-pm_config.h
--- /usr/ports/graphics/netpbm/files/patch-pm_config.h Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/files/patch-pm_config.h Tue Jun 18 00:00:00 2002
@@ -0,0 +1,35 @@
+--- pm_config.h.orig Sat Jun 15 05:36:45 2002
++++ pm_config.h Tue Jun 18 00:00:00 2002
+@@ -35,6 +35,10 @@
+ typedef unsigned int uint32n;
+ typedef signed int int32n;
+
++#if (defined(__unix__) || defined(unix)) && !defined(USG)
++#include <sys/param.h>
++#endif
++
+ #if defined(USG) || defined(SVR4) || defined(VMS) || defined(__SVR4)
+ #define SYSV
+ #endif
+@@ -44,7 +48,7 @@
+ ** and if you run on an Amiga, set AMIGA. If your compiler is ANSI C, you're
+ ** probably better off setting SYSV - all it affects is string handling.
+ */
+-#define BSD
++/* #define BSD */
+ /* #define SYSV */
+ /* #define MSDOS */
+ /* #define AMIGA */
+@@ -118,9 +122,9 @@
+ #define RGB_DB2 "PBMplus_Dir:RGB.TXT"
+ #define RGB_DB3 "PBMplus_Dir:RGB.TXT"
+ #else
+-#define RGB_DB1 "/usr/lib/X11/rgb.txt"
+-#define RGB_DB2 "/usr/openwin/lib/rgb.txt"
+-#define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt"
++#define RGB_DB1 "%%X11BASE%%/lib/X11/rgb.txt"
++#define RGB_DB2 "%%X11BASE%%/lib/X11/rgb.txt"
++#define RGB_DB3 "%%X11BASE%%/lib/X11/rgb.txt"
+ #endif
+
+ /* CONFIGURE: This is the name of an environment variable that tells
diff -urN /usr/ports/graphics/netpbm/pkg-plist graphics/netpbm/pkg-plist
--- /usr/ports/graphics/netpbm/pkg-plist Mon May 27 21:06:18 2002
+++ graphics/netpbm/pkg-plist Tue Jun 18 00:00:00 2002
@@ -4,6 +4,7 @@
bin/atktopbm
bin/bioradtopgm
bin/bmptopnm
+bin/bmptoppm
bin/brushtopbm
bin/cmuwmtopbm
bin/eyuvtoppm
@@ -11,9 +12,11 @@
bin/fitstopnm
bin/fstopgm
bin/g3topbm
+bin/gemtopbm
bin/gemtopnm
bin/giftopnm
bin/gouldtoppm
+bin/hdifftopam
bin/hipstopgm
bin/hpcdtoppm
bin/icontopbm
@@ -24,6 +27,7 @@
bin/leaftoppm
bin/lispmtopgm
bin/macptopbm
+bin/manweb
bin/mdatopbm
bin/mgrtopbm
bin/mtvtoppm
@@ -33,20 +37,25 @@
bin/pamcut
bin/pamdeinterlace
bin/pamdice
+bin/pamendian
bin/pamfile
bin/pamoil
+bin/pamseq
+bin/pamstack
bin/pamstretch
bin/pamstretch-gen
+bin/pamtohdiff
bin/pamtopnm
+bin/pamtouil
bin/pbmclean
bin/pbmlife
bin/pbmmake
bin/pbmmask
-bin/pbmmerge
bin/pbmpage
bin/pbmpscale
bin/pbmreduce
bin/pbmtext
+bin/pbmtextps
bin/pbmto10x
bin/pbmto4425
bin/pbmtoascii
@@ -79,7 +88,7 @@
bin/pbmtoybm
bin/pbmtozinc
bin/pbmupc
-bin/pcdindex
+bin/pcdovtoppm
bin/pcxtoppm
bin/pgmbentley
bin/pgmcrater
@@ -87,8 +96,9 @@
bin/pgmenhance
bin/pgmhist
bin/pgmkernel
-bin/pgmmerge
bin/pgmnoise
+bin/pgmnorm
+bin/pgmoil
bin/pgmramp
bin/pgmslice
bin/pgmtexture
@@ -118,11 +128,12 @@
bin/pnmhisteq
bin/pnmhistmap
bin/pnmindex
+bin/pnminterp
bin/pnminvert
bin/pnmmargin
-bin/pnmmerge
bin/pnmmontage
bin/pnmnlfilt
+bin/pnmnoraw
bin/pnmnorm
bin/pnmpad
bin/pnmpaste
@@ -167,13 +178,12 @@
bin/ppmhist
bin/ppmlabel
bin/ppmmake
-bin/ppmmerge
bin/ppmmix
+bin/ppmnorm
bin/ppmntsc
bin/ppmpat
bin/ppmquant
bin/ppmquantall
-bin/ppmqvga
bin/ppmrainbow
bin/ppmrelief
bin/ppmshadow
@@ -185,6 +195,7 @@
bin/ppmtogif
bin/ppmtoicr
bin/ppmtoilbm
+bin/ppmtojpeg
bin/ppmtoleaf
bin/ppmtolj
bin/ppmtomap
@@ -237,30 +248,24 @@
bin/yuvtoppm
bin/zeisstopnm
include/bitio.h
+include/colorname.h
include/pam.h
include/pammap.h
include/pbm.h
+include/pbmfont.h
include/pgm.h
include/pm.h
include/pm_config.h
+include/pm_nstring.h
include/pm_shhopt.h
include/pnm.h
include/ppm.h
include/ppmcmap.h
include/ppmdraw.h
include/ppmfloyd.h
-lib/libpbm.a
-lib/libpbm.so
-lib/libpbm.so.1
-lib/libpgm.a
-lib/libpgm.so
-lib/libpgm.so.1
-lib/libpnm.a
-lib/libpnm.so
-lib/libpnm.so.1
-lib/libppm.a
-lib/libppm.so
-lib/libppm.so.1
+lib/libnetpbm.a
+lib/libnetpbm.so
+lib/libnetpbm.so.1
share/netpbm/palmcolor8.map
share/netpbm/palmgray1.map
share/netpbm/palmgray2.map
>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?200206182028.g5IKS1ra018112>