head 1.15; access; symbols pkgsrc-2014Q2:1.13.0.28 pkgsrc-2014Q2-base:1.13 pkgsrc-2014Q1:1.13.0.26 pkgsrc-2014Q1-base:1.13 pkgsrc-2013Q4:1.13.0.24 pkgsrc-2013Q4-base:1.13 pkgsrc-2013Q3:1.13.0.22 pkgsrc-2013Q3-base:1.13 pkgsrc-2013Q2:1.13.0.20 pkgsrc-2013Q2-base:1.13 pkgsrc-2013Q1:1.13.0.18 pkgsrc-2013Q1-base:1.13 pkgsrc-2012Q4:1.13.0.16 pkgsrc-2012Q4-base:1.13 pkgsrc-2012Q3:1.13.0.14 pkgsrc-2012Q3-base:1.13 pkgsrc-2012Q2:1.13.0.12 pkgsrc-2012Q2-base:1.13 pkgsrc-2012Q1:1.13.0.10 pkgsrc-2012Q1-base:1.13 pkgsrc-2011Q4:1.13.0.8 pkgsrc-2011Q4-base:1.13 pkgsrc-2011Q3:1.13.0.6 pkgsrc-2011Q3-base:1.13 pkgsrc-2011Q2:1.13.0.4 pkgsrc-2011Q2-base:1.13 pkgsrc-2011Q1:1.13.0.2 pkgsrc-2011Q1-base:1.13 pkgsrc-2009Q4:1.11.0.30 pkgsrc-2009Q4-base:1.11 pkgsrc-2009Q3:1.11.0.28 pkgsrc-2009Q3-base:1.11 pkgsrc-2009Q2:1.11.0.26 pkgsrc-2009Q2-base:1.11 pkgsrc-2009Q1:1.11.0.24 pkgsrc-2009Q1-base:1.11 pkgsrc-2008Q4:1.11.0.22 pkgsrc-2008Q4-base:1.11 pkgsrc-2008Q3:1.11.0.20 pkgsrc-2008Q3-base:1.11 cube-native-xorg:1.11.0.18 cube-native-xorg-base:1.11 pkgsrc-2008Q2:1.11.0.16 pkgsrc-2008Q2-base:1.11 cwrapper:1.11.0.14 pkgsrc-2008Q1:1.11.0.12 pkgsrc-2008Q1-base:1.11 pkgsrc-2007Q4:1.11.0.10 pkgsrc-2007Q4-base:1.11 pkgsrc-2007Q3:1.11.0.8 pkgsrc-2007Q3-base:1.11 pkgsrc-2007Q2:1.11.0.6 pkgsrc-2007Q2-base:1.11 pkgsrc-2007Q1:1.11.0.4 pkgsrc-2007Q1-base:1.11 pkgsrc-2006Q4:1.11.0.2 pkgsrc-2006Q4-base:1.11 pkgsrc-2006Q3:1.10.0.4 pkgsrc-2006Q3-base:1.10 pkgsrc-2006Q2:1.10.0.2 pkgsrc-2006Q2-base:1.10 pkgsrc-2006Q1:1.8.0.4 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.2 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.7.0.2 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.6.0.14 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.12 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.10 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.8 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.6 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.4 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.6.0.2 pkgsrc-2003Q4-base:1.6 buildlink2-base:1.6 netbsd-1-5-PATCH001:1.5 netbsd-1-4-PATCH002:1.3 comdex-fall-1999:1.3 netbsd-1-4-PATCH001:1.1 netbsd-1-4-RELEASE:1.1; locks; strict; comment @# @; 1.15 date 2014.09.08.21.22.28; author wiz; state dead; branches; next 1.14; commitid 0IuhkyUPMU5rtAPx; 1.14 date 2014.08.25.08.23.22; author wiz; state Exp; branches; next 1.13; commitid JZNX8Fr2LhvjCINx; 1.13 date 2011.01.14.21.51.59; author tron; state Exp; branches; next 1.12; 1.12 date 2010.02.19.18.25.44; author drochner; state dead; branches; next 1.11; 1.11 date 2006.10.03.22.56.50; author schwarz; state Exp; branches 1.11.30.1; next 1.10; 1.10 date 2006.06.25.06.35.58; author adam; state dead; branches; next 1.9; 1.9 date 2006.05.14.16.39.05; author wiz; state Exp; branches; next 1.8; 1.8 date 2005.10.19.09.30.09; author adam; state dead; branches; next 1.7; 1.7 date 2005.09.20.05.04.11; author schmonz; state Exp; branches; next 1.6; 1.6 date 2002.03.14.22.21.43; author wiz; state dead; branches; next 1.5; 1.5 date 2001.01.10.14.07.22; author bad; state Exp; branches; next 1.4; 1.4 date 2000.05.17.10.13.21; author tron; state dead; branches; next 1.3; 1.3 date 99.10.08.21.18.34; author jlam; state Exp; branches; next 1.2; 1.2 date 99.07.25.21.17.33; author tron; state Exp; branches; next 1.1; 1.1 date 99.01.10.23.52.16; author tron; state Exp; branches; next ; 1.11.30.1 date 2010.02.25.08.43.28; author spz; state dead; branches; next ; desc @@ 1.15 log @Update to 10.67.03. This is the current release of the Advanced branch of netpbm. Lots and lots of changes since our Super Stable release version. @ text @$NetBSD: patch-aj,v 1.14 2014/08/25 08:23:22 wiz Exp $ Fix build with png-1.5. Already included in Advanced release. --- converter/other/pngtxt.h.orig 2006-08-19 04:12:28.000000000 +0100 +++ converter/other/pngtxt.h 2011-01-14 21:39:26.000000000 +0000 @@@@ -5,7 +5,8 @@@@ #include void -pnmpng_read_text (png_info * const info_ptr, +pnmpng_read_text (png_struct * png_ptr, + png_info * const info_ptr, FILE * const tfp, bool const ztxt, bool const verbose); @ 1.14 log @Remove two patches/chunks for ancient problems. Update patch status for the ones that are in upstream releases/will be included soon. @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.13 2011/01/14 21:51:59 tron Exp $ @ 1.13 log @Get "pnmtopng" to build with new "png" package. "pngtopnm" still fails. @ text @d1 1 a1 1 $NetBSD$ d4 1 @ 1.12 log @update to 10.35.73 changes: many bugfixes, especially: xpmtoppm: fix wild pointer with color index > 127. which fixes a stack-based buffer overflow (CVE-2009-4274) pkgsrc change: use a fixed PLIST instead of generating on install, helps to detect problems @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.11 2006/10/03 22:56:50 schwarz Exp $ d3 6 a8 8 --- converter/ppm/sldtoppm.c.orig 2006-09-26 22:50:39.000000000 +0200 +++ converter/ppm/sldtoppm.c 2006-09-26 22:50:58.000000000 +0200 @@@@ -74,7 +74,7 @@@@ void (*slflood) ARGS((struct spolygon *poly, int color)) )); static void slidefind ARGS((char *sname, int dironly, int ucasen)); static void draw ARGS((struct svector *vec, int color)); -static void flood ARGS((struct spolygon *poly, int color)); +static void flood ARGS((struct spolygon *const poly, int const color)); d10 7 a16 2 static int ixdots, iydots; /* Screen size in dots */ static FILE *slfile; /* Slide file descriptor */ @ 1.11 log @ added support for IRIX 5 and in particular the SGI IDO cc. patches were discussed with Bryan Henderson, maintainer of the netpbm code. @ text @d1 1 a1 1 $NetBSD$ @ 1.11.30.1 log @Pullup ticket 3022 - requested by taca security update Revisions pulled up: - pkgsrc/graphics/netpbm/Makefile - pkgsrc/graphics/netpbm/distinfo - pkgsrc/graphics/netpbm/patches/patch-aa - pkgsrc/graphics/netpbm/patches/patch-ao - pkgsrc/graphics/netpbm/patches/patch-da - pkgsrc/graphics/netpbm/patches/patch-db - pkgsrc/graphics/netpbm/patches/patch-dd Files added: pkgsrc/graphics/netpbm/PLIST pkgsrc/graphics/netpbm/patches/patch-ec Files deleted: pkgsrc/graphics/netpbm/patches/patch-ac pkgsrc/graphics/netpbm/patches/patch-af pkgsrc/graphics/netpbm/patches/patch-ag pkgsrc/graphics/netpbm/patches/patch-ai pkgsrc/graphics/netpbm/patches/patch-aj pkgsrc/graphics/netpbm/patches/patch-ak pkgsrc/graphics/netpbm/patches/patch-al pkgsrc/graphics/netpbm/patches/patch-am pkgsrc/graphics/netpbm/patches/patch-an pkgsrc/graphics/netpbm/patches/patch-ap pkgsrc/graphics/netpbm/patches/patch-aq pkgsrc/graphics/netpbm/patches/patch-ar pkgsrc/graphics/netpbm/patches/patch-as pkgsrc/graphics/netpbm/patches/patch-at pkgsrc/graphics/netpbm/patches/patch-au pkgsrc/graphics/netpbm/patches/patch-av pkgsrc/graphics/netpbm/patches/patch-az pkgsrc/graphics/netpbm/patches/patch-ba pkgsrc/graphics/netpbm/patches/patch-ca pkgsrc/graphics/netpbm/patches/patch-ea -------------------------------------------------------------------- Module Name: pkgsrc Committed By: drochner Date: Fri Feb 19 18:25:44 UTC 2010 Modified Files: pkgsrc/graphics/netpbm: Makefile distinfo pkgsrc/graphics/netpbm/patches: patch-aa patch-ao patch-da patch-db patch-dd Added Files: pkgsrc/graphics/netpbm: PLIST pkgsrc/graphics/netpbm/patches: patch-ec Removed Files: pkgsrc/graphics/netpbm/patches: patch-ac patch-af patch-ag patch-ai patch-aj patch-ak patch-al patch-am patch-an patch-ap patch-aq patch-ar patch-as patch-at patch-au patch-av patch-az patch-ba patch-ca patch-ea Log Message: update to 10.35.73 changes: many bugfixes, especially: xpmtoppm: fix wild pointer with color index > 127. which fixes a stack-based buffer overflow (CVE-2009-4274) pkgsrc change: use a fixed PLIST instead of generating on install, helps to detect problems To generate a diff of this commit: cvs rdiff -u -r1.164 -r1.165 pkgsrc/graphics/netpbm/Makefile cvs rdiff -u -r0 -r1.6 pkgsrc/graphics/netpbm/PLIST cvs rdiff -u -r1.71 -r1.72 pkgsrc/graphics/netpbm/distinfo cvs rdiff -u -r1.39 -r1.40 pkgsrc/graphics/netpbm/patches/patch-aa cvs rdiff -u -r1.17 -r0 pkgsrc/graphics/netpbm/patches/patch-ac cvs rdiff -u -r1.12 -r0 pkgsrc/graphics/netpbm/patches/patch-af cvs rdiff -u -r1.18 -r0 pkgsrc/graphics/netpbm/patches/patch-ag cvs rdiff -u -r1.11 -r0 pkgsrc/graphics/netpbm/patches/patch-ai \ pkgsrc/graphics/netpbm/patches/patch-aj cvs rdiff -u -r1.7 -r0 pkgsrc/graphics/netpbm/patches/patch-ak cvs rdiff -u -r1.3 -r0 pkgsrc/graphics/netpbm/patches/patch-al \ pkgsrc/graphics/netpbm/patches/patch-am \ pkgsrc/graphics/netpbm/patches/patch-an \ pkgsrc/graphics/netpbm/patches/patch-ap \ pkgsrc/graphics/netpbm/patches/patch-aq \ pkgsrc/graphics/netpbm/patches/patch-ar \ pkgsrc/graphics/netpbm/patches/patch-as \ pkgsrc/graphics/netpbm/patches/patch-at \ pkgsrc/graphics/netpbm/patches/patch-au cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/netpbm/patches/patch-ao cvs rdiff -u -r1.4 -r0 pkgsrc/graphics/netpbm/patches/patch-av \ pkgsrc/graphics/netpbm/patches/patch-az cvs rdiff -u -r1.5 -r0 pkgsrc/graphics/netpbm/patches/patch-ba cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/netpbm/patches/patch-ca \ pkgsrc/graphics/netpbm/patches/patch-ea cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/netpbm/patches/patch-da \ pkgsrc/graphics/netpbm/patches/patch-db \ pkgsrc/graphics/netpbm/patches/patch-dd cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/netpbm/patches/patch-ec @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.11 2006/10/03 22:56:50 schwarz Exp $ @ 1.10 log @This is a security update, which fixes a buffer overflow vulnerability. Changes 10.34: * Add pamthreshold, pamx, pamtoxvmini. * pammasksharpen: Add -threshold. * pnmtopng: make "N colors found" message verbose-only. * pnmtopng: make "no room in palette" message non-verbose. * picttoppm: Tolerate various PICT file corruptions. * picttoppm: Don't issue warning message when file named 'fontdir' doesn't exist. * libnetpbm: Add ppmd_fill_path(). * ppmtobmp: Fix for PBM input. * bmptopnm: Don't crash on BMP with no color map. * bmptopnm: Fix wrong file name in error messages. * ppmtogif: fix bug: always produces garbage output. * ppmtompeg: fix input from Standard Input. * pnmflip: fix bug: -rotate90, -rotate180, and -rotate270 (and synonyms) don't work when followed by other rotation options. * ppmtoilbm: Fig bug: generates more planes than necessary. * pamtofits: fix buffer overflow in asembling header. * picttoppm: fix bug - interprets some images wrong because of bogus "rowBytes" value. * Redo asprintfN(), etc. so as not to use va_list in a way that doesn't work on some machines. * cameratopam: remove definition of memmem() so it doesn't collide with same in some C libraries. Add memmemN() and MEMEQ to libnetpbm. * Fix build of filename.o. @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.9 2006/05/14 16:39:05 wiz Exp $ d3 8 a10 5 --- lib/Makefile.orig 2006-03-18 20:17:20.000000000 +0000 +++ lib/Makefile @@@@ -184,7 +184,7 @@@@ standardppmdfont.c:standard.ppmdfont compile.h: $(SRCDIR)/buildtools/stamp-date >$@@ || rm $@@ d12 2 a13 5 -util/shhopt.o util/nstring.o: FORCE +util/shhopt.o util/nstring.o util/filename.o: FORCE @@if [ ! -d $(dir $@@) ] ; then mkdir $(dir $@@) ; fi $(MAKE) -C $(dir $@@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@@)Makefile \ SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@@) @ 1.9 log @Add patches for some issues from the known-bugs page, including one that should fix PR 33347 by martijn (build on amd64). Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.8 log @Changes 10.30: Add pambayer. Add pamrgbatopng. Add pamtilt. Thanks Gregg Townsend . pamtotiff: create from pnmtotiff. pamtofits: create from pnmtofits. pamaddnoise: crate from pnmaddnoise. pamarith: Add -divide. pammasksharpen: Add -sharpness. pnmtopng: add -comp_mem_level, -comp_strategy, -comp_method, -comp_window_bits, -comp_buffer_size. pnmtopng: use Shhopt command line processor; replace -chroma with -rgb, -phys with -size, -time with -modtime. pnmremap: Handle multiple image stream. xpmtoppm: Expand capacity from 2K character input lines to 8K character input lines. libnetpbm: improved messages for "color xxx cannot be represented precisely with maxval M" libnetpbm color specification parsing: Improve warning message about rounding. libnetpbm/everything: speed up ppm_writeppmrow() and pgm_writepgmrow() by doing one fwrite per row instead of a pgm_writerawsample() per sample. pnmtopng: fix "meaningful bits" optimization of PGM so it optimizes all the way instead of stopping at 4 bits. pnmtopng: fix crash when no -alpha option, due to dereferencing of undefined alpha_mask. pnmtopng: fix bug: arbitrary color made transparent in paletted PNG when nothing should be transparent. pnmtops: bug: selects wrong Postscript level. bmptopnm: Don't crash on BMP with no color map. bmptopnm: Fix wrong file name in error messages. ppmtowinicon: use REALLOCARRAY instead of arithmetic-overflowing realloc(). anytopnm: fix bug: fails when 'file' database doesn't have mime type but does have human-readable type. manweb: recognize directory as not executable in search of PATH. pgm_allocrow(), ppm_allocrow(), pnm_allocrow(): cure arithmetic overflow. libnetpbm: On plain formats, check for sample value exceeding maxval. libnetpbm: reject maxval > 65535 in "pam" functions. pamarith: Use normalized libnetpbm facilities to get proper accuracy. Thanks Thomas Henlich . pamarith: fix bug: shift functions don't work when maxvals are not identical. pamarith: fix rounding error on multiply. pgmtexture: correct calculation of normalizing constants for d > 1. Thanks Marc Breithecker . pnmnorm: fix divide by zero crash. pnmnorm: fix bug that doesn't let you specify -luminosity, -colorvalue, or -saturation. ilbmtoppm: fix variable used before set. pnmtofits: fix 16 bit sample values > 2**15. pnmtopsnr: minor adjustments to messages. pnmnorm: don't crash when wvalue == bvalue. Thanks Thomas . pnmnorm: fix rounding of output values. Thanks Thomas . pnmhisteq: Fix external map to have width maxval + 1 instead of maxval, so full intensity input pixels map properly. pnmhisteq: Fix -rmap. Fix typos in error messages in various programs. pgmmedian: change syntax to Netpbm standard. pammasksharpen: fix signedness bug that caused random bright pixels at edges. pammasksharpen: fix bug with maxval != 255. Clean up a bunch of function prototypes so some broken compilers don't complain about missing "const" in them. Remove dependency of pnmtops on basename(). It isn't in some C libraries and we don't want to mess with linking extra libraries. Build of ppmsvgalib: work properly when LINUXSVGALIB is a "default path" value such as "libvga.so". @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.7 2005/09/20 05:04:11 schmonz Exp $ d3 5 a7 9 --- editor/pammasksharpen.c.orig 2004-05-29 14:15:46.000000000 -0400 +++ editor/pammasksharpen.c @@@@ -114,10 +114,10 @@@@ main(int argc, char *argv[]) { unsigned int plane; for (plane = 0; plane < outpam.depth; ++plane) { - unsigned int const rawResult = + int const rawResult = 2 * inputTuplerow[col][plane] - maskTuplerow[col][plane]; d9 5 a13 5 - outputTuplerow[col][plane] = MIN(255, MAX(0, rawResult)); + outputTuplerow[col][plane] = MIN(outpam.maxval, MAX(0, rawResult)); } } pnm_writepamrow(&outpam, outputTuplerow); @ 1.7 log @Apply patches for the three 10.29 bugs listed on SourceForge we hadn't already fixed. The list: http://sourceforge.net/project/shownotes.php?group_id=5128&release_id=349291 The problems fixed in this PKGREVISION bump: * pnmtopng: can crash due to wild pointer if you don't use the -alpha option. * pammasksharpen: Multiple bugs cause it to produce incorrect output. * pnmhisteq: -rmap doesn't work. Addresses my own PR pkg/31314, with thanks to Nathan Arthur for bringing these patches to my attention. @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Update to 9.24. pkgsrc changes: Don't use libtool any longer to reduce patches. Add USE_PERL, since 4 scripts depend on it. program changes: Lots of new converters/modification programs and scripts, e.g. pbmtonokia, ppmtolj, and pnmtopalm. Better alpha support. Also, lots of bug fixes. @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.5 2001/01/10 14:07:22 bad Exp $ d3 9 a11 4 --- pnm/fiasco/lib/Makefile.orig Fri Jul 7 00:23:44 2000 +++ pnm/fiasco/lib/Makefile Wed Jan 10 14:49:33 2001 @@@@ -14,7 +14,8 @@@@ all: libfiasco_lib.a d13 5 a17 7 libfiasco_lib.a: $(OBJECTS) - ar -rc $@@ $(OBJECTS) + $(AR) -rc $@@ $(OBJECTS) + $(RANLIB) $@@ .PHONY: clean clean: clean.common @ 1.5 log @The fiasco libraries need to be ranlib'ed. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Update "netpbm" package to version 9.2. There are too many changes and bug fixes to list here. Main new features are shared libraries, JPEG and JBIG support. @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.3 1999/10/08 21:18:34 jlam Exp $ d3 9 a11 4 --- pnm/Makefile.orig Mon Jan 31 11:47:32 1994 +++ pnm/Makefile Fri Oct 8 13:33:59 1999 @@@@ -10,27 +10,30 @@@@ # implied warranty. d13 2 a14 164 # Default values, usually overridden by top-level Makefile. -#CC = cc -CC = gcc -ansi -pedantic -fcombine-regs -fpcc-struct-return +CC = gcc +#CC = gcc -ansi -pedantic -fcombine-regs -fpcc-struct-return #CFLAGS = -O -CFLAGS = -g +CFLAGS = -O2 #CFLAGS = -g -O TIFFDEF = -DLIBTIFF -TIFFINC = -I../libtiff -TIFFLIB = ../libtiff/libtiff.a +TIFFINC = -I$(LOCALBASE)/include +TIFFLIB = -Wl,-R$(LOCALBASE)/lib -L$(LOCALBASE)/lib -ltiff -ljpeg -lz TIFFBINARIES = tifftopnm pnmtotiff TIFFOBJECTS = tifftopnm.o pnmtotiff.o -#LDFLAGS = -s -LDFLAGS = -INSTALLBINARIES = /usr/new/pbm +PNGLIB = -Wl,-R$(LOCALBASE)/lib -L$(LOCALBASE)/lib -lpng -lz +LDFLAGS = -s +#LDFLAGS = +INSTALLBINARIES = $(PREFIX)/bin INSTALLSCRIPTS = $(INSTALLBINARIES) -INSTALLMANUALS1 = /usr/man/man1 +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 = install -c -m 0644 +INSTALLLIBS = $(PREFIX)/lib +INSTALLDEFS = $(PREFIX)/include PPMDIR = ../ppm INCLUDEPPM = -I$(PPMDIR) @@@@ -54,48 +57,52 @@@@ INCLUDE = -I.. $(INCLUDEPPM) $(INCLUDEPGM) $(INCLUDEPBM) ALLCFLAGS = $(CFLAGS) $(INCLUDE) $(TIFFDEF) $(TIFFINC) LIBPNM = libpnm.a +DEFPNM = pnm.h PORTBINARIES = fitstopnm giftopnm \ pnmalias pnmarith pnmcat pnmcomp pnmconvol pnmcrop \ pnmcut pnmdepth pnmenlarge pnmfile pnmflip pnmhistmap \ pnminvert pnmnoraw pnmpad pnmpaste \ pnmtile pnmtoddif pnmtofits pnmtops pnmtorast \ - pnmtosgi pnmtosir pnmtoxwd \ - rasttopnm sgitopnm sirtopnm xwdtopnm zeisstopnm + pnmtorle pnmtosgi pnmtosir pnmtoxwd \ + rasttopnm rletopnm sgitopnm sirtopnm xwdtopnm zeisstopnm \ + pnmsmooth pnmhisteq MATHBINARIES = pnmgamma pnmnlfilt pnmrotate pnmscale pnmshear -BINARIES = $(PORTBINARIES) $(MATHBINARIES) $(TIFFBINARIES) -SCRIPTS = anytopnm pnmindex pnmmargin pnmsmooth pstopnm +PNGBINARIES = pngtopnm pnmtopng +BINARIES = $(PORTBINARIES) $(MATHBINARIES) $(PNGBINARIES) $(TIFFBINARIES) +SCRIPTS = anytopnm pnmindex pnmmargin pstopnm PORTOBJECTS = fitstopnm.o giftopnm.o \ pnmalias.o pnmarith.o pnmcat.o pnmcomp.o pnmconvol.o pnmcrop.o \ pnmcut.o pnmdepth.o pnmenlarge.o pnmfile.o pnmflip.o pnmhistmap.o \ - pnminvert.o pnmnoraw.o pnmpad.o pnmpaste.o \ + pnmhisteq.o pnminvert.o pnmnoraw.o pnmpad.o pnmpaste.o\ pnmtile.o pnmtoddif.o pnmtofits.o pnmtops.o pnmtorast.o \ pnmtosgi.o pnmtosir.o pnmtoxwd.o \ rasttopnm.o sgitopnm.o sirtopnm.o xwdtopnm.o zeisstopnm.o \ + pnmsmooth.o pnmhisteq.o \ pnmgamma.o pnmnlfilt.o pnmrotate.o pnmscale.o pnmshear.o -OBJECTS = $(PORTOBJECTS) $(TIFFOBJECTS) +OBJECTS = $(PORTOBJECTS) MANUALS1 = $(BINARIES) $(SCRIPTS) MANUALS3 = libpnm MANUALS5 = pnm -#all: binaries -all: merge -#install: install.bin -install: install.merge +all: binaries +#all: merge +install: install.bin +#install: install.merge binaries: $(BINARIES) install.bin: binaries $(SCRIPTS) cd $(INSTALLBINARIES) ; rm -f $(BINARIES) - cp $(BINARIES) $(INSTALLBINARIES) + install -c -s -m 0755 $(BINARIES) $(INSTALLBINARIES) cd $(INSTALLSCRIPTS) ; rm -f $(SCRIPTS) - cp $(SCRIPTS) $(INSTALLSCRIPTS) - cd $(INSTALLSCRIPTS) ; chmod +x $(SCRIPTS) - + install -c -m 0755 $(SCRIPTS) $(INSTALLSCRIPTS) + install -c -m 0644 $(LIBPNM) $(INSTALLLIBS) + install -c -m 0644 $(DEFPNM) $(INSTALLDEFS) merge: pnmmerge pnmmerge: pnmmerge.c $(OBJECTS) $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) @@@@ -128,16 +135,22 @@@@ # Rules for plain programs. -$(PORTBINARIES) $(TIFFBINARIES): pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) $(TIFFLIB) - $(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@@ $@@.c $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) $(TIFFLIB) +$(PORTBINARIES): $(DEFPNM) $(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) + $(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@@ $@@.c $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) + +$(PNGBINARIES): $(DEFPNM) $(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) + $(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@@ $@@.c $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) $(PNGLIB) -lm + +$(TIFFBINARIES): $(DEFPNM) $(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) + $(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@@ $@@.c $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) $(TIFFLIB) -lm # Rule for math-dependent programs. -$(MATHBINARIES): pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPNM) \ +$(MATHBINARIES): $(DEFPNM) $(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPNM) \ $(LIBPPM) $(LIBPGM) $(LIBPBM) $(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@@ $@@.c -lm $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) # Rule for objects. -$(OBJECTS): pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM) +$(OBJECTS): $(DEFPNM) $(DEFPPM) $(DEFPGM) $(DEFPBM) $(CC) $(ALLCFLAGS) "-Dmain=$*_main" -c $*.c # And libraries. @@@@ -153,15 +166,15 @@@@ ar rc $(LIBPNM) libpnm1.o libpnm2.o libpnm3.o libpnm4.o -ranlib $(LIBPNM) -libpnm1.o: pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM) libpnm1.c +libpnm1.o: $(DEFPNM) $(DEFPPM) $(DEFPGM) $(DEFPBM) libpnm1.c $(CC) $(ALLCFLAGS) -c libpnm1.c -libpnm2.o: pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM) libpnm2.c $(DEFLIBPPM) \ +libpnm2.o: $(DEFPNM) $(DEFPPM) $(DEFPGM) $(DEFPBM) libpnm2.c $(DEFLIBPPM) \ $(DEFLIBPGM) $(DEFLIBPBM) $(CC) $(ALLCFLAGS) -c libpnm2.c -libpnm3.o: pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM) libpnm3.c $(DEFLIBPPM) \ +libpnm3.o: $(DEFPNM) $(DEFPPM) $(DEFPGM) $(DEFPBM) libpnm3.c $(DEFLIBPPM) \ $(DEFLIBPGM) $(DEFLIBPBM) $(CC) $(ALLCFLAGS) -c libpnm3.c -libpnm4.o: pnm.h $(DEFPPM) $(DEFPGM) $(DEFPBM) rast.h libpnm4.c +libpnm4.o: $(DEFPNM) $(DEFPPM) $(DEFPGM) $(DEFPBM) rast.h libpnm4.c $(CC) $(ALLCFLAGS) -c libpnm4.c # Other dependencies. @@@@ -202,6 +215,8 @@@@ tifftopnm tifftopnm.o: tifftopnm.c xwdtopnm xwdtopnm.o: xwdtopnm.c x10wd.h x11wd.h zeisstopnm zeisstopnm.o: zeisstopnm.c +pnmhisteq pnmhisteq.o: pnmhisteq.c +pnmsmooth pnmsmooth.o: pnmsmooth.c clean: - -rm -f *.o *.a *.cat *~ core $(BINARIES) pnmmerge + -rm -f *.o *.a *.cat *~ core *.core $(BINARIES) pnmmerge @ 1.3 log @* Remove redundant dependency on jpeg * Update dependency on tiff * Fixes for paths to find libraries and includes @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Fix run time library path. Patches supplied by Dave Huang in PR pkg/8071. @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.1 1999/01/10 23:52:16 tron Exp $ d3 3 a5 3 --- pnm/Makefile.orig Mon Jan 31 17:47:32 1994 +++ pnm/Makefile Mon Jan 11 00:18:48 1999 @@@@ -10,27 +10,29 @@@@ d20 2 a21 2 +TIFFINC = -I$(PREFIX)/include +TIFFLIB = -Wl,-R$(PREFIX)/lib -L$(PREFIX)/lib -ltiff -ljpeg d27 1 d48 1 a48 1 @@@@ -54,48 +56,52 @@@@ d115 1 a115 1 @@@@ -128,16 +134,22 @@@@ d125 1 a125 1 + $(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@@ $@@.c $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -lpng -lz -lm d128 1 a128 1 + $(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@@ $@@.c $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) $(TIFFLIB) -lm -lz d142 1 a142 1 @@@@ -153,15 +165,15 @@@@ d162 1 a162 1 @@@@ -202,6 +214,8 @@@@ @ 1.1 log @Major cleanup of "netpbm" package based on patches supply by John F. Woods in PR pkg/6763 and Rob Windsor in PR pkg/6779. @ text @d1 1 a1 1 $NetBSD$ d21 1 a21 1 +TIFFLIB = -L$(PREFIX)/lib -ltiff -ljpeg d124 1 a124 1 + $(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@@ $@@.c $(LIBPNM) $(LIBPPM) $(LIBPGM) $(LIBPBM) -L${LOCALBASE}/lib -lpng -lz -lm @