Date: Sat, 1 Apr 2000 15:24:14 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/17742: Update port: graphics/netpbm to 8.3 (fix ports/17571) Message-ID: <200004012324.PAA12145@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 17742
>Category: ports
>Synopsis: Update port: graphics/netpbm to 8.3 (fix ports/17571)
>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: Sat Apr 1 15:30:02 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.0-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 8.3
New file:
patches/patch-ay patches/patch-az patches/patch-ba patches/patch-bb
patches/patch-bc patches/patch-bd patches/patch-be patches/patch-bf
patches/patch-bg patches/patch-bh
Remove file:
patches/patch-aa patches/patch-ab patches/patch-ac patches/patch-ag
patches/patch-am patches/patch-an patches/patch-ao patches/patch-aq
patches/patch-ax
Notes:
Since pnmtopng has been integrated into netpbm package, grapchis/pnmtopng
can be removed from ports tree.
Due to the change of default prefix from X11BASE to LOCALBASE, some
other ports Makefile having dependancy to grapchics/netpbm may have to
modify *_DEPENDS line.
ports/16800 can be closed, since reported bug has been fixed at original
source.
This PR supersedes ports/17571.
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/netpbm/Makefile graphics/netpbm/Makefile
--- /usr/ports/graphics/netpbm/Makefile Sun Feb 13 19:49:10 2000
+++ graphics/netpbm/Makefile Sat Apr 1 12:00:00 2000
@@ -1,57 +1,65 @@
# New ports collection makefile for: netpbm
-# Version required: 8.0
+# Version required: 8.3
# Date created: ?
# Whom: jmz (original)
#
# $FreeBSD: ports/graphics/netpbm/Makefile,v 1.23 2000/02/13 10:49:10 reg Exp $
#
-DISTNAME= netpbm-8.0
+DISTNAME= netpbm-8.3
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/graphics/convert
+EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
+ png.3:${PORTSDIR}/graphics/png
-WRKSRC= ${WRKDIR}/netpbm
-USE_IMAKE= yes
+USE_GMAKE= yes
+ALL_TARGET= merge
+INSTALL_TARGET= install-merge
MAN1= anytopnm.1 asciitopgm.1 atktopbm.1 bioradtopgm.1 bmptoppm.1 \
brushtopbm.1 cmuwmtopbm.1 fitstopnm.1 fstopgm.1 g3topbm.1 gemtopbm.1 \
giftopnm.1 gouldtoppm.1 hipstopgm.1 hpcdtoppm.1 icontopbm.1 \
- ilbmtoppm.1 imgtoppm.1 lispmtopgm.1 macptopbm.1 mgrtopbm.1 mtvtoppm.1 \
- pbmclean.1 pbmlife.1 pbmmake.1 pbmmask.1 pbmpscale.1 pbmreduce.1 \
- pbmtext.1 pbmto10x.1 pbmto4425.1 pbmtoascii.1 pbmtoatk.1 pbmtobbnbg.1 \
- pbmtocmuwm.1 pbmtoepsi.1 pbmtoepson.1 pbmtog3.1 pbmtogem.1 pbmtogo.1 \
- pbmtoicon.1 pbmtolj.1 pbmtoln03.1 pbmtolps.1 pbmtomacp.1 pbmtomgr.1 \
- pbmtopgm.1 pbmtopi3.1 pbmtopk.1 pbmtoplot.1 pbmtoptx.1 pbmtox10bm.1 \
- pbmtoxbm.1 pbmtoybm.1 pbmtozinc.1 pbmupc.1 pcxtoppm.1 pgmbentley.1 \
- pgmcrater.1 pgmedge.1 pgmenhance.1 pgmhist.1 pgmkernel.1 pgmnoise.1 \
- pgmnorm.1 pgmoil.1 pgmramp.1 pgmtexture.1 pgmtofs.1 pgmtolispm.1 \
- pgmtopbm.1 pgmtoppm.1 pi1toppm.1 pi3topbm.1 picttoppm.1 pjtoppm.1 \
- pktopbm.1 pnmalias.1 pnmarith.1 pnmcat.1 pnmcomp.1 pnmconvol.1 \
- pnmcrop.1 pnmcut.1 pnmdepth.1 pnmenlarge.1 pnmfile.1 pnmflip.1 \
- pnmgamma.1 pnmhisteq.1 pnmhistmap.1 pnmindex.1 pnminvert.1 pnmmargin.1 \
- pnmnlfilt.1 pnmnoraw.1 pnmpad.1 pnmpaste.1 pnmrotate.1 pnmscale.1 \
- pnmshear.1 pnmsmooth.1 pnmtile.1 pnmtoddif.1 pnmtofits.1 pnmtops.1 \
- pnmtorast.1 pnmtosgi.1 pnmtosir.1 pnmtotiff.1 pnmtoxwd.1 ppm3d.1 \
- ppmbrighten.1 ppmchange.1 ppmdim.1 ppmdist.1 ppmdither.1 ppmflash.1 \
- ppmforge.1 ppmhist.1 ppmmake.1 ppmmix.1 ppmnorm.1 ppmntsc.1 ppmpat.1 \
- ppmquant.1 ppmquantall.1 ppmqvga.1 ppmrelief.1 ppmshift.1 ppmspread.1 \
- ppmtoacad.1 ppmtobmp.1 ppmtogif.1 ppmtoicr.1 ppmtoilbm.1 ppmtomap.1 \
+ ilbmtoppm.1 imgtoppm.1 jpegtopnm.1 lispmtopgm.1 macptopbm.1 \
+ mgrtopbm.1 mtvtoppm.1 pbmclean.1 pbmlife.1 pbmmake.1 pbmmask.1 \
+ pbmpscale.1 pbmreduce.1 pbmtext.1 pbmto10x.1 pbmto4425.1 pbmtoascii.1 \
+ pbmtoatk.1 pbmtobbnbg.1 pbmtocmuwm.1 pbmtoepsi.1 pbmtoepson.1 \
+ pbmtog3.1 pbmtogem.1 pbmtogo.1 pbmtoicon.1 pbmtolj.1 pbmtoln03.1 \
+ pbmtolps.1 pbmtomacp.1 pbmtomgr.1 pbmtopgm.1 pbmtopi3.1 pbmtopk.1 \
+ pbmtoplot.1 pbmtoptx.1 pbmtox10bm.1 pbmtoxbm.1 pbmtoybm.1 pbmtozinc.1 \
+ pbmupc.1 pcxtoppm.1 pgmbentley.1 pgmcrater.1 pgmedge.1 pgmenhance.1 \
+ pgmhist.1 pgmkernel.1 pgmnoise.1 pgmnorm.1 pgmoil.1 pgmramp.1 \
+ pgmtexture.1 pgmtofs.1 pgmtolispm.1 pgmtopbm.1 pgmtoppm.1 pi1toppm.1 \
+ pi3topbm.1 picttoppm.1 pjtoppm.1 pktopbm.1 pngtopnm.1 pnmalias.1 \
+ pnmarith.1 pnmcat.1 pnmcomp.1 pnmconvol.1 pnmcrop.1 pnmcut.1 \
+ pnmdepth.1 pnmenlarge.1 pnmfile.1 pnmflip.1 pnmgamma.1 pnmhisteq.1 \
+ pnmhistmap.1 pnmindex.1 pnminvert.1 pnmmargin.1 pnmnlfilt.1 pnmpad.1 \
+ pnmpaste.1 pnmrotate.1 pnmscale.1 pnmshear.1 pnmsmooth.1 pnmtile.1 \
+ pnmtoddif.1 pnmtofits.1 pnmtoplainpnm.1 pnmtopng.1 pnmtops.1 \
+ pnmtorast.1 pnmtosgi.1 pnmtosir.1 pnmtotiff.1 pnmtotiffcmyk.1 \
+ pnmtoxwd.1 ppm3d.1 ppmbrighten.1 ppmchange.1 ppmcie.1 ppmdim.1 \
+ ppmdist.1 ppmdither.1 ppmflash.1 ppmforge.1 ppmhist.1 ppmmake.1 \
+ ppmmix.1 ppmnorm.1 ppmntsc.1 ppmpat.1 ppmquant.1 ppmquantall.1 \
+ ppmqvga.1 ppmrelief.1 ppmshadow.1 ppmshift.1 ppmspread.1 ppmtoacad.1 \
+ ppmtobmp.1 ppmtogif.1 ppmtoicr.1 ppmtojpeg.1 ppmtoilbm.1 ppmtomap.1 \
ppmtomitsu.1 ppmtopcx.1 ppmtopgm.1 ppmtopi1.1 ppmtopict.1 ppmtopj.1 \
ppmtopjxl.1 ppmtopuzz.1 ppmtorgb3.1 ppmtosixel.1 ppmtotga.1 \
- ppmtouil.1 ppmtoxpm.1 ppmtoyuv.1 ppmtoyuvsplit.1 psidtopgm.1 pstopnm.1 \
- qrttoppm.1 rasttopnm.1 rawtopgm.1 rawtoppm.1 rgb3toppm.1 sgitopnm.1 \
- sirtopnm.1 sldtoppm.1 spctoppm.1 spottopgm.1 sputoppm.1 tgatoppm.1 \
- tifftopnm.1 xbmtopbm.1 ximtoppm.1 xpmtoppm.1 xvminitoppm.1 \
+ ppmtouil.1 ppmtoxpm.1 ppmtoyuv.1 ppmtoyuvsplit.1 psidtopgm.1 \
+ pstopnm.1 qrttoppm.1 rasttopnm.1 rawtopgm.1 rawtoppm.1 rgb3toppm.1 \
+ sgitopnm.1 sirtopnm.1 sldtoppm.1 spctoppm.1 spottopgm.1 sputoppm.1 \
+ tgatoppm.1 tifftopnm.1 xbmtopbm.1 ximtoppm.1 xpmtoppm.1 xvminitoppm.1 \
xwdtopnm.1 ybmtopbm.1 yuvsplittoppm.1 yuvtoppm.1 zeisstopnm.1
MAN3= libpbm.3 libpgm.3 libpnm.3 libppm.3
MAN5= pbm.5 pgm.5 pnm.5 ppm.5
post-patch:
- @${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Pbmplus.tmpl
+ @${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/pbmplus.h
+
+post-install:
+ ${LDCONFIG} -m ${PREFIX}/lib
.include <bsd.port.mk>
diff -urN /usr/ports/graphics/netpbm/files/md5 graphics/netpbm/files/md5
--- /usr/ports/graphics/netpbm/files/md5 Mon Nov 1 10:14:30 1999
+++ graphics/netpbm/files/md5 Sat Apr 1 12:00:00 2000
@@ -1 +1 @@
-MD5 (netpbm-8.0.tar.gz) = 1aa88eb0d1f86b5793fde0317c95ed68
+MD5 (netpbm-8.3.tgz) = 829f9e3f38850ddbe64a975c89d6cb7b
diff -urN /usr/ports/graphics/netpbm/patches/patch-aa graphics/netpbm/patches/patch-aa
--- /usr/ports/graphics/netpbm/patches/patch-aa Mon Nov 1 10:14:31 1999
+++ graphics/netpbm/patches/patch-aa Thu Jan 1 09:00:00 1970
@@ -1,57 +0,0 @@
---- Imakefile.orig Sat Aug 19 10:50:13 1995
-+++ Imakefile Mon Oct 18 01:01:11 1999
-@@ -15,54 +15,10 @@
- #define IHaveSubdirs
- #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
-
--#if BuildLibTiff
--SUBDIRS = libtiff pbm pgm ppm pnm
--#else
- SUBDIRS = pbm pgm ppm pnm
--#endif
-
- MakeSubdirs($(SUBDIRS))
- DependSubdirs($(SUBDIRS))
--
--World::
-- @echo ""
-- @echo "Building PBMPLUS"
-- @echo ""
-- @date
-- @echo ""
-- $(MAKE) $(MFLAGS) Makefiles
-- $(MAKE) $(MFLAGS) clean
-- $(MAKE) $(MFLAGS) includes
-- $(MAKE) $(MFLAGS) depend
-- $(MAKE) $(MFLAGS)
-- @echo ""
-- @date
-- @echo ""
-- @echo "Full build of PBMPLUS complete."
-- @echo ""
--
--Everything::
-- @echo ""
-- @echo "Rebuilding PBMPLUS"
-- @echo ""
-- @date
-- @echo ""
-- $(MAKE) $(MFLAGS) Makefiles
-- $(MAKE) $(MFLAGS) includes
-- $(MAKE) $(MFLAGS) depend
-- $(MAKE) $(MFLAGS)
-- @echo ""
-- @date
-- @echo ""
-- @echo "Rebuild of PBMPLUS complete."
-- @echo ""
--
--realclean: clean
-- @echo ""
-- @echo "Removing Makefiles"
-- @echo ""
-- rm */Makefile Makefile
-- @echo ""
-
- #if InstallIncludes
- InstallMultipleFlags(pbmplus.h,$(PBMPLUSDIR)$(PBMPLUSINCDIR),$(INSTINCFLAGS))
diff -urN /usr/ports/graphics/netpbm/patches/patch-ab graphics/netpbm/patches/patch-ab
--- /usr/ports/graphics/netpbm/patches/patch-ab Sat Nov 12 06:38:27 1994
+++ graphics/netpbm/patches/patch-ab Thu Jan 1 09:00:00 1970
@@ -1,19 +0,0 @@
-*** pbm/libpbm1.c.orig Mon Jan 10 09:37:22 1994
---- pbm/libpbm1.c Fri Oct 14 17:01:15 1994
-***************
-*** 332,338 ****
- char* reason;
- {
- #ifndef A_STRERROR
-! extern char* sys_errlist[];
- #endif /* A_STRERROR */
- extern int errno;
- char* e;
---- 332,338 ----
- char* reason;
- {
- #ifndef A_STRERROR
-! /* extern char* sys_errlist[]; */
- #endif /* A_STRERROR */
- extern int errno;
- char* e;
diff -urN /usr/ports/graphics/netpbm/patches/patch-ac graphics/netpbm/patches/patch-ac
--- /usr/ports/graphics/netpbm/patches/patch-ac Mon Nov 1 10:14:32 1999
+++ graphics/netpbm/patches/patch-ac Thu Jan 1 09:00:00 1970
@@ -1,16 +0,0 @@
---- pbm/pbmtext.c.orig Wed Oct 27 16:27:04 1993
-+++ pbm/pbmtext.c Mon Oct 18 00:39:47 1999
-@@ -105,10 +105,12 @@
- else
- { /* Read text from stdin. */
- lines = 0;
-- while ( gets( buf ) != NULL )
-+ while ( fgets( buf, sizeof(buf), stdin ) != NULL )
- {
- int l;
-+ char *nl = strchr(buf, '\n');
-
-+ if (nl) *nl = 0;
- fix_control_chars( buf );
- l = strlen( buf );
- if ( lines >= maxlines )
diff -urN /usr/ports/graphics/netpbm/patches/patch-af graphics/netpbm/patches/patch-af
--- /usr/ports/graphics/netpbm/patches/patch-af Mon Nov 1 10:14:34 1999
+++ graphics/netpbm/patches/patch-af Sat Apr 1 12:00:00 2000
@@ -1,12 +1,14 @@
---- pnm/pnmmerge.c.orig Sun Aug 13 12:51:50 1995
-+++ pnm/pnmmerge.c Mon Oct 18 00:14:51 1999
-@@ -55,12 +55,15 @@
+--- pnm/pnmmerge.c.orig Fri Mar 24 07:02:48 2000
++++ pnm/pnmmerge.c Sat Apr 1 12:00:00 2000
+@@ -54,14 +54,17 @@
+ TRY("pnmflip", pnmflip_main);
TRY("pnmgamma", pnmgamma_main);
TRY("pnminvert", pnminvert_main);
++ TRY("pnmhisteq", pnmhisteq_main);
TRY("pnmhistmap", pnmhistmap_main);
-+ TRY("pnmhistep", pnmhisteq_main);
TRY("pnmnlfilt", pnmnlfilt_main);
- TRY("pnmnoraw", pnmnoraw_main);
+ TRY("pnmtoplainpnm", pnmtoplainpnm_main);
+ TRY("pnmnoraw", pnmtoplainpnm_main);
+ TRY("pnmpad", pnmpad_main);
TRY("pnmpaste", pnmpaste_main);
TRY("pnmrotate", pnmrotate_main);
diff -urN /usr/ports/graphics/netpbm/patches/patch-ag graphics/netpbm/patches/patch-ag
--- /usr/ports/graphics/netpbm/patches/patch-ag Mon Nov 1 10:14:34 1999
+++ graphics/netpbm/patches/patch-ag Thu Jan 1 09:00:00 1970
@@ -1,143 +0,0 @@
---- Pbmplus.tmpl.orig Sat Aug 19 13:57:43 1995
-+++ Pbmplus.tmpl Sun Oct 17 18:41:14 1999
-@@ -13,11 +13,6 @@
- * purpose. It is provided "as is" without express or implied warranty.
- */
-
--/* Set where to install PbmPLus */
-- BINDIR = /usr/X11R6/pbmplus
-- MANDIR = /usr/X11R6/man
-- MANSUFFIX = 1p
--
- /* CONFIGURE: PBMPLUS's support for TIFF files depends on the library from
- * Sam Leffler's TIFF Software package - see the OTHER.SYSTEMS file for a
- * full description and access information. To configure PBMPLUS to use the
-@@ -48,10 +43,10 @@
- #define InstallManuals YES
- #endif
- #ifndef InstallLibraries
--#define InstallLibraries NO
-+#define InstallLibraries YES
- #endif
- #ifndef InstallIncludes
--#define InstallIncludes NO
-+#define InstallIncludes YES
- #endif
-
- /* CONFIGURE: Normally the Imakefiles build and install separate binaries for
-@@ -68,7 +63,7 @@
- * until you do the install.
- */
- #ifndef InstallMerged
--#define InstallMerged NO
-+#define InstallMerged YES
- #endif
-
-
-@@ -80,7 +75,7 @@
- #define PbmplusBinDir $(BINDIR)
- #endif
- #ifndef PbmplusManDir
--#define PbmplusManDir $(MANDIR)
-+#define PbmplusManDir $(MANPATH)
- #endif
- #ifndef PbmplusLibDir
- #define PbmplusLibDir $(USRLIBDIR)
-@@ -105,7 +100,10 @@
- #define PnmDir TOPDIR/pnm
- #endif
- #ifndef TiffDir
--#define TiffDir TOPDIR/libtiff
-+#define TiffDir %%LOCALBASE%%/lib
-+#endif
-+#ifndef TiffIncDir
-+#define TiffIncDir %%LOCALBASE%%/include
- #endif
-
- /* Libraries: */
-@@ -122,7 +120,11 @@
- #define LibPnm $(PNMDIR)/libpnm.a
- #endif
- #ifndef LibTiff
--#define LibTiff $(TIFFDIR)/libtiff.a
-+#if UseElfFormat
-+#define LibTiff -L$(TIFFDIR) -ltiff -ljpeg -lz
-+#else
-+#define LibTiff -L$(TIFFDIR) -ltiff
-+#endif
- #endif
-
- /* Dependency libraries: */
-@@ -139,7 +141,7 @@
- #define DepLibPnm LibPnm
- #endif
- #ifndef DepLibTiff
--#define DepLibTiff LibTiff
-+#define DepLibTiff $(TIFFDIR)/libtiff.a
- #endif
-
- PBMPLUSDIR = PbmplusDir
-@@ -153,6 +155,7 @@
- PPMDIR = PpmDir
- PNMDIR = PnmDir
- TIFFDIR = TiffDir
-+ TIFFINCDIR = TiffIncDir
-
- LIBPBM = LibPbm
- LIBPGM = LibPgm
-@@ -171,8 +174,8 @@
- #define InstallPbmplusPrograms(list,dest,flags) @@\
- install:: list @@\
- MakeDir($(DESTDIR)dest) @@\
-- stamp-date @@\
-- @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
-+ TOPDIR/stamp-date @@\
-+ @case '${MFLAGS}' in *[i]*) set +e;; esac; @@\
- for i in list; do \ @@\
- (set -x; cd $(DESTDIR)dest; $(RM) $$i; \ @@\
- $(LN) $(MERGE) $$i); \ @@\
-@@ -187,14 +190,14 @@
- #endif /* NormalPbmplusProgramTarget */
-
- #ifndef NormalPbmplusMathProgramTarget
--#define NormalPbmplusMathProgramTarget(program) \ @@\
-+#define NormalPbmplusMathProgramTarget(program) @@\
- NormalPbmplusProgramTarget(program)
- #endif /* NormalPbmplusMathProgramTarget */
-
- #else
-
- #ifndef NormalPbmplusProgramTarget
--#define NormalPbmplusProgramTarget(program) \ @@\
-+#define NormalPbmplusProgramTarget(program) @@\
- NormalProgramTarget(program,program.o,$(CURRENTDEPLIBS),$(CURRENTLIBS),)
- #endif /* NormalPbmplusProgramTarget */
-
-@@ -207,7 +210,7 @@
- #define InstallPbmplusPrograms(list,dest,flags) @@\
- install:: list @@\
- MakeDir($(DESTDIR)dest) @@\
-- @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
-+ @case '${MFLAGS}' in *[i]*) set +e;; esac; @@\
- for i in list; do \ @@\
- (set -x; $(RM) $(DESTDIR)dest/$$i; \ @@\
- $(INSTALL) -c flags $$i $(DESTDIR)dest); \ @@\
-@@ -215,3 +218,18 @@
- #endif /* InstallPbmplusPrograms */
-
- #endif /* InstallMerged */
-+
-+#ifndef InstallMultipleManSuff
-+#define InstallMultipleManSuff(list,dest,suff) @@\
-+install.man:: list @@\
-+ MakeDir($(DESTDIR)dest) @@\
-+ @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
-+ for i in list; do \ @@\
-+ (set -x; \ @@\
-+ MNAME=`echo $$i | cut -f1 -d.`; \ @@\
-+ $(RM) $(DESTDIR)dest/$${MNAME}*; \ @@\
-+ $(INSTALL) -c $(INSTMANFLAGS) $$i \ @@\
-+ $(DESTDIR)dest/$${MNAME}.suff; \ @@\
-+ $(COMPRESSMANCMD) $(DESTDIR)dest/$${MNAME}.suff); \ @@\
-+ done
-+#endif
diff -urN /usr/ports/graphics/netpbm/patches/patch-ah graphics/netpbm/patches/patch-ah
--- /usr/ports/graphics/netpbm/patches/patch-ah Thu Feb 12 18:58:35 1998
+++ graphics/netpbm/patches/patch-ah Sat Apr 1 12:00:00 2000
@@ -1,10 +1,10 @@
---- pgm/pgmmerge.c.orig Fri Jan 28 19:17:38 1994
-+++ pgm/pgmmerge.c Thu Feb 12 15:35:45 1998
-@@ -34,6 +34,7 @@
+--- pgm/pgmmerge.c.orig Fri Mar 24 06:41:25 2000
++++ pgm/pgmmerge.c Sat Apr 1 12:00:00 2000
+@@ -38,6 +38,7 @@
#define TRY(s,m) { if ( strcmp( cp, s ) == 0 ) exit( m( argc, argv ) ); }
+ TRY("asciitopgm", asciitopgm_main);
+ TRY("sbigtopgm", sbigtopgm_main);
TRY("bioradtopgm", bioradtopgm_main);
TRY("fstopgm", fstopgm_main);
- TRY("hipstopgm", hipstopgm_main);
diff -urN /usr/ports/graphics/netpbm/patches/patch-aj graphics/netpbm/patches/patch-aj
--- /usr/ports/graphics/netpbm/patches/patch-aj Thu Jan 7 20:12:30 1999
+++ graphics/netpbm/patches/patch-aj Sat Apr 1 12:00:00 2000
@@ -1,36 +1,44 @@
---- pbmplus.h.orig Tue Mar 1 18:46:36 1994
-+++ pbmplus.h Thu Jan 7 19:23:15 1999
-@@ -20,6 +20,9 @@
- #include <perror.h>
+--- pbmplus.h.orig Fri Mar 24 09:08:33 2000
++++ pbmplus.h Sat Apr 1 10:32:36 2000
+@@ -24,6 +24,9 @@
#include <errno.h>
#endif
+ #endif
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
+#include <sys/param.h>
+#endif
- #if defined(USG) || defined(SVR4) || defined(VMS)
+ #if defined(USG) || defined(SVR4) || defined(VMS) || defined(__SVR4)
#define SYSV
-@@ -30,7 +33,9 @@
+@@ -34,7 +37,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
-+#ifndef BSD
-+#define BSD 1
-+#endif
++/* #define BSD */
/* #define SYSV */
/* #define MSDOS */
/* #define AMIGA */
-@@ -119,10 +124,12 @@
+@@ -46,7 +49,7 @@
+ ** hex and decimal forms to specify colors (see ppm/pgmtoppm.1 for details).
+ */
+ #ifndef RGB_DB
+-#define RGB_DB "/usr/lib/X11/rgb"
++#define RGB_DB "%%X11BASE%%/lib/X11/rgb"
+ /*#define RGB_DB "/usr/openwin/lib/rgb.txt"*/
+ #ifdef VMS
+ #define RGB_DB "PBMplus_Dir:RGB.TXT"
+@@ -117,11 +120,13 @@
#ifndef VMS
#include <unistd.h>
#endif
+#if !(defined(BSD) && (BSD >= 199306))
extern int atoi();
extern void exit();
+ #ifndef __osf__
extern long time();
extern int write();
+#endif
#endif
+ #endif
- /* CONFIGURE: On most BSD systems, malloc() gets declared in stdlib.h, on
diff -urN /usr/ports/graphics/netpbm/patches/patch-ak graphics/netpbm/patches/patch-ak
--- /usr/ports/graphics/netpbm/patches/patch-ak Tue Jun 1 13:04:16 1999
+++ graphics/netpbm/patches/patch-ak Sat Apr 1 12:00:00 2000
@@ -1,14 +1,6 @@
---- ppm/libppm4.c.orig Mon Oct 4 18:12:13 1993
-+++ ppm/libppm4.c Thu Nov 5 16:17:48 1998
-@@ -217,6 +217,7 @@
- #endif /* A_RGBENV */
- canonstr( colorname );
- while ( fgets( buf1, sizeof(buf1), f ) != NULL )
-+ if (buf1[0] != '!')
- {
- if ( sscanf( buf1, "%ld %ld %ld %[^\n]", &r, &g, &b, buf2 ) != 4 )
- {
-@@ -298,6 +299,7 @@
+--- ppm/libppm4.c.orig Fri Mar 24 14:47:01 2000
++++ ppm/libppm4.c Sat Apr 1 12:00:00 2000
+@@ -307,6 +307,7 @@
#endif /* A_RGBENV */
best_diff = 32767;
while ( fgets( buf, sizeof(buf), f ) != NULL )
diff -urN /usr/ports/graphics/netpbm/patches/patch-am graphics/netpbm/patches/patch-am
--- /usr/ports/graphics/netpbm/patches/patch-am Mon Nov 1 10:14:36 1999
+++ graphics/netpbm/patches/patch-am Thu Jan 1 09:00:00 1970
@@ -1,38 +0,0 @@
---- pnm/Imakefile.orig Sun Aug 13 13:31:14 1995
-+++ pnm/Imakefile Sat Oct 16 03:08:07 1999
-@@ -20,7 +20,7 @@
- #if BuildLibTiff
- CURRENTLIBS = $(LIBTIFF) $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM)
- CURRENTDEPLIBS = $(DEPLIBTIFF) $(DEPLIBPNM) $(DEPLIBPPM) $(DEPLIBPGM) $(DEPLIBPBM)
-- INCLUDES = -I.. -I$(PBMDIR) -I$(PGMDIR) -I$(PPMDIR) -I$(TIFFDIR)
-+ INCLUDES = -I.. -I$(PBMDIR) -I$(PGMDIR) -I$(PPMDIR) -I$(TIFFINCDIR)
- DEFINES = -DLIBTIFF
- MERGE = pnmmerge
- TIFFMAN1 = tifftopnm.1 pnmtotiff.1
-@@ -44,9 +44,10 @@
- pnmflip.1 pnmhisteq.1 pnmhistmap.1 pnminvert.1 \
- pnmnlfilt.1 pnmnoraw.1 pnmpad.1 pnmpaste.1 pnmscale.1 \
- pnmsmooth.1 pnmtile.1 pnmtoddif.1 pnmtofits.1 pnmtops.1 \
-- pnmtorast.1 pnmtosgi.1 pnmtosir.1 pnmtoxwd.1 rasttopnm.1 \
-- sgitopnm.1 sirtopnm.1 xwdtopnm.1 zeisstopnm.1 pnmgamma.1 \
-- pnmrotate.1 pnmshear.1 anytopnm.1 pnmindex.1 pnmmargin.1 \
-+ pnmtorast.1 pnmtosgi.1 pnmtosir.1 pnmtoxwd.1 pstopnm.1 \
-+ rasttopnm.1 sgitopnm.1 sirtopnm.1 xwdtopnm.1 zeisstopnm.1 \
-+ pnmgamma.1 pnmrotate.1 pnmshear.1 anytopnm.1 pnmindex.1 \
-+ pnmmargin.1 \
- $(TIFFMAN1)
- MAN3 = libpnm.3
- MAN5 = pnm.5
-@@ -164,9 +165,9 @@
- #endif
-
- #if InstallManuals
--InstallMultipleMan($(MAN1),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man1)
--InstallMultipleMan($(MAN3),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man3)
--InstallMultipleMan($(MAN5),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man5)
-+InstallMultipleManSuff($(MAN1),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man1,1)
-+InstallMultipleManSuff($(MAN3),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man3,3)
-+InstallMultipleManSuff($(MAN5),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man5,5)
- #endif
-
- #if InstallLibraries
diff -urN /usr/ports/graphics/netpbm/patches/patch-an graphics/netpbm/patches/patch-an
--- /usr/ports/graphics/netpbm/patches/patch-an Mon Nov 1 10:14:36 1999
+++ graphics/netpbm/patches/patch-an Thu Jan 1 09:00:00 1970
@@ -1,15 +0,0 @@
---- pbm/Imakefile.orig Sat Aug 19 13:20:37 1995
-+++ pbm/Imakefile Sat Oct 16 02:29:50 1999
-@@ -142,9 +142,9 @@
- #endif
-
- #if InstallManuals
--InstallMultipleMan($(MAN1),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man1)
--InstallMultipleMan($(MAN3),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man3)
--InstallMultipleMan($(MAN5),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man5)
-+InstallMultipleManSuff($(MAN1),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man1,1)
-+InstallMultipleManSuff($(MAN3),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man3,3)
-+InstallMultipleManSuff($(MAN5),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man5,5)
- #endif
-
- #if InstallLibraries
diff -urN /usr/ports/graphics/netpbm/patches/patch-ao graphics/netpbm/patches/patch-ao
--- /usr/ports/graphics/netpbm/patches/patch-ao Mon Nov 1 10:14:36 1999
+++ graphics/netpbm/patches/patch-ao Thu Jan 1 09:00:00 1970
@@ -1,15 +0,0 @@
---- pgm/Imakefile.orig Sun Aug 13 14:25:01 1995
-+++ pgm/Imakefile Sat Oct 16 02:31:11 1999
-@@ -99,9 +99,9 @@
- #endif
-
- #if InstallManuals
--InstallMultipleMan($(MAN1),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man1)
--InstallMultipleMan($(MAN3),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man3)
--InstallMultipleMan($(MAN5),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man5)
-+InstallMultipleManSuff($(MAN1),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man1,1)
-+InstallMultipleManSuff($(MAN3),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man3,3)
-+InstallMultipleManSuff($(MAN5),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man5,5)
- #endif
-
- #if InstallLibraries
diff -urN /usr/ports/graphics/netpbm/patches/patch-aq graphics/netpbm/patches/patch-aq
--- /usr/ports/graphics/netpbm/patches/patch-aq Mon Nov 1 10:14:37 1999
+++ graphics/netpbm/patches/patch-aq Thu Jan 1 09:00:00 1970
@@ -1,21 +0,0 @@
---- ppm/Imakefile.orig Sun Aug 13 14:25:18 1995
-+++ ppm/Imakefile Sat Oct 16 06:36:23 1999
-@@ -184,9 +184,9 @@
- #endif
-
- #if InstallManuals
--InstallMultipleMan($(MAN1),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man1)
--InstallMultipleMan($(MAN3),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man3)
--InstallMultipleMan($(MAN5),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man5)
-+InstallMultipleManSuff($(MAN1),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man1,1)
-+InstallMultipleManSuff($(MAN3),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man3,3)
-+InstallMultipleManSuff($(MAN5),$(PBMPLUSDIR)$(PBMPLUSMANDIR)/man5,5)
- #endif
-
- #if InstallLibraries
-@@ -195,4 +195,5 @@
-
- #if InstallIncludes
- InstallMultipleFlags(ppm.h,$(PBMPLUSDIR)$(PBMPLUSINCDIR),$(INSTINCFLAGS))
-+InstallMultipleFlags(ppmcmap.h,$(PBMPLUSDIR)$(PBMPLUSINCDIR),$(INSTINCFLAGS))
- #endif
diff -urN /usr/ports/graphics/netpbm/patches/patch-ar graphics/netpbm/patches/patch-ar
--- /usr/ports/graphics/netpbm/patches/patch-ar Mon Nov 1 10:14:37 1999
+++ graphics/netpbm/patches/patch-ar Sat Apr 1 12:00:00 2000
@@ -1,11 +1,11 @@
---- ppm/bmp.h.orig Mon Oct 4 18:12:07 1993
-+++ ppm/bmp.h Sat Oct 16 02:53:18 1999
-@@ -108,6 +108,8 @@
+--- ppm/bmp.h.orig Thu Mar 23 16:34:34 2000
++++ ppm/bmp.h Sat Apr 1 12:00:00 2000
+@@ -109,6 +109,8 @@
return 0;
}
-+ if( bitcount == 24 ) lenrgb=0;
++ if (bitcount == 24) lenrgb=0;
+
- return (1 << bitcount) * lenrgb;
- }
+ if (cmapsize < 0)
+ return (1 << bitcount) * lenrgb;
diff -urN /usr/ports/graphics/netpbm/patches/patch-as graphics/netpbm/patches/patch-as
--- /usr/ports/graphics/netpbm/patches/patch-as Mon Nov 1 10:14:38 1999
+++ graphics/netpbm/patches/patch-as Sat Apr 1 12:00:00 2000
@@ -1,15 +1,15 @@
---- ppm/bmptoppm.c.orig Mon Oct 4 18:12:07 1993
-+++ ppm/bmptoppm.c Sat Oct 16 02:53:18 1999
-@@ -348,6 +348,8 @@
+--- ppm/bmptoppm.c.orig Thu Mar 23 16:37:40 2000
++++ ppm/bmptoppm.c Sat Apr 1 12:00:00 2000
+@@ -304,6 +304,8 @@
- long ncolors = (1 << cBitCount);
+ long ncolors = cmapsize < 0 ? (1 << cBitCount) : cmapsize;
+ if (cBitCount == 24) return 0;
+
for (i = 0; i < ncolors; i++)
{
B[i] = (pixval) GetByte(fp);
-@@ -385,29 +387,45 @@
+@@ -336,29 +338,45 @@
int rc;
unsigned x;
@@ -34,7 +34,7 @@
+ PPM_ASSIGN(*row, r, g, b);
+ }
+ }
-+ else
++ else
+ {
+ if ((b = pm_bitinit(fp, "r")) == (BITSTREAM) 0)
{
diff -urN /usr/ports/graphics/netpbm/patches/patch-au graphics/netpbm/patches/patch-au
--- /usr/ports/graphics/netpbm/patches/patch-au Mon Nov 1 10:14:38 1999
+++ graphics/netpbm/patches/patch-au Sat Apr 1 12:00:00 2000
@@ -1,5 +1,5 @@
---- ppm/ppmtobmp.c.orig Mon Oct 4 18:12:36 1993
-+++ ppm/ppmtobmp.c Sat Oct 16 02:53:18 1999
+--- ppm/ppmtobmp.c.orig Thu Mar 23 16:34:34 2000
++++ ppm/ppmtobmp.c Sun Apr 1 12:00:00 2000
@@ -75,7 +75,7 @@
unsigned short cBitCount, pixel **pixels, colorhash_table cht));
static int colorstobpp ARGS((int colors));
@@ -7,103 +7,87 @@
- int colors, colorhash_table cht, pixval *R, pixval *G, pixval *B));
+ int bpp, int colors, colorhash_table cht, pixval *R, pixval *G, pixval *B));
static void
- PutByte(fp, v)
- FILE *fp;
-@@ -253,19 +253,23 @@
+ PutByte(FILE *fp, char v)
+ {
+@@ -244,16 +244,20 @@
int i;
long ncolors;
- for (i = 0; i < colors; i++)
-- {
++ if (bpp != 24)
+ {
- nbyte += BMPwritergb(fp,class,R[i],G[i],B[i]);
- }
--
+
- ncolors = (1 << bpp);
-+ if (bpp != 24)
-+ {
++ for (i = 0; i < colors; i++)
++ {
++ nbyte += BMPwritergb(fp,class,R[i],G[i],B[i]);
++ }
++
++ ncolors = (1 << bpp);
- for (; i < ncolors; i++)
- {
- nbyte += BMPwritergb(fp,class,0,0,0);
-- }
-+ for (i = 0; i < colors; i++)
-+ {
-+ nbyte += BMPwritergb(fp,class,R[i],G[i],B[i]);
-+ }
-+
-+ ncolors = (1 << bpp);
-+
-+ for (; i < ncolors; i++)
-+ {
-+ nbyte += BMPwritergb(fp,class,0,0,0);
-+ }
-+ }
-
-- return nbyte;
-+ return nbyte;
- }
++ for (; i < ncolors; i++)
++ {
++ nbyte += BMPwritergb(fp,class,0,0,0);
++ }
+ }
- /*
-@@ -284,26 +288,38 @@
+ return nbyte;
+@@ -271,26 +275,38 @@
int rc;
unsigned x;
- if ((b = pm_bitinit(fp, "w")) == (BITSTREAM) 0)
-- {
++ if (bpp != 24)
+ {
- return -1;
- }
--
++ if ((b = pm_bitinit(fp, "w")) == (BITSTREAM) 0)
++ {
++ return -1;
++ }
+
- for (x = 0; x < cx; x++, row++)
- {
- if ((rc = pm_bitwrite(b, bpp, ppm_lookupcolor(cht, row))) == -1)
-- {
-- return -1;
-- }
-- nbyte += rc;
-- }
++ for (x = 0; x < cx; x++, row++)
++ {
++ if ((rc = pm_bitwrite(b, bpp, ppm_lookupcolor(cht, row))) == -1)
++ {
++ return -1;
++ }
++ nbyte += rc;
++ }
++
++ if ((rc = pm_bitfini(b)) == -1)
+ {
+ return -1;
+ }
+ nbyte += rc;
+ }
-
- if ((rc = pm_bitfini(b)) == -1)
-- {
++ else
+ {
- return -1;
-- }
++ for (x = 0; x < cx; x++, row++)
++ {
++ PutByte(fp, PPM_GETB(*row));
++ PutByte(fp, PPM_GETG(*row));
++ PutByte(fp, PPM_GETR(*row));
++ nbyte += 3;
++ }
+ }
- nbyte += rc;
-
-+ if (bpp != 24)
-+ {
-+ if ((b = pm_bitinit(fp, "w")) == (BITSTREAM) 0)
-+ {
-+ return -1;
-+ }
-+
-+ for (x = 0; x < cx; x++, row++)
-+ {
-+ if ((rc = pm_bitwrite(b, bpp, ppm_lookupcolor(cht, row))) == -1)
-+ {
-+ return -1;
-+ }
-+ nbyte += rc;
-+ }
-+
-+ if ((rc = pm_bitfini(b)) == -1)
-+ {
-+ return -1;
-+ }
-+ nbyte += rc;
-+ }
-+ else
-+ {
-+ for (x = 0; x < cx; x++, row++)
-+ {
-+ PutByte(fp, PPM_GETB(*row));
-+ PutByte(fp, PPM_GETG(*row));
-+ PutByte(fp, PPM_GETR(*row));
-+ nbyte += 3;
-+ }
-+ }
/*
* Make sure we write a multiple of 4 bytes.
*/
-@@ -394,48 +410,21 @@
+@@ -376,48 +392,21 @@
* arrays are undefined.
*/
static void
@@ -114,7 +98,7 @@
int x;
int y;
pixel **pixels;
-+ int bpp; /* bits per pixel */
++ int bpp; /* bits per pixel */
int colors; /* number of valid entries in R,G,B */
colorhash_table cht;
pixval *R;
@@ -154,7 +138,7 @@
nbyte += BMPwritefileheader(fp, class, bpp, x, y);
nbyte += BMPwriteinfoheader(fp, class, bpp, x, y);
nbyte += BMPwritergbtable(fp, class, bpp, colors, R, G, B);
-@@ -517,13 +506,15 @@
+@@ -499,13 +488,15 @@
char **argv;
{
FILE *ifp = stdin;
@@ -166,12 +150,12 @@
int rows;
int cols;
int colors;
-+ int maxcolors = MAXCOLORS;
-+ int bpp = 0;
++ int maxcolors = MAXCOLORS;
++ int bpp = 0;
int i;
pixval maxval;
colorhist_vector chv;
-@@ -545,6 +536,14 @@
+@@ -527,6 +518,14 @@
class = C_WIN;
else if (pm_keymatch(argv[argn], "-os2", 2))
class = C_OS2;
@@ -186,19 +170,13 @@
else
pm_usage(usage);
++argn;
-@@ -585,44 +584,90 @@
+@@ -567,44 +566,90 @@
#endif
/* Figure out the colormap. */
- pm_message("computing colormap...");
- chv = ppm_computecolorhist(pixels, cols, rows, MAXCOLORS, &colors);
-+ chv = (colorhist_vector) 0;
-+ if(bpp != 24)
-+ {
-+ pm_message("computing colormap...");
-+ chv = ppm_computecolorhist(pixels, cols, rows, maxcolors, &colors);
-+ }
- if (chv == (colorhist_vector) 0)
+- if (chv == (colorhist_vector) 0)
- pm_error("too many colors - try doing a 'ppmquant %d'"
- , MAXCOLORS);
- pm_message("%d colors found", colors);
@@ -208,100 +186,99 @@
- * colormap.
- */
- if (maxval > 255)
-- {
++ chv = (colorhist_vector) 0;
++ if (bpp != 24)
+ {
- pm_message("maxval is not 255 - automatically rescaling colors");
-- }
++ pm_message("computing colormap...");
++ chv = ppm_computecolorhist(pixels, cols, rows, maxcolors, &colors);
+ }
- for (i = 0; i < colors; ++i)
-- {
++ if (chv == (colorhist_vector) 0)
+ {
- if (maxval == 255)
-- {
++ if (bpp == 0)
+ {
- Red[i] = PPM_GETR(chv[i].color);
- Green[i] = PPM_GETG(chv[i].color);
- Blue[i] = PPM_GETB(chv[i].color);
-- }
++ pm_message("over 256 colors found");
++ bpp = 24;
+ }
- else
-- {
-- Red[i] = (pixval) PPM_GETR(chv[i].color) * 255 / maxval;
-- Green[i] = (pixval) PPM_GETG(chv[i].color) * 255 / maxval;
-- Blue[i] = (pixval) PPM_GETB(chv[i].color) * 255 / maxval;
-- }
-- }
-+ {
-+ if (bpp == 0)
-+ {
-+ pm_message("over 256 colors found");
-+ bpp = 24;
-+ }
-+ else if (bpp != 24)
-+ pm_error("too many colors - try doing a 'ppmquant %d'"
-+ , maxcolors);
-+ }
-+ else
-+ {
-+ pm_message("%d colors found", colors);
++ else if (bpp != 24)
++ pm_error("too many colors - try doing a 'ppmquant %d'"
++ , maxcolors);
++ }
++ else
++ {
++ pm_message("%d colors found", colors);
+
-+ /*
-+ * I have found empirically at least one BMP-displaying program
-+ * that can't deal with (for instance) using 3 bits per pixel.
-+ * I have seen no programs that can deal with using 3 bits per
-+ * pixel. I have seen programs which can deal with 1, 4, and
-+ * 8 bits per pixel.
-+ *
-+ * Based on this, I adjust actual the number of bits per pixel
-+ * as follows. If anyone knows better, PLEASE tell me!
-+ */
++ /*
++ * I have found empirically at least one BMP-displaying program
++ * that can't deal with (for instance) using 3 bits per pixel.
++ * I have seen no programs that can deal with using 3 bits per
++ * pixel. I have seen programs which can deal with 1, 4, and
++ * 8 bits per pixel.
++ *
++ * Based on this, I adjust actual the number of bits per pixel
++ * as follows. If anyone knows better, PLEASE tell me!
++ */
+
-+ if (!bpp)
-+ {
-+ bpp = colorstobpp(colors);
++ if (!bpp)
++ {
++ bpp = colorstobpp(colors);
+
-+ switch(bpp)
-+ {
-+ case 2:
-+ case 3:
-+ bpp = 4;
-+ break;
-+ case 5:
-+ case 6:
-+ case 7:
-+ bpp = 8;
-+ break;
-+ }
-+ }
++ switch(bpp)
++ {
++ case 2:
++ case 3:
++ bpp = 4;
++ break;
++ case 5:
++ case 6:
++ case 7:
++ bpp = 8;
++ break;
++ }
++ }
+
-+ /*
-+ * Now turn the ppm colormap into the appropriate GIF
-+ * colormap.
-+ */
-+ if (maxval > 255)
-+ {
-+ pm_message("maxval is not 255 - automatically rescaling colors");
-+ }
-+ for (i = 0; i < colors; ++i)
-+ {
-+ if (maxval == 255)
-+ {
-+ Red[i] = PPM_GETR(chv[i].color);
-+ Green[i] = PPM_GETG(chv[i].color);
-+ Blue[i] = PPM_GETB(chv[i].color);
-+ }
-+ else
-+ {
-+ Red[i] = (pixval) PPM_GETR(chv[i].color) * 255 / maxval;
-+ Green[i] = (pixval) PPM_GETG(chv[i].color) * 255 / maxval;
-+ Blue[i] = (pixval) PPM_GETB(chv[i].color) * 255 / maxval;
-+ }
-+ }
++ /*
++ * Now turn the ppm colormap into the appropriate GIF
++ * colormap.
++ */
++ if (maxval > 255)
++ {
++ pm_message("maxval is not 255 - automatically rescaling colors");
++ }
++ for (i = 0; i < colors; ++i)
+ {
+- Red[i] = (pixval) PPM_GETR(chv[i].color) * 255 / maxval;
+- Green[i] = (pixval) PPM_GETG(chv[i].color) * 255 / maxval;
+- Blue[i] = (pixval) PPM_GETB(chv[i].color) * 255 / maxval;
++ if (maxval == 255)
++ {
++ Red[i] = PPM_GETR(chv[i].color);
++ Green[i] = PPM_GETG(chv[i].color);
++ Blue[i] = PPM_GETB(chv[i].color);
++ }
++ else
++ {
++ Red[i] = (pixval) PPM_GETR(chv[i].color) * 255 / maxval;
++ Green[i] = (pixval) PPM_GETG(chv[i].color) * 255 / maxval;
++ Blue[i] = (pixval) PPM_GETB(chv[i].color) * 255 / maxval;
++ }
+ }
+
-+ /* And make a hash table for fast lookup. */
-+ cht = ppm_colorhisttocolorhash(chv, colors);
-+ ppm_freecolorhist(chv);
-+ }
++ /* And make a hash table for fast lookup. */
++ cht = ppm_colorhisttocolorhash(chv, colors);
++ ppm_freecolorhist(chv);
+ }
- /* And make a hash table for fast lookup. */
- cht = ppm_colorhisttocolorhash(chv, colors);
- ppm_freecolorhist(chv);
-+ pm_message("Using %d bits per pixel", bpp);
++ pm_message("Using %d bits per pixel", bpp);
/* All set, let's do it. */
BMPEncode(stdout, class
diff -urN /usr/ports/graphics/netpbm/patches/patch-ax graphics/netpbm/patches/patch-ax
--- /usr/ports/graphics/netpbm/patches/patch-ax Tue Jan 18 10:13:01 2000
+++ graphics/netpbm/patches/patch-ax Thu Jan 1 09:00:00 1970
@@ -1,8 +0,0 @@
---- version.h.orig Tue Mar 1 18:54:45 1994
-+++ version.h Sat Oct 16 07:26:06 1999
-@@ -1,4 +1,4 @@
- /* version.h - define the current version of the package
- */
-
--#define PBMPLUS_VERSION "Netpbm 1 March 1994"
-+#define PBMPLUS_VERSION "Netpbm 8.0 (23 September 1999)"
diff -urN /usr/ports/graphics/netpbm/patches/patch-ay graphics/netpbm/patches/patch-ay
--- /usr/ports/graphics/netpbm/patches/patch-ay Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/patches/patch-ay Sat Apr 1 12:00:00 2000
@@ -0,0 +1,21 @@
+--- pnm/pnmtotiffcmyk.c.orig Fri Mar 24 09:17:16 2000
++++ pnm/pnmtotiffcmyk.c Sat Apr 1 12:00:00 2000
+@@ -57,7 +57,7 @@
+
+ #include "pnm.h"
+ #include <math.h>
+-#ifdef __osf__
++#if defined(__osf__) || defined(__FreeBSD__)
+ #include <float.h>
+ #endif
+ #include <limits.h>
+@@ -69,7 +69,9 @@
+ #define VERSION 1.01
+
+ /* beware - these evaluate more than once */
++#undef MAX
+ #define MAX(x, y) ( ( x ) > ( y ) ? ( x ) : ( y ) )
++#undef MIN
+ #define MIN(x, y) ( ( x ) < ( y ) ? ( x ) : ( y ) )
+
+ /* only support 8 bit values */
diff -urN /usr/ports/graphics/netpbm/patches/patch-az graphics/netpbm/patches/patch-az
--- /usr/ports/graphics/netpbm/patches/patch-az Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/patches/patch-az Sat Apr 1 12:00:00 2000
@@ -0,0 +1,10 @@
+--- ppm/ppmmerge.c.orig Fri Mar 24 06:41:52 2000
++++ ppm/ppmmerge.c Sat Apr 1 12:00:00 2000
+@@ -38,7 +38,6 @@
+
+ #define TRY(s,m) { if ( strcmp( cp, s ) == 0 ) exit( m( argc, argv ) ); }
+
+- TRY("ppmtojpeg", ppmtojpeg_main);
+ TRY("ppmcie", ppmcie_main);
+ TRY("ppmlabel", ppmlabel_main);
+ TRY("bmptoppm", bmptoppm_main);
diff -urN /usr/ports/graphics/netpbm/patches/patch-ba graphics/netpbm/patches/patch-ba
--- /usr/ports/graphics/netpbm/patches/patch-ba Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/patches/patch-ba Sat Apr 1 12:00:00 2000
@@ -0,0 +1,28 @@
+--- Makefile.orig Sat Mar 25 02:47:02 2000
++++ Makefile Sat Apr 1 12:00:00 2000
+@@ -56,7 +56,10 @@
+ ./stamp-date
+
+ .PHONY: install
+-install: install.bin install.lib install.man
++install: install.bin install.lib install.man install.hdr
++
++.PHONY: install-merge
++install-merge: install.merge install.lib install.man install.hdr
+
+ .PHONY: merge
+ merge:
+@@ -97,6 +100,13 @@
+ -mkdir -p $(INSTALLMANUALS5)
+ for i in $(SUBDIRS) ; do \
+ ( echo install.man.$$i ; cd $$i ; $(MAKE) install.man ); \
++ done
++
++.PHONY: install.hdr
++install.hdr:
++ -mkdir -p $(INSTALLHDRS)
++ for i in $(SUBDIRS) ; do \
++ ( echo install.hdr.$$i ; cd $$i ; $(MAKE) install.hdr ); \
+ done
+
+ .PHONY: clean
diff -urN /usr/ports/graphics/netpbm/patches/patch-bb graphics/netpbm/patches/patch-bb
--- /usr/ports/graphics/netpbm/patches/patch-bb Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/patches/patch-bb Sat Apr 1 12:00:00 2000
@@ -0,0 +1,69 @@
+--- Makefile.common.orig Sat Mar 25 02:46:12 2000
++++ Makefile.common Sat Apr 1 12:00:00 2000
+@@ -51,26 +51,22 @@
+ .PHONY: install.merge
+ install.merge: $(MERGENAME) $(NOMERGEBINARIES) install.script
+ cd $(INSTALLBINARIES) ; rm -f $(BINARIES)
+- cp $< $(INSTALLBINARIES)
++ ${BSD_INSTALL_PROGRAM} $(MERGENAME) $(INSTALLBINARIES)
+ cd $(INSTALLBINARIES) ; \
+ for i in $(BINARIES) ; do ln $(MERGENAME) $$i ; done
+- rm -f $(INSTALLBINARIES)/$(MERGENAME)
+ cd $(INSTALLBINARIES) ; rm -f $(NOMERGEBINARIES)
+- cp $(NOMERGEBINARIES) $(INSTALLBINARIES)
+- cd $(INSTALLBINARIES) ; strip $(NOMERGEBINARIES)
++ ${BSD_INSTALL_PROGRAM} $(NOMERGEBINARIES) $(INSTALLBINARIES)
+
+ .PHONY: install.bin.common
+ install.bin.common: $(BINARIES) install.script
+ cd $(INSTALLBINARIES) ; rm -f $(BINARIES)
+- cp $(BINARIES) $(INSTALLBINARIES)
+- cd $(INSTALLBINARIES) ; strip $(BINARIES)
++ ${BSD_INSTALL_PROGRAM} $(BINARIES) $(INSTALLBINARIES)
+
+ .PHONY: install.script
+ install.script: $(SCRIPTS)
+ ifneq ($(SCRIPTS)x,x)
+ cd $(INSTALLSCRIPTS) ; rm -f $(SCRIPTS)
+- cp $(SCRIPTS) $(INSTALLSCRIPTS)
+- cd $(INSTALLSCRIPTS) ; chmod +x $(SCRIPTS)
++ ${BSD_INSTALL_SCRIPT} $(SCRIPTS) $(INSTALLSCRIPTS)
+ endif
+
+ .PHONY: install.man
+@@ -95,13 +91,12 @@
+ # prefer not to "install" them, but just to access the Netpbm source
+ # directory when you compile your programs.
+ cd $(INSTALLHDRS) ; rm -f $(INTERFACE_HEADERS)
+- cp $(INTERFACE_HEADERS) $(INSTALLHDRS)
++ ${BSD_INSTALL_DATA} $(INTERFACE_HEADERS) $(INSTALLHDRS)
+
+-lib$(LIBROOT).so: lib$(LIBROOT).so.$(MAJ).$(MIN)
+- ln -sf lib$(LIBROOT).so.$(MAJ).$(MIN) $@
+-lib$(LIBROOT).so.$(MAJ).$(MIN): $(LIBOBJECTS)
+- $(LD) $(LDSHLIB) -Wl,-soname,lib$(LIBROOT).so.$(MAJ) -o $@ \
+- $(LIBOBJECTS)
++lib$(LIBROOT).so: lib$(LIBROOT).so.$(MAJ)
++ ln -sf lib$(LIBROOT).so.$(MAJ) $@
++lib$(LIBROOT).so.$(MAJ): lib$(LIBROOT).a $(LIBSOBJECTS)
++ $(LD) $(LDSHLIB) -Wl,-soname,$@ -o $@ $(LIBSOBJECTS)
+
+ lib$(LIBROOT).a: $(LIBOBJECTS)
+ -rm -f $@
+@@ -109,11 +104,11 @@
+ -ranlib $@
+
+ .PHONY: install.lib
+-install.lib: lib$(LIBROOT).so.$(MAJ).$(MIN)
+- cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so.$(MAJ).*
+- cp $< $(INSTALLLIBS)
+- cd $(INSTALLLIBS) ; ln -sf $< lib$(LIBROOT).so
+- cd $(INSTALLLIBS) ; ln -sf $< lib$(LIBROOT).so.$(MAJ)
++install.lib: lib$(LIBROOT).so
++ cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).*
++ ${BSD_INSTALL_DATA} lib$(LIBROOT).a $(INSTALLLIBS)
++ ${BSD_INSTALL_DATA} lib$(LIBROOT).so.$(MAJ) $(INSTALLLIBS)
++ ln -sf lib$(LIBROOT).so.$(MAJ) $(INSTALLLIBS)/lib$(LIBROOT).so
+
+ .PHONY: dep
+ dep Makefile.depend:
diff -urN /usr/ports/graphics/netpbm/patches/patch-bc graphics/netpbm/patches/patch-bc
--- /usr/ports/graphics/netpbm/patches/patch-bc Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/patches/patch-bc Sat Apr 1 12:00:00 2000
@@ -0,0 +1,84 @@
+--- Makefile.config.orig Sat Mar 25 02:39:40 2000
++++ Makefile.config Sat Apr 1 12:00:00 2000
+@@ -30,12 +30,12 @@
+ #CC = cc
+ #CC = gcc
+ #CC = gcc -fpcc-struct-return
+-CC = gcc -pedantic -fpcc-struct-return
++CC ?= gcc -pedantic -fpcc-struct-return
+
+ # The linker
+ #LD = ld
+ #LD = cc
+-LD = gcc
++LD = ${CC}
+
+ # Normally the man pages are installed using "cp". But via this
+ # variable, you can use something else, for example a script that
+@@ -43,11 +43,11 @@
+ # systems which use man pages in the "cat" format.
+
+ #MANCP = $(SRCDIR)/mantocat
+-MANCP = cp
++MANCP = ${BSD_INSTALL_MAN}
+
+ SHELL = /bin/sh
+-MAKE = make
+-INSTALL = install
++MAKE ?= make
++INSTALL ?= install
+ AR= ar
+ RANLIB= ranlib
+
+@@ -55,7 +55,7 @@
+ # C compiler options
+
+ #CFLAGS = -O2 -std1 $(CDEBUG)
+-CFLAGS = -O2 -Wall -Wno-uninitialized $(CDEBUG)
++CFLAGS ?= -O2 -Wall -Wno-uninitialized $(CDEBUG)
+
+ # linker options. Eunice users may want to use -noshare so that
+ # the executables can run standalone.
+@@ -78,8 +78,10 @@
+
+ #TIFFINC_DIR = /usr/local1/DEC/include
+ #TIFFLIB_DIR = /usr/local1/DEC/lib
+-TIFFHDR_DIR = $(SRCDIR)/libtiff
+-TIFFLIB_DIR = $(SRCDIR)/libtiff
++#TIFFHDR_DIR = $(SRCDIR)/libtiff
++#TIFFLIB_DIR = $(SRCDIR)/libtiff
++TIFFINC_DIR = ${LOCALBASE}/include
++TIFFLIB_DIR = ${LOCALBASE}/lib
+
+ # Put the location of your JPEG library here.
+ # If you want to build the jpeg converters or tiff
+@@ -101,16 +103,16 @@
+ #JPEGHDR_DIR = /usr/local1/DEC/include
+ #JPEGLIB_DIR = NONE
+ #JPEGHDR_DIR = NONE
+-JPEGLIB_DIR = /usr/lib/jpeg
+-JPEGHDR_DIR = /usr/include/jpeg
++JPEGLIB_DIR = ${LOCALBASE}/lib
++JPEGHDR_DIR = ${LOCALBASE}/include
+
+
+ #PNGLIB_DIR = /usr/local1/DEC/lib
+ #PNGHDR_DIR = /usr/local1/DEC/include
+ #PNGLIB_DIR = NONE
+ #PNGHDR_DIR = NONE
+-PNGLIB_DIR = /lib
+-PNGHDR_DIR = /usr/include/png
++PNGLIB_DIR = ${LOCALBASE}/lib
++PNGHDR_DIR = ${LOCALBASE}/include
+
+
+ # The following variables are used only by 'make install' (and the
+@@ -121,7 +123,7 @@
+ # you're spreading Netpbm across your system, use "/".
+
+ #INSTALL_PREFIX = /usr/local1/DEC/packages/netpbm
+-INSTALL_PREFIX = /usr/local/netpbm
++INSTALL_PREFIX = ${PREFIX}
+
+ # Specify the directory where you want the executables.
+ # If you need scripts and binaries to be in different directories, you
diff -urN /usr/ports/graphics/netpbm/patches/patch-bd graphics/netpbm/patches/patch-bd
--- /usr/ports/graphics/netpbm/patches/patch-bd Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/patches/patch-bd Sat Apr 1 12:00:00 2000
@@ -0,0 +1,48 @@
+--- pbm/Makefile.orig Fri Mar 24 07:43:30 2000
++++ pbm/Makefile Sat Apr 1 12:00:00 2000
+@@ -13,6 +13,7 @@
+ MIN = 2
+
+ NETPBMLIBS = $(LIBPBM)
++NETPBMLD = -L. -lpbm
+
+ PORTBINARIES = atktopbm brushtopbm cmuwmtopbm g3topbm \
+ icontopbm gemtopbm macptopbm mgrtopbm \
+@@ -34,6 +35,7 @@
+ MERGE_OBJECTS = $(patsubst %,%.o2, $(BINARIES))
+
+ LIBOBJECTS = libpbm1.o libpbm2.o libpbm3.o libpbm4.o libpbm5.o
++LIBSOBJECTS = libpbm1.so libpbm2.so libpbm3.so libpbm4.so libpbm5.so
+
+ MANUALS1 = $(BINARIES)
+ MANUALS3 = libpbm
+@@ -41,7 +43,7 @@
+
+ MERGENAME = pbmmerge
+
+-INTERFACE_HEADERS = pbm.h
++INTERFACE_HEADERS = pbm.h ../pbmplus.h
+
+ .PHONY: all
+ all: $(BINARIES)
+@@ -51,15 +53,18 @@
+
+ # Rules for plain programs.
+ $(PORTBINARIES): %: %.o $(NETPBMLIBS)
+- $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(CDEBUG)
++ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(CDEBUG)
+
+ # Rule for math-dependent programs.
+ $(MATHBINARIES): %: %.o $(NETPBMLIBS)
+- $(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLIBS) $(CDEBUG)
++ $(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLD) $(CDEBUG)
+
+ # Rule for objects.
+ $(OBJECTS) $(LIBOBJECTS): %.o: %.c
+ $(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
++
++$(LIBSOBJECTS): %.so: %.c
++ $(CC) -c -fpic -DPIC $(CFLAGS) $(INCLUDE) -o $@ $<
+
+ $(MERGE_OBJECTS): %.o2: %.c
+ $(CC) -c $(CFLAGS) $(INCLUDE) "-Dmain=$*_main" -o $@ $<
diff -urN /usr/ports/graphics/netpbm/patches/patch-be graphics/netpbm/patches/patch-be
--- /usr/ports/graphics/netpbm/patches/patch-be Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/patches/patch-be Sat Apr 1 12:00:00 2000
@@ -0,0 +1,47 @@
+--- pgm/Makefile.orig Fri Mar 24 07:43:44 2000
++++ pgm/Makefile Sat Apr 1 12:00:00 2000
+@@ -13,6 +13,7 @@
+ INCLUDE = -I$(SRCDIR) $(INCLUDEPBM)
+
+ NETPBMLIBS = $(LIBPGM) $(PBMDIR)/$(LIBPBM)
++NETPBMLD = -L. -lpgm -L$(PBMDIR) -lpbm
+
+ PORTBINARIES = asciitopgm bioradtopgm fstopgm hipstopgm \
+ lispmtopgm pbmtopgm pgmbentley pgmenhance pgmhist \
+@@ -25,6 +26,7 @@
+ MERGE_OBJECTS = $(patsubst %,%.o2, $(BINARIES))
+
+ LIBOBJECTS = libpgm1.o libpgm2.o
++LIBSOBJECTS = libpgm1.so libpgm2.so
+
+ MANUALS1 = $(BINARIES)
+ MANUALS3 = libpgm
+@@ -41,22 +43,25 @@
+
+ # Rules for plain programs.
+ $(PORTBINARIES): %: %.o $(NETPBMLIBS)
+- $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(CDEBUG)
++ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(CDEBUG)
+
+ # Rule for math-dependent programs.
+ $(MATHBINARIES): %: %.o $(NETPBMLIBS)
+- $(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLIBS) $(CDEBUG)
++ $(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLD) $(CDEBUG)
+
+ # Rule for objects.
+ $(OBJECTS) $(LIBOBJECTS): %.o: %.c
+ $(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
+
++$(LIBSOBJECTS): %.so: %.c
++ $(CC) -c -fpic -DPIC $(CFLAGS) $(INCLUDE) -o $@ $<
++
+ $(MERGE_OBJECTS): %.o2: %.c
+ $(CC) -c $(CFLAGS) $(INCLUDE) "-Dmain=$*_main" -o $@ $<
+
+ # And libraries.
+ $(PBMDIR)/$(LIBPBM):
+- cd $(PBMDIR) ; make $(LIBPBM)
++ cd $(PBMDIR) ; $(MAKE) $(LIBPBM)
+
+ .PHONY: install.bin
+ install.bin: install.bin.common
diff -urN /usr/ports/graphics/netpbm/patches/patch-bf graphics/netpbm/patches/patch-bf
--- /usr/ports/graphics/netpbm/patches/patch-bf Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/patches/patch-bf Sat Apr 1 12:00:00 2000
@@ -0,0 +1,78 @@
+--- pnm/Makefile.orig Sat Mar 25 02:27:50 2000
++++ pnm/Makefile Sat Apr 1 12:00:00 2000
+@@ -35,6 +35,8 @@
+
+ NETPBMLIBS = $(LIBPNM) \
+ $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM) $(PPMDIR)/$(LIBPPM)
++NETPBMLD = -L. -lpnm \
++ -L$(PBMDIR) -lpbm -L$(PGMDIR) -lpgm -L$(PPMDIR) -lppm
+
+ ifeq ($(JPEGLIB_DIR),NONE)
+ JPEGLD =
+@@ -87,6 +89,7 @@
+ MERGE_OBJECTS = $(patsubst %,%.o2, $(PORTBINARIES) $(MATHBINARIES))
+
+ LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o
++LIBSOBJECTS = libpnm1.so libpnm2.so libpnm3.so libpnm4.so
+
+ MANUALS1 = $(BINARIES) $(SCRIPTS)
+ MANUALS3 = libpnm
+@@ -102,45 +105,48 @@
+ merge: $(MERGENAME) $(NOMERGEBINARIES)
+
+ tifftopnm pnmtotiff: %: %.o $(NETPBMLIBS) $(TIFFLIB_DIR)/libtiff.so
+- $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) -L$(TIFFLIB_DIR) -ltiff \
++ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) -lm -L$(TIFFLIB_DIR) -ltiff \
+ $(JPEGLD) $(CDEBUG)
+
+ pnmtotiffcmyk: %: %.o $(NETPBMLIBS) $(TIFFLIB_DIR)/libtiff.so
+- $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) -lm -L$(TIFFLIB_DIR) -ltiff \
++ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) -lm -L$(TIFFLIB_DIR) -ltiff \
+ $(JPEGLD) $(CDEBUG)
+
+ # Rules for plain programs.
+ $(PORTBINARIES): %: %.o $(NETPBMLIBS)
+- $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(CDEBUG)
++ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(CDEBUG)
+
+ # Rule for math-dependent programs.
+ $(MATHBINARIES): %: %.o $(NETPBMLIBS)
+- $(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLIBS) $(CDEBUG)
++ $(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLD) $(CDEBUG)
+
+ pngtopnm pnmtopng: %: %.o $(NETPBMLIBS)
+- $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) \
++ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) \
+ -L$(PNGLIB_DIR) -lpng -lz -lm $(CDEBUG)
+
+ jpegtopnm: %: %.o $(NETPBMLIBS) $(SRCDIR)/shhopt/libshhopt.a
+- $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(JPEGLD) -lm \
++ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(JPEGLD) -lm \
+ $(SRCDIR)/shhopt/libshhopt.a $(CDEBUG)
+
+ # Rule for objects.
+ $(OBJECTS) $(LIBOBJECTS): %.o: %.c
+ $(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
+
++$(LIBSOBJECTS): %.so: %.c
++ $(CC) -c -fpic -DPIC $(CFLAGS) $(INCLUDE) -o $@ $<
++
+ $(MERGE_OBJECTS): %.o2: %.c
+ $(CC) -c $(CFLAGS) $(INCLUDE) "-Dmain=$*_main" -o $@ $<
+
+ # And libraries.
+ $(PBMDIR)/$(LIBPBM):
+- cd $(PBMDIR) ; make $(LIBPBM)
++ cd $(PBMDIR) ; $(MAKE) $(LIBPBM)
+ $(PGMDIR)/$(LIBPGM):
+- cd $(PGMDIR) ; make $(LIBPGM)
++ cd $(PGMDIR) ; $(MAKE) $(LIBPGM)
+ $(PPMDIR)/$(LIBPPM):
+- cd $(PPMDIR) ; make $(LIBPPM)
++ cd $(PPMDIR) ; $(MAKE) $(LIBPPM)
+ $(TIFFDIR)/$(LIBTIFF):
+- cd $(TIFFDIR) ; make $(LIBTIFF)
++ cd $(TIFFDIR) ; $(MAKE) $(LIBTIFF)
+
+ $(SRCDIR)/shhopt/libshhopt.a:
+ cd $(SRCDIR)/shhopt; $(MAKE) libshhopt.a
diff -urN /usr/ports/graphics/netpbm/patches/patch-bg graphics/netpbm/patches/patch-bg
--- /usr/ports/graphics/netpbm/patches/patch-bg Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/patches/patch-bg Sat Apr 1 12:00:00 2000
@@ -0,0 +1,92 @@
+--- ppm/Makefile.orig Fri Mar 24 17:04:20 2000
++++ ppm/Makefile Sat Apr 1 12:00:00 2000
+@@ -16,7 +16,7 @@
+
+ MERGENAME = ppmmerge
+
+-INCLUDE= -I.. $(INCLUDEPGM) $(INCLUDEPBM) -I../shhopt
++INCLUDE= -I$(SRCDIR) $(INCLUDEPGM) $(INCLUDEPBM) -I$(SRCDIR)/shhopt
+
+ ifneq ($(JPEGHDR_DIR), NONE)
+ INCLUDE+= -I$(JPEGHDR_DIR)
+@@ -29,6 +29,7 @@
+ endif
+
+ NETPBMLIBS = $(LIBPPM) $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM)
++NETPBMLD = -L. -lppm -L$(PBMDIR) -lpbm -L$(PGMDIR) -lpgm
+
+ PORTBINARIES = bmptoppm gouldtoppm hpcdtoppm ilbmtoppm imgtoppm \
+ mtvtoppm pcxtoppm pgmtoppm pi1toppm picttoppm \
+@@ -46,6 +47,7 @@
+ sputoppm tgatoppm ximtoppm xpmtoppm xvminitoppm \
+ yuvtoppm yuvsplittoppm
+
++NOMERGEBINARIES =
+ ifneq ($(JPEGLIB_DIR), NONE)
+ ifneq ($(JPEGHDR_DIR), NONE)
+ NOMERGEBINARIES += ppmtojpeg
+@@ -53,7 +55,7 @@
+ endif
+
+ MATHBINARIES = ppmcie ppmforge ppmlabel ppmpat ppmqvga ppmtomap
+-BINARIES = $(PORTBINARIES) $(NOMERGEBINARIES) $(MATHBINARIES)
++BINARIES = $(PORTBINARIES) $(MATHBINARIES) $(NOMERGEBINARIES)
+ SCRIPTS = ppmquantall ppmshadow
+
+ OBJECTS = $(patsubst %, %.o, $(BINARIES))
+@@ -61,6 +63,7 @@
+ MERGE_OBJECTS = $(patsubst %,%.o2, $(PORTBINARIES) $(MATHBINARIES))
+
+ LIBOBJECTS = libppm1.o libppm2.o libppm3.o libppm4.o libppm5.o bitio.o
++LIBSOBJECTS = libppm1.so libppm2.so libppm3.so libppm4.so libppm5.so bitio.so
+
+ MANUALS1 = $(BINARIES) $(SCRIPTS)
+ MANUALS3 = libppm
+@@ -68,7 +71,7 @@
+
+ MERGENAME= ppmmerge
+
+-INTERFACE_HEADERS = ppm.h
++INTERFACE_HEADERS = ppm.h ppmcmap.h ppmdraw.h
+
+ .PHONY: all
+ all: $(BINARIES)
+@@ -77,26 +80,32 @@
+
+
+ # Rules for plain programs.
+-$(PORTBINARIES) ppmtojpeg: %: %.o $(NETPBMLIBS) ../shhopt/libshhopt.a
+- $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) ../shhopt/libshhopt.a \
+- $(JPEGLD) $(CDEBUG)
++$(PORTBINARIES): %: %.o $(NETPBMLIBS)
++ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(CDEBUG)
+
+ # Rule for math-dependent programs.
+ $(MATHBINARIES): %: %.o $(NETPBMLIBS)
+- $(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLIBS) $(CDEBUG)
++ $(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLD) $(CDEBUG)
++
++ppmtojpeg: %: %.o $(NETPBMLIBS) ../shhopt/libshhopt.a
++ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) ../shhopt/libshhopt.a \
++ $(JPEGLD) $(CDEBUG)
+
+ # Rule for objects.
+ $(OBJECTS) $(LIBOBJECTS): %.o: %.c
+ $(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
+
++$(LIBSOBJECTS): %.so: %.c
++ $(CC) -c -fpic -DPIC $(CFLAGS) $(INCLUDE) -o $@ $<
++
+ $(MERGE_OBJECTS): %.o2: %.c
+ $(CC) -c $(CFLAGS) $(INCLUDE) "-Dmain=$*_main" -o $@ $<
+
+ # And libraries.
+ $(PBMDIR)/$(LIBPBM):
+- cd $(PBMDIR) ; make $(LIBPBM)
++ cd $(PBMDIR) ; $(MAKE) $(LIBPBM)
+ $(PGMDIR)/$(LIBPGM):
+- cd $(PGMDIR) ; make $(LIBPGM)
++ cd $(PGMDIR) ; $(MAKE) $(LIBPGM)
+
+ ../shhopt/libshhopt.a:
+ cd ../shhopt; $(MAKE) libshhopt.a
diff -urN /usr/ports/graphics/netpbm/patches/patch-bh graphics/netpbm/patches/patch-bh
--- /usr/ports/graphics/netpbm/patches/patch-bh Thu Jan 1 09:00:00 1970
+++ graphics/netpbm/patches/patch-bh Sat Apr 1 12:00:00 2000
@@ -0,0 +1,13 @@
+--- shhopt/Makefile.orig Fri Mar 10 17:45:19 2000
++++ shhopt/Makefile Sat Apr 1 12:00:00 2000
+@@ -27,8 +27,8 @@
+ INSTALLPROG = install -m 755
+ MKDIRP = install -d -m 755
+
+-CC = gcc
+-OPTIM = -O2
++CC ?= gcc
++OPTIM = ${CFLAGS}
+
+ INCDIR = -I.
+
diff -urN /usr/ports/graphics/netpbm/pkg/PLIST graphics/netpbm/pkg/PLIST
--- /usr/ports/graphics/netpbm/pkg/PLIST Sun Feb 13 19:49:11 2000
+++ graphics/netpbm/pkg/PLIST Sat Apr 1 12:00:00 2000
@@ -16,6 +16,7 @@
bin/icontopbm
bin/ilbmtoppm
bin/imgtoppm
+bin/jpegtopnm
bin/lispmtopgm
bin/macptopbm
bin/mgrtopbm
@@ -77,6 +78,7 @@
bin/picttoppm
bin/pjtoppm
bin/pktopbm
+bin/pngtopnm
bin/pnmalias
bin/pnmarith
bin/pnmcat
@@ -96,7 +98,6 @@
bin/pnmmargin
bin/pnmmerge
bin/pnmnlfilt
-bin/pnmnoraw
bin/pnmpad
bin/pnmpaste
bin/pnmrotate
@@ -106,21 +107,26 @@
bin/pnmtile
bin/pnmtoddif
bin/pnmtofits
+bin/pnmtoplainpnm
+bin/pnmtopng
bin/pnmtops
bin/pnmtorast
bin/pnmtosgi
bin/pnmtosir
bin/pnmtotiff
+bin/pnmtotiffcmyk
bin/pnmtoxwd
bin/ppm3d
bin/ppmbrighten
bin/ppmchange
+bin/ppmcie
bin/ppmdim
bin/ppmdist
bin/ppmdither
bin/ppmflash
bin/ppmforge
bin/ppmhist
+bin/ppmlabel
bin/ppmmake
bin/ppmmerge
bin/ppmmix
@@ -131,6 +137,7 @@
bin/ppmquantall
bin/ppmqvga
bin/ppmrelief
+bin/ppmshadow
bin/ppmshift
bin/ppmspread
bin/ppmtoacad
@@ -138,6 +145,7 @@
bin/ppmtogif
bin/ppmtoicr
bin/ppmtoilbm
+bin/ppmtojpeg
bin/ppmtomap
bin/ppmtomitsu
bin/ppmtopcx
@@ -161,6 +169,7 @@
bin/rawtopgm
bin/rawtoppm
bin/rgb3toppm
+bin/sbigtopgm
bin/sgitopnm
bin/sirtopnm
bin/sldtoppm
@@ -184,7 +193,18 @@
include/pnm.h
include/ppm.h
include/ppmcmap.h
+include/ppmdraw.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
+@exec /sbin/ldconfig -m %B
+@unexec /sbin/ldconfig -R
>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?200004012324.PAA12145>