FreeBSD Bugzilla – Attachment 8375 Details for
Bug 17571
Update port: grapchis/netpbm to 8.2
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 60.40 KB, created by
tkato
on 2000-03-23 17:40:01 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
tkato
Created:
2000-03-23 17:40:01 UTC
Size:
60.40 KB
patch
obsolete
>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 Thu Mar 23 05:37:10 2000 >@@ -1,57 +1,67 @@ > # New ports collection makefile for: netpbm >-# Version required: 8.0 >+# Version required: 8.2 > # 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.2 > 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 > > 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 \ >- 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 \ >- xwdtopnm.1 ybmtopbm.1 yuvsplittoppm.1 yuvtoppm.1 zeisstopnm.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 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 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 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 >+MLINKS= pnmtoplainpnm.1 pnmnoraw.1 >+ >+post-extract: >+ @find ${WRKSRC} -name '*.a' -delete > > post-patch: >- @${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Pbmplus.tmpl >+ @${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/pbmplus.h >+ >+post-install: >+ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${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 Thu Mar 23 03:53:46 2000 >@@ -1 +1 @@ >-MD5 (netpbm-8.0.tar.gz) = 1aa88eb0d1f86b5793fde0317c95ed68 >+MD5 (netpbm-8.2.tgz) = 17556e3f30b7447b6ae11e074c53ccaa >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-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-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 Thu Mar 23 03:38:11 2000 >@@ -1,5 +1,5 @@ >---- pbmplus.h.orig Tue Mar 1 18:46:36 1994 >-+++ pbmplus.h Thu Jan 7 19:23:15 1999 >+--- pbmplus.h.orig Sun Mar 19 11:41:24 2000 >++++ pbmplus.h Thu Mar 23 03:36:49 2000 > @@ -20,6 +20,9 @@ > #include <perror.h> > #include <errno.h> >@@ -8,7 +8,7 @@ > +#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 @@ > ** and if you run on an Amiga, set AMIGA. If your compiler is ANSI C, you're >@@ -21,7 +21,16 @@ > /* #define SYSV */ > /* #define MSDOS */ > /* #define AMIGA */ >-@@ -119,10 +124,12 @@ >+@@ -42,7 +47,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" >+@@ -113,10 +118,12 @@ > #ifndef VMS > #include <unistd.h> > #endif >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-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 Thu Mar 23 22:25:07 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 Fri Mar 3 15:01:59 2000 >++++ ppm/ppmtobmp.c Thu Mar 23 22:24:27 2000 > @@ -75,7 +75,7 @@ > unsigned short cBitCount, pixel **pixels, colorhash_table cht)); > static int colorstobpp ARGS((int colors)); >@@ -7,103 +7,86 @@ > - 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,19 @@ > int i; > long ncolors; > > - for (i = 0; i < colors; i++) >-- { >++ if (bpp != 24) >+ { > - nbyte += BMPwritergb(fp,class,R[i],G[i],B[i]); > - } >-- >++ for (i = 0; i < colors; i++) >++ { >++ nbyte += BMPwritergb(fp,class,R[i],G[i],B[i]); >++ } >+ > - ncolors = (1 << bpp); >-+ if (bpp != 24) >-+ { >++ 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); >-+ } >-+ } >++ for (; i < ncolors; i++) >++ { >++ nbyte += BMPwritergb(fp,class,0,0,0); >++ } >+ } > >-- return nbyte; >-+ return nbyte; >- } >- >- /* >-@@ -284,26 +288,38 @@ >+ return nbyte; >+@@ -271,26 +274,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 +391,21 @@ > * arrays are undefined. > */ > static void >@@ -114,7 +97,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 +137,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 +487,15 @@ > char **argv; > { > FILE *ifp = stdin; >@@ -166,16 +149,16 @@ > 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 +517,14 @@ > class = C_WIN; > else if (pm_keymatch(argv[argn], "-os2", 2)) > class = C_OS2; >-+ else if (pm_keymatch(argv[argn], "-24bits", 3)) >++ else if (pm_keymatch(argv[argn], "-24bits", 2)) > + bpp = 24, maxcolors = 256; > + else if (pm_keymatch(argv[argn], "-8bits", 2)) > + bpp = 8, maxcolors = 256; >@@ -186,18 +169,18 @@ > else > pm_usage(usage); > ++argn; >-@@ -585,44 +584,90 @@ >+@@ -567,44 +565,90 @@ > #endif > > /* Figure out the colormap. */ > - pm_message("computing colormap..."); > - chv = ppm_computecolorhist(pixels, cols, rows, MAXCOLORS, &colors); >-+ chv = (colorhist_vector) 0; >++ chv = (colorhist_vector) 0; > + if(bpp != 24) >-+ { >-+ pm_message("computing colormap..."); >-+ chv = ppm_computecolorhist(pixels, cols, rows, maxcolors, &colors); >-+ } >++ { >++ pm_message("computing colormap..."); >++ chv = ppm_computecolorhist(pixels, cols, rows, maxcolors, &colors); >++ } > if (chv == (colorhist_vector) 0) > - pm_error("too many colors - try doing a 'ppmquant %d'" > - , MAXCOLORS); >@@ -208,100 +191,92 @@ > - * colormap. > - */ > - if (maxval > 255) >-- { >+ { > - pm_message("maxval is not 255 - automatically rescaling colors"); >-- } >++ 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); >+ } > - for (i = 0; i < colors; ++i) >-- { >++ else >+ { > - if (maxval == 255) >-- { >++ 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! >++ */ >++ >++ if (!bpp) >+ { > - Red[i] = PPM_GETR(chv[i].color); > - Green[i] = PPM_GETG(chv[i].color); > - Blue[i] = PPM_GETB(chv[i].color); >-- } >++ bpp = colorstobpp(colors); >++ >++ switch(bpp) >++ { >++ case 2: >++ case 3: >++ bpp = 4; >++ break; >++ case 5: >++ case 6: >++ case 7: >++ bpp = 8; >++ break; >++ } >+ } > - else >-- { >++ >++ /* >++ * 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 (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); >-+ >-+ /* >-+ * 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); >-+ >-+ 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; >-+ } >-+ } >++ 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); >-+ } >++ /* 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 Wed Mar 22 22:00:15 2000 >@@ -0,0 +1,12 @@ >+--- pnm/jpegtopnm.c.orig Mon Mar 20 13:57:49 2000 >++++ pnm/jpegtopnm.c Wed Mar 22 21:59:51 2000 >+@@ -29,6 +29,9 @@ >+ #include <string.h> >+ #include <stdlib.h> >+ #include <stdio.h> >++#ifdef __FreeBSD__ >++#include <errno.h> >++#endif >+ #include <jpeglib.h> >+ #include "shhopt.h" >+ #include "pnm.h" >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 Thu Mar 23 21:00:14 2000 >@@ -0,0 +1,47 @@ >+--- pnm/pnmtotiffcmyk.c.orig Sat Mar 4 12:27:50 2000 >++++ pnm/pnmtotiffcmyk.c Thu Mar 23 20:59:58 2000 >+@@ -59,16 +59,21 @@ >+ #include <math.h> >+ #include <limits.h> >+ #include <fcntl.h> >++#ifdef __FreeBSD__ >++#include <float.h> >++#endif >+ #include <tiffio.h> >++#if 0 >+ #include <tiffiop.h> >++#endif >+ >+ /* first release after testing */ >+ /* second release after testing - small mods to netpbm package */ >+ #define VERSION 1.01 >+ >+ /* beware - these evaluate more than once */ >+-#define MAX(x, y) ( ( x ) > ( y ) ? ( x ) : ( y ) ) >+-#define MIN(x, y) ( ( x ) < ( y ) ? ( x ) : ( y ) ) >++#define _MAX(x, y) ( ( x ) > ( y ) ? ( x ) : ( y ) ) >++#define _MIN(x, y) ( ( x ) < ( y ) ? ( x ) : ( y ) ) >+ >+ /* only support 8 bit values */ >+ #define MAXTIFFBITS 8 >+@@ -97,9 +102,9 @@ >+ /* definitions for conversion calculations */ >+ >+ /* catch rounding errors to outside 0-1 range */ >+-#define LIMIT01(x) MAX( 0.0, MIN( 1.0, (x) ) ) >++#define LIMIT01(x) _MAX( 0.0, _MIN( 1.0, (x) ) ) >+ /* convert from 0-1 to 0-maxOut */ >+-#define TOMAX(x) MAX( 0, MIN( rt->maxOut, (int)(rt->maxOut * (x)) ) ) >++#define TOMAX(x) _MAX( 0, _MIN( rt->maxOut, (int)(rt->maxOut * (x)) ) ) >+ #define TINY FLT_EPSILON >+ #ifndef PI >+ #define PI 3.1415926 >+@@ -830,7 +835,7 @@ >+ *c = TOMAX( r ) ; >+ *m = TOMAX( g ) ; >+ *y = TOMAX( b ) ; >+- *k = MIN( *c, MIN( *m, *y ) ) ; >++ *k = _MIN( *c, _MIN( *m, *y ) ) ; >+ >+ return ERR_OK ; >+ } >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 Thu Mar 23 04:23:59 2000 >@@ -0,0 +1,112 @@ >+--- Makefile.orig Mon Mar 20 14:58:11 2000 >++++ Makefile Thu Mar 23 04:22:59 2000 >+@@ -25,17 +25,17 @@ >+ #CC = cc >+ #CC = gcc >+ #CC = gcc -fpcc-struct-return >+-CC = gcc -pedantic -fpcc-struct-return >++#CC = gcc -pedantic -fpcc-struct-return >+ >+ # CONFIGURE: cc flags go here. >+ #CDEBUG is for setting on the command line to temporarily add an additional >+ #compiler option. E.g. make all CDEBUG=-g or make CDEBUG=-Werror >+ >+-CFLAGS = -O2 -Wall -Wno-uninitialized $(TIFFDEF) $(CDEBUG) >++#CFLAGS = -O2 -Wall -Wno-uninitialized $(TIFFDEF) $(CDEBUG) >+ >+ # CONFIGURE: ld flags go here. Eunice users may want to use -noshare so that >+ # the binaries can run standalone. >+-LDFLAGS = -s >++#LDFLAGS = -s >+ #LDFLAGS = >+ #LDFLAGS = -noshare >+ >+@@ -45,8 +45,8 @@ >+ >+ # These paths are relative to one of our subdirectories. These variables are >+ # used only in subdirectory make files. >+-TIFFINC = -I../libtiff >+-TIFFLIB = ../libtiff/libtiff.a >++TIFFINC = -I${LOCALBASE}/include >++TIFFLIB = -L${LOCALBASE}/lib -ltiff >+ TIFFDEF = -DLIBTIFF >+ >+ # CONFIGURE: If you want to build the jpeg converters or tiff >+@@ -64,41 +64,41 @@ >+ # at least JPEGLIB_DIR here, or the tiff converters will not build at >+ # all. >+ >+-JPEGLIB_DIR = /usr/lib/jpeg >+-JPEGHDR_DIR = /usr/include/jpeg >++JPEGLIB_DIR = ${LOCALBASE}/lib >++JPEGHDR_DIR = ${LOCALBASE}/include >+ >+ # CONFIGURE: Specify the directory where you want the executables. >+ # If you need scripts and binaries to be in different directories, you >+ # can set that up too. >+-INSTALLBINARIES = /usr/local/netpbm >++INSTALLBINARIES = ${PREFIX}/bin >+ INSTALLSCRIPTS = $(INSTALLBINARIES) >+ >+ # CONFIGURE: Specify the directory where you want the shared libraries >+ # installed. For this to be effective, you must have set up this location >+ # to be searched by your system's program executor for runtime libraries. >+-INSTALLLIBS = $(INSTALLBINARIES) >++INSTALLLIBS = ${PREFIX}/lib >+ >+ # CONFIGURE: Specify the directories that you want the manual sources copied to, >+ # plus the suffix you want them to have. >+-INSTALLMANUALS1 = /usr/local/man/man1 >++INSTALLMANUALS1 = ${PREFIX}/man/man1 >+ SUFFIXMANUALS1 = 1 >+-INSTALLMANUALS3 = /usr/local/man/man3 >++INSTALLMANUALS3 = ${PREFIX}/man/man3 >+ SUFFIXMANUALS3 = 3 >+-INSTALLMANUALS5 = /usr/local/man/man5 >++INSTALLMANUALS5 = ${PREFIX}/man/man5 >+ SUFFIXMANUALS5 = 5 >+ >+ # CONFIGURE: Normally the man pages are installed using "cp". By changing >+ # this define you can use something else, for example a script that calls >+ # compress or pack. The ../mantocat is used on systems which use man pages >+ # in the "cat" format. >+-MANCP = cp >++MANCP = ${BSD_INSTALL_MAN} >+ #MANCP = ../mantocat >+ >+ >+ # End of configurable definitions. >+ >+ SHELL = /bin/sh >+-MAKE = make >++#MAKE = make >+ SUBDIRS = pbm pgm ppm pnm >+ >+ MAKE_OVERRIDES = 'CC=$(CC)' 'CFLAGS=$(CFLAGS)' 'TIFFDEF=$(TIFFDEF)' 'TIFFINC=$(TIFFINC)' 'TIFFLIB=$(TIFFLIB)' 'LDFLAGS=$(LDFLAGS)' >+@@ -139,7 +139,7 @@ >+ >+ .PHONY: install.bin >+ install.bin: >+- -mkdir $(INSTALLBINARIES) >++ -mkdir -p $(INSTALLBINARIES) >+ for i in $(SUBDIRS) ; do \ >+ ( echo $$i ; cd $$i ; $(MAKE) $(MFLAGS) $(MAKE_OVERRIDES) \ >+ install.bin ); \ >+@@ -147,7 +147,7 @@ >+ >+ .PHONY: install-merge >+ install.merge: >+- -mkdir $(INSTALLBINARIES) >++ -mkdir -p $(INSTALLBINARIES) >+ for i in $(SUBDIRS) ; do \ >+ ( echo $$i ; cd $$i ; $(MAKE) $(MFLAGS) $(MAKE_OVERRIDES) \ >+ install.merge ); \ >+@@ -159,7 +159,7 @@ >+ ( echo $$i ; cd $$i ; $(MAKE) $(MFLAGS) $(MAKE_OVERRIDES) \ >+ install.lib ); \ >+ done >+- cd libtiff; $(MAKE) install >++ ${BSD_INSTALL_DATA} pbmplus.h ${PREFIX}/include >+ >+ .PHONY: install.man >+ install.man: >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 Thu Mar 23 20:58:45 2000 >@@ -0,0 +1,118 @@ >+--- pbm/Makefile.orig Tue Mar 21 05:57:27 2000 >++++ pbm/Makefile Thu Mar 23 20:58:09 2000 >+@@ -14,18 +14,18 @@ >+ #CC = gcc -ansi -pedantic -fpcc-struct-return >+ # We're withholding -ansi as an experiment. So far we know that this >+ # makes rindex() unavailable. >+-CC = gcc -pedantic -fpcc-struct-return >+-TIFFDEF = -DLIBTIFF >+-CFLAGS = -O2 -Wall -Wno-uninitialized $(TIFFDEF) $(CDEBUG) >+-INSTALLBINARIES = /usr/local/netpbm >+-INSTALLLIBS = $(INSTALLBINARIES) >+-INSTALLMANUALS1 = /usr/man/man1 >++#CC = gcc -pedantic -fpcc-struct-return >++#TIFFDEF = -DLIBTIFF >++#CFLAGS = -O2 -Wall -Wno-uninitialized $(TIFFDEF) $(CDEBUG) >++INSTALLBINARIES = ${PREFIX}/bin >++INSTALLLIBS = ${PREFIX}/lib >++INSTALLMANUALS1 = ${PREFIX}/man/man1 >+ SUFFIXMANUALS1 = 1 >+-INSTALLMANUALS3 = /usr/man/man3 >++INSTALLMANUALS3 = ${PREFIX}/man/man3 >+ SUFFIXMANUALS3 = 3 >+-INSTALLMANUALS5 = /usr/man/man5 >++INSTALLMANUALS5 = ${PREFIX}/man/man5 >+ SUFFIXMANUALS5 = 5 >+-MANCP = cp >++MANCP = ${BSD_INSTALL_MAN} >+ >+ SHELL = /bin/sh >+ INCLUDE = -I.. >+@@ -35,6 +35,7 @@ >+ MIN = 2 >+ >+ NETPBMLIBS = $(LIBPBM) >++NETPBMLD = -L. -lpbm >+ >+ PORTBINARIES = atktopbm brushtopbm cmuwmtopbm g3topbm \ >+ icontopbm gemtopbm macptopbm mgrtopbm \ >+@@ -54,6 +55,7 @@ >+ OBJECTS = $(patsubst %, %.o, $(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 >+@@ -67,32 +69,34 @@ >+ >+ # Rules for plain programs. >+ $(PORTBINARIES): %: %.o $(NETPBMLIBS) >+- $(CC) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(CDEBUG) >++ $(CC) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(CDEBUG) >+ >+ # Rule for math-dependent programs. >+ $(MATHBINARIES): %: %.o $(NETPBMLIBS) >+- $(CC) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLIBS) $(CDEBUG) >++ $(CC) $(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 $@ $< >+ >+ >+ pbmmerge: pbmmerge.c $(MERGE_OBJECTS) $(NETPBMLIBS) >+ $(CC) $(CFLAGS) $(INCLUDE) $(LDFLAGS) -o $@ $@.c \ >+- $(MERGE_OBJECTS) -lm $(NETPBMLIBS) >++ $(MERGE_OBJECTS) -lm $(NETPBMLD) >+ >+ # The minor number in the filename corresponds to the point release of >+ # Netpbm at which the library last changed. Do not change the major >+ # number (and soname) unless the old library is no longer forward compatible. >+-libpbm.so: libpbm.so.$(MAJ).$(MIN) >+- ln -sf libpbm.so.$(MAJ).$(MIN) libpbm.so >+-libpbm.so.1.2: $(LIBOBJECTS) >+- gcc -shared -Wl,-soname,libpbm.so.$(MAJ) -o libpbm.so.$(MAJ).$(MIN) \ >+- $(LIBOBJECTS) >++libpbm.so: libpbm.so.$(MAJ) >++ ln -sf libpbm.so.$(MAJ) libpbm.so >++libpbm.so.$(MAJ): libpbm.a $(LIBSOBJECTS) >++ $(CC) -shared -Wl,-x -Wl,-soname,$@ -o $@ $(LIBSOBJECTS) >+ >+ libpbm.a: $(LIBOBJECTS) >+ -rm -f $@ >+@@ -104,22 +108,19 @@ >+ >+ .PHONY: install.bin >+ install.bin: $(BINARIES) >+- cd $(INSTALLBINARIES) ; rm -f $(BINARIES) >+- cp $(BINARIES) $(INSTALLBINARIES) >+- cd $(INSTALLBINARIES) ; strip $(BINARIES) >++ ${BSD_INSTALL_PROGRAM} $(BINARIES) $(INSTALLBINARIES) >+ >+ .PHONY: install.merge >+ install.merge: pbmmerge >+- cd $(INSTALLBINARIES) ; rm -f $(BINARIES) >+- cp pbmmerge $(INSTALLBINARIES) >++ ${BSD_INSTALL_PROGRAM} pbmmerge $(INSTALLBINARIES) >+ cd $(INSTALLBINARIES) ; for i in $(BINARIES) ; do ln pbmmerge $$i ; done >+ rm -f $(INSTALLBINARIES)/pbmmerge >+ >+ .PHONY: install.lib >+-install.lib: libpbm.so.$(MAJ).$(MIN) >+- cd $(INSTALLLIBS) ; rm -f libpbm.$(MAJ).* >+- cp libpbm.so.$(MAJ).$(MIN) $(INSTALLLIBS) >+- cd $(INSTALLLIBS) ; ln -sf libpbm.so.$(MAJ).$(MIN) libpbm.so >++install.lib: libpbm.a libpbm.so.$(MAJ) >++ ${BSD_INSTALL_DATA} pbm.h ${PREFIX}/include >++ ${BSD_INSTALL_DATA} libpbm.a libpbm.so.$(MAJ) $(INSTALLLIBS) >++ cd $(INSTALLLIBS) ; ln -sf libpbm.so.$(MAJ) libpbm.so >+ >+ .PHONY: install.man >+ install.man: >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 Thu Mar 23 20:58:53 2000 >@@ -0,0 +1,118 @@ >+--- pgm/Makefile.orig Mon Mar 20 14:50:52 2000 >++++ pgm/Makefile Thu Mar 23 20:58:26 2000 >+@@ -13,17 +13,17 @@ >+ #CC = cc >+ # When we put -ansi in the following, we get complaints about our use of >+ # bzero() in asciitopgm, for one thing. >+-CC = gcc -pedantic -fpcc-struct-return >+-CFLAGS = -O2 -Wall -Wno-uninitialized $(CDEBUG) >+-INSTALLBINARIES = /usr/local/netpbm >+-INSTALLIBS = $(INSTALLBINARIES) >+-INSTALLMANUALS1 = /usr/man/man1 >++#CC = gcc -pedantic -fpcc-struct-return >++#CFLAGS = -O2 -Wall -Wno-uninitialized $(CDEBUG) >++INSTALLBINARIES = ${PREFIX}/bin >++INSTALLLIBS = ${PREFIX}/lib >++INSTALLMANUALS1 = ${PREFIX}/man/man1 >+ SUFFIXMANUALS1 =1 >+-INSTALLMANUALS3 = /usr/man/man3 >++INSTALLMANUALS3 = ${PREFIX}/man/man3 >+ SUFFIXMANUALS3 = 3 >+-INSTALLMANUALS5 = /usr/man/man5 >++INSTALLMANUALS5 = ${PREFIX}/man/man5 >+ SUFFIXMANUALS5 = 5 >+-MANCP = cp >++MANCP = ${BSD_INSTALL_MAN} >+ >+ #If you change the LIBx variables from .so to .a, you should get an >+ #old fashioned static link of all the netpbm and tiff libraries. >+@@ -43,6 +43,7 @@ >+ INCLUDE = -I.. $(INCLUDEPBM) >+ >+ NETPBMLIBS = $(LIBPGM) $(PBMDIR)/$(LIBPBM) >++NETPBMLD = -L. -lpgm -L$(PBMDIR) -lpbm >+ >+ PORTBINARIES = asciitopgm bioradtopgm fstopgm hipstopgm \ >+ lispmtopgm pbmtopgm pgmbentley pgmenhance pgmhist \ >+@@ -54,6 +55,7 @@ >+ OBJECTS = $(patsubst %, %.o, $(BINARIES)) >+ >+ LIBOBJECTS = libpgm1.o libpgm2.o >++LIBSOBJECTS = libpgm1.so libpgm2.so >+ >+ MANUALS1 = $(BINARIES) >+ MANUALS3 = libpgm >+@@ -67,28 +69,30 @@ >+ >+ # Rules for plain programs. >+ $(PORTBINARIES): %: %.o $(NETPBMLIBS) >+- $(CC) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(CDEBUG) >++ $(CC) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(CDEBUG) >+ >+ # Rule for math-dependent programs. >+ $(MATHBINARIES): %: %.o $(NETPBMLIBS) >+- $(CC) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLIBS) $(CDEBUG) >++ $(CC) $(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) >+ >+-libpgm.so: libpgm.so.$(MAJ).$(MIN) >+- ln -sf libpgm.so.$(MAJ).$(MIN) libpgm.so >+-libpgm.so.$(MAJ).$(MIN): $(LIBOBJECTS) >+- gcc -shared -Wl,-soname,libpgm.so.$(MAJ) -o libpgm.so.$(MAJ).$(MIN) \ >+- $(LIBOBJECTS) >++libpgm.so: libpgm.so.$(MAJ) >++ ln -sf libpgm.so.$(MAJ) libpgm.so >++libpgm.so.$(MAJ): libpgm.a $(LIBSOBJECTS) >++ $(CC) -shared -Wl,-x -Wl,-soname,$@ -o $@ $(LIBSOBJECTS) >+ >+ libpgm.a: $(LIBOBJECTS) >+ -rm -f $@ >+@@ -97,27 +101,24 @@ >+ >+ pgmmerge: pgmmerge.c $(MERGE_OBJECTS) $(NETPBMLIBS) >+ $(CC) $(CFLAGS) $(INCLUDE) $(LDFLAGS) -o $@ $@.c \ >+- $(MERGE_OBJECTS) -lm $(NETPBMLIBS) >++ $(MERGE_OBJECTS) -lm $(NETPBMLD) >+ >+ >+ .PHONY: install.bin >+ install.bin: $(BINARIES) >+- cd $(INSTALLBINARIES) ; rm -f $(BINARIES) >+- cp $(BINARIES) $(INSTALLBINARIES) >+- cd $(INSTALLBINARIES) ; strip $(BINARIES) >++ ${BSD_INSTALL_PROGRAM} $(BINARIES) $(INSTALLBINARIES) >+ >+ .PHONY: install.merge >+ install.merge: pgmmerge >+- cd $(INSTALLBINARIES) ; rm -f $(BINARIES) >+- cp pgmmerge $(INSTALLBINARIES) >++ ${BSD_INSTALL_PROGRAM} pgmmerge $(INSTALLBINARIES) >+ cd $(INSTALLBINARIES) ; for i in $(BINARIES) ; do ln pgmmerge $$i ; done >+ rm -f $(INSTALLBINARIES)/pgmmerge >+ >+ .PHONY: install.lib >+-install.lib: libpgm.$(MAJ).$(MIN) >+- cd $(INSTALLLIBS) ; rm -f libpgm.$(MAJ).* >+- cp libpgm.$(MAJ).$(MIN) $(INSTALLLIBS) >+- cd $(INSTALLBINARIES) ; ln -sf libpgm.$(MAJ).$(MIN) libpgm.so >++install.lib: libpgm.a libpgm.so.$(MAJ) >++ ${BSD_INSTALL_DATA} pgm.h ${PREFIX}/include >++ ${BSD_INSTALL_DATA} libpgm.a libpgm.so.$(MAJ) $(INSTALLLIBS) >++ cd $(INSTALLLIBS) ; ln -sf libpgm.so.$(MAJ) libpgm.so >+ >+ .PHONY: install.man >+ install.man: >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 Thu Mar 23 20:58:59 2000 >@@ -0,0 +1,206 @@ >+--- pnm/Makefile.orig Mon Mar 20 14:50:47 2000 >++++ pnm/Makefile Thu Mar 23 20:57:37 2000 >+@@ -13,18 +13,18 @@ >+ #CC = cc >+ # If we include -ansi below, compiler complains about use of bzero() in >+ # pnmhisteq.c, at least. >+-CC = gcc -pedantic -fpcc-struct-return >+-CFLAGS = -O2 -Wall -Wno-uninitialized -DLIBTIFF $(CDEBUG) >+-INSTALLBINARIES = /usr/local/netpbm >++#CC = gcc -pedantic -fpcc-struct-return >++#CFLAGS = -O2 -Wall -Wno-uninitialized -DLIBTIFF $(CDEBUG) >++INSTALLBINARIES = ${PREFIX}/bin >+ INSTALLSCRIPTS = $(INSTALLBINARIES) >+-INSTALLIBS = $(INSTALLBINARIES) >+-INSTALLMANUALS1 = /usr/man/man1 >++INSTALLLIBS = ${PREFIX}/lib >++INSTALLMANUALS1 = ${PREFIX}/man/man1 >+ SUFFIXMANUALS1 = 1 >+-INSTALLMANUALS3 = /usr/man/man3 >++INSTALLMANUALS3 = ${PREFIX}/man/man3 >+ SUFFIXMANUALS3 = 3 >+-INSTALLMANUALS5 = /usr/man/man5 >++INSTALLMANUALS5 = ${PREFIX}/man/man5 >+ SUFFIXMANUALS5 = 5 >+-MANCP = cp >++MANCP = ${BSD_INSTALL_MAN} >+ >+ >+ # Put the location of your JPEG library here. >+@@ -35,19 +35,19 @@ >+ # routines statically linked in. >+ # >+ # Also, without the JPEG library, you will not build jpegtopnm. >+-JPEGLIB_DIR = /lib >++JPEGLIB_DIR = ${LOCALBASE}/lib >+ >+ # Put the location of your JPEG library interface header files here. >+ # If you don't have them, set JPEGHDR_DIR to NONE. In that case, you >+ # will not build jpegtopnm. >+-JPEGHDR_DIR = /usr/include/jpeg >++JPEGHDR_DIR = ${LOCALBASE}/include >+ >+ #If you change the LIBx variables from .so to .a, you should get an >+ #old fashioned static link of all the netpbm and tiff libraries. >+ >+-TIFFDIR = ../libtiff >+-INCLUDETIFF = -I$(TIFFDIR) >+-LIBTIFF = libtiff.so >++#TIFFDIR = ../libtiff >++#INCLUDETIFF = -I$(TIFFDIR) >++#LIBTIFF = libtiff.so >+ >+ TIFFBINARIES = tifftopnm pnmtotiff pnmtotiffcmyk >+ >+@@ -79,6 +79,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= >+@@ -86,6 +88,8 @@ >+ JPEGLD= -L $(JPEGLIB_DIR) -ljpeg >+ endif >+ >++PNGLD= -L${LOCALBASE}/lib -lpng -lz >++ >+ # We tend to separate out the build targets so that we don't have >+ # any more dependencies for a given target than it really needs. >+ # That way, if there is a problem with a dependency, we can still >+@@ -122,6 +126,7 @@ >+ $(PORTBINARIES) $(MATHBINARIES) $(TIFFBINARIES)) >+ >+ LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o >++LIBSOBJECTS = libpnm1.so libpnm2.so libpnm3.so libpnm4.so >+ >+ MANUALS1 = $(BINARIES) $(SCRIPTS) >+ MANUALS3 = libpnm >+@@ -132,52 +137,54 @@ >+ .PHONY: merge >+ merge: pnmmerge $(SPECIAL_BINARIES) >+ >+-tifftopnm pnmtotiff: %: %.o $(NETPBMLIBS) $(TIFFDIR)/$(LIBTIFF) >+- $(CC) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(TIFFDIR)/$(LIBTIFF) \ >++tifftopnm pnmtotiff: %: %.o $(NETPBMLIBS) >++ $(CC) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(TIFFLIB) -lm \ >+ $(JPEGLD) $(CDEBUG) >+ >+-pnmtotiffcmyk: %: %.o $(NETPBMLIBS) $(TIFFDIR)/$(LIBTIFF) >+- $(CC) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(TIFFDIR)/$(LIBTIFF) -lm \ >+- $(JPEG) $(CDEBUG) >++pnmtotiffcmyk: %: %.o $(NETPBMLIBS) >++ $(CC) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(TIFFLIB) -lm \ >++ $(JPEGLD) $(CDEBUG) >+ >+ # Rules for plain programs. >+-$(PORTBINARIES): %: %.o $(NETPBMLIBS) >+- $(CC) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(CDEBUG) >++$(PORTBINARIES): %: %.o $(NETPBMLIBS) >++ $(CC) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(CDEBUG) >+ >+ # Rule for math-dependent programs. >+ $(MATHBINARIES): %: %.o $(NETPBMLIBS) >+- $(CC) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLIBS) $(CDEBUG) >++ $(CC) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLD) $(CDEBUG) >+ >+ pngtopnm pnmtopng: %: %.o $(NETPBMLIBS) >+ # $(CC) -O3 -D_BSD_SOURCE -o $@ $@.c $(INCLUDE) $(NETPBMLIBS) -lpng -lz -lm >+- $(CC) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) -lpng -lz -lm $(CDEBUG) >++ $(CC) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(PNGLD) -lm $(CDEBUG) >+ >+ jpegtopnm: %: %.o $(NETPBMLIBS) ../shhopt/libshhopt.a >+- $(CC) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(JPEGLD) -lm \ >++ $(CC) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(JPEGLD) -lm \ >+ ../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) >+ >+-libpnm.so: libpnm.so.$(MAJ).$(MIN) >+- ln -sf libpnm.so.$(MAJ).$(MIN) libpnm.so >+-libpnm.so.$(MAJ).$(MIN): $(LIBOBJECTS) >+- gcc -shared -Wl,-soname,libpnm.so.$(MAJ) -o libpnm.so.$(MAJ).$(MIN) \ >+- $(LIBOBJECTS) >++libpnm.so: libpnm.so.$(MAJ) >++ ln -sf libpnm.so.$(MAJ) libpnm.so >++libpnm.so.$(MAJ): libpnm.a $(LIBSOBJECTS) >++ $(CC) -shared -Wl,-x -Wl,-soname,$@ -o $@ $(LIBSOBJECTS) >+ >+ libpnm.a: $(LIBOBJECTS) >+ -rm -f $@ >+@@ -187,38 +194,33 @@ >+ ../shhopt/libshhopt.a: >+ cd ../shhopt; $(MAKE) libshhopt.a >+ >+-pnmmerge: pnmmerge.c $(MERGE_OBJECTS) $(NETPBMLIBS) $(TIFFDIR)/$(LIBTIFF) >++pnmmerge: pnmmerge.c $(MERGE_OBJECTS) $(NETPBMLIBS) >+ $(CC) $(CFLAGS) $(INCLUDE) $(LDFLAGS) -o $@ $@.c \ >+- $(MERGE_OBJECTS) -lm $(NETPBMLIBS) $(TIFFDIR)/$(LIBTIFF) \ >+- $(JPEG) $(CDEBUG) >++ $(MERGE_OBJECTS) -lm $(NETPBMLD) $(TIFFLIB) \ >++ $(JPEGLD) $(CDEBUG) >+ >+ .PHONY: install.bin >+ install.bin: $(BINARIES) $(SCRIPTS) >+- cd $(INSTALLBINARIES) ; rm -f $(BINARIES) >+- cp $(BINARIES) $(INSTALLBINARIES) >++ ${BSD_INSTALL_PROGRAM} $(BINARIES) $(INSTALLBINARIES) >+ # backward compatibility: program used to be named pnmnoraw >+- ln -sf $(INSTALLBINARIES)/pnmtoplainpnm $(INSTALLBINARIES)/pnmnoraw >+- cd $(INSTALLSCRIPTS) ; rm -f $(SCRIPTS) >+- cp $(SCRIPTS) $(INSTALLSCRIPTS) >+- cd $(INSTALLSCRIPTS) ; chmod +x $(SCRIPTS) >++ ln -sf pnmtoplainpnm $(INSTALLBINARIES)/pnmnoraw >++ ${BSD_INSTALL_SCRIPT} $(SCRIPTS) $(INSTALLSCRIPTS) >+ >+ .PHONY: install.merge >+ install.merge: pnmmerge $(SPECIAL_BINARIES) $(SCRIPTS) >+- cd $(INSTALLBINARIES) ; rm -f $(BINARIES) >+- cp pnmmerge $(INSTALLBINARIES) >++ ${BSD_INSTALL_PROGRAM} pnmmerge $(INSTALLBINARIES) >+ cd $(INSTALLBINARIES) ; \ >+ for i in $(BINARIES) ; do ln pnmmerge $$i ; done >+ rm -f $(INSTALLBINARIES)/pnmmerge >+- cp $(SPECIAL_BINARIES) $(INSTALLBINARIES) >++ ${BSD_INSTALL_PROGRAM} $(SPECIAL_BINARIES) $(INSTALLBINARIES) >+ cd $(INSTALLSCRIPTS) ; rm -f $(SCRIPTS) >+- cp $(SCRIPTS) $(INSTALLSCRIPTS) >+- cd $(INSTALLSCRIPTS) ; chmod +x $(SCRIPTS) >++ ${BSD_INSTALL_SCRIPT} $(SCRIPTS) $(INSTALLSCRIPTS) >+ >+ .PHONY: install.lib >+-install.lib: libpnm.$(MAJ).$(MIN) >+- cd $(INSTALLLIBS) ; rm -f libpnm.$(MAJ).* >+- cp libpnm.$(MAJ).$(MIN) $(INSTALLLIBS) >+- cd $(INSTALLBINARIES) ; ln -sf libpnm.$(MAJ).$(MIN) libpnm.so >++install.lib: libpnm.a libpnm.so.$(MAJ) >++ ${BSD_INSTALL_DATA} pnm.h ${PREFIX}/include >++ ${BSD_INSTALL_DATA} libpnm.a libpnm.so.$(MAJ) $(INSTALLLIBS) >++ cd $(INSTALLLIBS) ; ln -sf libpnm.so.$(MAJ) libpnm.so >+ >+ .PHONY: install.man >+ install.man: >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 Thu Mar 23 20:59:05 2000 >@@ -0,0 +1,137 @@ >+--- ppm/Makefile.orig Mon Mar 20 14:47:15 2000 >++++ ppm/Makefile Thu Mar 23 20:57:55 2000 >+@@ -13,27 +13,27 @@ >+ #CC = cc >+ # If we add -ansi below, compiler complains about bcopy() not existing >+ # in ilbmtoppm.c, for one thing. >+-CC = gcc -pedantic -fpcc-struct-return >+-CFLAGS = -O2 -Wall -Wno-uninitialized $(CDEBUG) >++#CC = gcc -pedantic -fpcc-struct-return >++#CFLAGS = -O2 -Wall -Wno-uninitialized $(CDEBUG) >+ >+ # Put the location of your JPEG link library and its interface header >+ # files here. If you don't have the JPEG library installed, you can't >+ # build ppmtojpeg. In that case, set these variables to >+ # NONE. >+-JPEGHDR_DIR = /usr/include/jpeg >+-JPEGLIB_DIR = /lib >++JPEGHDR_DIR = ${LOCALBASE}/include >++JPEGLIB_DIR = ${LOCALBASE}/lib >+ >+ >+-INSTALLBINARIES = /usr/local/netpbm >++INSTALLBINARIES = ${PREFIX}/bin >+ INSTALLSCRIPTS = $(INSTALLBINARIES) >+-INSTALLIBS = $(INSTALLBINARIES) >+-INSTALLMANUALS1 = /usr/man/mann >++INSTALLLIBS = ${PREFIX}/lib >++INSTALLMANUALS1 = ${PREFIX}/man/man1 >+ SUFFIXMANUALS1 = 1 >+-INSTALLMANUALS3 = /usr/man/mann >++INSTALLMANUALS3 = ${PREFIX}/man/man3 >+ SUFFIXMANUALS3 = 3 >+-INSTALLMANUALS5 = /usr/man/mann >++INSTALLMANUALS5 = ${PREFIX}/man/man5 >+ SUFFIXMANUALS5 = 5 >+-MANCP = cp >++MANCP = ${BSD_INSTALL_MAN} >+ >+ #If you change the LIBx variables from .so to .a, you should get an >+ #old fashioned static link of all the netpbm and tiff libraries. >+@@ -65,6 +65,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 \ >+@@ -97,6 +98,7 @@ >+ MERGE_OBJECTS = $(patsubst %,%.o2, $(BINARIES)) >+ >+ 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 >+@@ -110,31 +112,33 @@ >+ >+ # Rules for plain programs. >+ $(PORTBINARIES): %: %.o $(NETPBMLIBS) ../shhopt/libshhopt.a >+- $(CC) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) ../shhopt/libshhopt.a \ >++ $(CC) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) ../shhopt/libshhopt.a \ >+ $(JPEGLD) $(CDEBUG) >+ >+ # Rule for math-dependent programs. >+ $(MATHBINARIES): %: %.o $(NETPBMLIBS) >+- $(CC) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLIBS) $(CDEBUG) >++ $(CC) $(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) >+ $(PGMDIR)/$(LIBPGM): >+- cd $(PGMDIR) ; make $(LIBPGM) >++ cd $(PGMDIR) ; $(MAKE) $(LIBPGM) >+ >+-libppm.so: libppm.so.$(MAJ).$(MIN) >+- ln -sf libppm.so.$(MAJ).$(MIN) libppm.so >+-libppm.so.$(MAJ).$(MIN): $(LIBOBJECTS) >+- gcc -shared -Wl,-soname,libppm.so.$(MAJ) -o libppm.so.$(MAJ).$(MIN) \ >+- $(LIBOBJECTS) >++libppm.so: libppm.so.$(MAJ) >++ ln -sf libppm.so.$(MAJ) libppm.so >++libppm.so.$(MAJ): libppm.a $(LIBSOBJECTS) >++ $(CC) -shared -Wl,-x -Wl,-soname,$@ -o $@ $(LIBSOBJECTS) >+ >+ libppm.a: $(LIBOBJECTS) >+ -rm -f $@ >+@@ -146,27 +150,26 @@ >+ >+ ppmmerge: ppmmerge.c $(MERGE_OBJECTS) $(NETPBMLIBS) >+ $(CC) $(CFLAGS) $(INCLUDE) $(LDFLAGS) -o $@ $@.c \ >+- $(MERGE_OBJECTS) -lm $(NETPBMLIBS) >++ $(MERGE_OBJECTS) -lm $(NETPBMLD) >+ >+ >+ .PHONY: install.bin >+ install.bin: $(BINARIES) $(SCRIPTS) >+- cd $(INSTALLBINARIES) ; rm -f $(BINARIES) >+- cp $(BINARIES) $(INSTALLBINARIES) >+- cd $(INSTALLSCRIPTS) ; rm -f $(SCRIPTS) >+- cp $(SCRIPTS) $(INSTALLSCRIPTS) >+- cd $(INSTALLSCRIPTS) ; chmod +x $(SCRIPTS) >++ ${BSD_INSTALL_PROGRAM} $(BINARIES) $(INSTALLBINARIES) >++ ${BSD_INSTALL_SCRIPT} $(SCRIPTS) $(INSTALLSCRIPTS) >+ >+ .PHONY: install.merge >+ install.merge: ppmmerge $(SCRIPTS) >+- cd $(INSTALLBINARIES) ; rm -f $(BINARIES) >+- cp ppmmerge $(INSTALLBINARIES) >++ ${BSD_INSTALL_PROGRAM} ppmmerge $(INSTALLBINARIES) >+ cd $(INSTALLBINARIES) ; for i in $(BINARIES) ; do ln ppmmerge $$i ; done >+ rm -f $(INSTALLBINARIES)/ppmmerge >+- cd $(INSTALLSCRIPTS) ; rm -f $(SCRIPTS) >+- cp $(SCRIPTS) $(INSTALLSCRIPTS) >+- cd $(INSTALLSCRIPTS) ; chmod +x $(SCRIPTS) >++ ${BSD_INSTALL_SCRIPT} $(SCRIPTS) $(INSTALLSCRIPTS) >+ >++.PHONY: install.lib >++install.lib: libppm.a libppm.so.$(MAJ) >++ ${BSD_INSTALL_DATA} ppm.h ppmcmap.h ${PREFIX}/include >++ ${BSD_INSTALL_DATA} libppm.a libppm.so.$(MAJ) $(INSTALLLIBS) >++ cd $(INSTALLLIBS) ; ln -sf libppm.so.$(MAJ) libppm.so >+ >+ .PHONY: install.ma >+ install.man: >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 Thu Mar 23 03:41:50 2000 >@@ -0,0 +1,13 @@ >+--- shhopt/Makefile.orig Fri Mar 10 17:45:19 2000 >++++ shhopt/Makefile Thu Mar 23 03:41:31 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 Thu Mar 23 05:33:01 2000 >@@ -16,6 +16,7 @@ > bin/icontopbm > bin/ilbmtoppm > bin/imgtoppm >+bin/jpegtopnm > bin/lispmtopgm > bin/macptopbm > bin/mgrtopbm >@@ -24,7 +25,6 @@ > bin/pbmlife > bin/pbmmake > bin/pbmmask >-bin/pbmmerge > bin/pbmpscale > bin/pbmreduce > bin/pbmtext >@@ -62,7 +62,6 @@ > bin/pgmenhance > bin/pgmhist > bin/pgmkernel >-bin/pgmmerge > bin/pgmnoise > bin/pgmnorm > bin/pgmoil >@@ -77,6 +76,7 @@ > bin/picttoppm > bin/pjtoppm > bin/pktopbm >+bin/pngtopnm > bin/pnmalias > bin/pnmarith > bin/pnmcat >@@ -94,7 +94,6 @@ > bin/pnmindex > bin/pnminvert > bin/pnmmargin >-bin/pnmmerge > bin/pnmnlfilt > bin/pnmnoraw > bin/pnmpad >@@ -106,11 +105,14 @@ > 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 >@@ -122,7 +124,6 @@ > bin/ppmforge > bin/ppmhist > bin/ppmmake >-bin/ppmmerge > bin/ppmmix > bin/ppmnorm > bin/ppmntsc >@@ -138,6 +139,7 @@ > bin/ppmtogif > bin/ppmtoicr > bin/ppmtoilbm >+bin/ppmtojpeg > bin/ppmtomap > bin/ppmtomitsu > bin/ppmtopcx >@@ -185,6 +187,16 @@ > include/ppm.h > include/ppmcmap.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 /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B >+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=8375">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 17571
: 8375