head 1.11; access; symbols pkgsrc-2014Q2:1.10.0.80 pkgsrc-2014Q2-base:1.10 pkgsrc-2014Q1:1.10.0.78 pkgsrc-2014Q1-base:1.10 pkgsrc-2013Q4:1.10.0.76 pkgsrc-2013Q4-base:1.10 pkgsrc-2013Q3:1.10.0.74 pkgsrc-2013Q3-base:1.10 pkgsrc-2013Q2:1.10.0.72 pkgsrc-2013Q2-base:1.10 pkgsrc-2013Q1:1.10.0.70 pkgsrc-2013Q1-base:1.10 pkgsrc-2012Q4:1.10.0.68 pkgsrc-2012Q4-base:1.10 pkgsrc-2012Q3:1.10.0.66 pkgsrc-2012Q3-base:1.10 pkgsrc-2012Q2:1.10.0.64 pkgsrc-2012Q2-base:1.10 pkgsrc-2012Q1:1.10.0.62 pkgsrc-2012Q1-base:1.10 pkgsrc-2011Q4:1.10.0.60 pkgsrc-2011Q4-base:1.10 pkgsrc-2011Q3:1.10.0.58 pkgsrc-2011Q3-base:1.10 pkgsrc-2011Q2:1.10.0.56 pkgsrc-2011Q2-base:1.10 pkgsrc-2011Q1:1.10.0.54 pkgsrc-2011Q1-base:1.10 pkgsrc-2010Q4:1.10.0.52 pkgsrc-2010Q4-base:1.10 pkgsrc-2010Q3:1.10.0.50 pkgsrc-2010Q3-base:1.10 pkgsrc-2010Q2:1.10.0.48 pkgsrc-2010Q2-base:1.10 pkgsrc-2010Q1:1.10.0.46 pkgsrc-2010Q1-base:1.10 pkgsrc-2009Q4:1.10.0.44 pkgsrc-2009Q4-base:1.10 pkgsrc-2009Q3:1.10.0.42 pkgsrc-2009Q3-base:1.10 pkgsrc-2009Q2:1.10.0.40 pkgsrc-2009Q2-base:1.10 pkgsrc-2009Q1:1.10.0.38 pkgsrc-2009Q1-base:1.10 pkgsrc-2008Q4:1.10.0.36 pkgsrc-2008Q4-base:1.10 pkgsrc-2008Q3:1.10.0.34 pkgsrc-2008Q3-base:1.10 cube-native-xorg:1.10.0.32 cube-native-xorg-base:1.10 pkgsrc-2008Q2:1.10.0.30 pkgsrc-2008Q2-base:1.10 cwrapper:1.10.0.28 pkgsrc-2008Q1:1.10.0.26 pkgsrc-2008Q1-base:1.10 pkgsrc-2007Q4:1.10.0.24 pkgsrc-2007Q4-base:1.10 pkgsrc-2007Q3:1.10.0.22 pkgsrc-2007Q3-base:1.10 pkgsrc-2007Q2:1.10.0.20 pkgsrc-2007Q2-base:1.10 pkgsrc-2007Q1:1.10.0.18 pkgsrc-2007Q1-base:1.10 pkgsrc-2006Q4:1.10.0.16 pkgsrc-2006Q4-base:1.10 pkgsrc-2006Q3:1.10.0.14 pkgsrc-2006Q3-base:1.10 pkgsrc-2006Q2:1.10.0.12 pkgsrc-2006Q2-base:1.10 pkgsrc-2006Q1:1.10.0.10 pkgsrc-2006Q1-base:1.10 pkgsrc-2005Q4:1.10.0.8 pkgsrc-2005Q4-base:1.10 pkgsrc-2005Q3:1.10.0.6 pkgsrc-2005Q3-base:1.10 pkgsrc-2005Q2:1.10.0.4 pkgsrc-2005Q2-base:1.10 pkgsrc-2005Q1:1.10.0.2 pkgsrc-2005Q1-base:1.10 pkgsrc-2004Q4:1.9.0.10 pkgsrc-2004Q4-base:1.9 pkgsrc-2004Q3:1.9.0.8 pkgsrc-2004Q3-base:1.9 pkgsrc-2004Q2:1.9.0.6 pkgsrc-2004Q2-base:1.9 pkgsrc-2004Q1:1.9.0.4 pkgsrc-2004Q1-base:1.9 pkgsrc-2003Q4:1.9.0.2 pkgsrc-2003Q4-base:1.9 buildlink2-base:1.8 netbsd-1-5-PATCH001:1.7 netbsd-1-5-RELEASE:1.7 netbsd-1-4-PATCH003:1.7 netbsd-1-4-PATCH002:1.3 comdex-fall-1999:1.3 netbsd-1-4-PATCH001:1.3 netbsd-1-4-RELEASE:1.3 FreeBSD-current-1997-10-09:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.11 date 2014.09.08.21.22.28; author wiz; state dead; branches; next 1.10; commitid 0IuhkyUPMU5rtAPx; 1.10 date 2005.01.18.14.16.20; author adam; state Exp; branches; next 1.9; 1.9 date 2003.09.07.17.22.16; author jschauma; state Exp; branches; next 1.8; 1.8 date 2002.03.14.22.21.43; author wiz; state dead; branches; next 1.7; 1.7 date 2000.08.10.10.44.10; author wiz; state Exp; branches; next 1.6; 1.6 date 2000.07.10.11.12.10; author wiz; state Exp; branches; next 1.5; 1.5 date 2000.06.05.00.36.31; author wiz; state Exp; branches; next 1.4; 1.4 date 2000.05.17.10.13.20; author tron; state dead; branches; next 1.3; 1.3 date 99.01.10.23.52.16; author tron; state Exp; branches; next 1.2; 1.2 date 97.12.31.03.34.55; author hubertf; state dead; branches; next 1.1; 1.1 date 97.10.15.15.12.13; author agc; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 97.10.15.15.12.13; author agc; state Exp; branches; next ; desc @@ 1.11 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-ae,v 1.10 2005/01/18 14:16:20 adam Exp $ --- generator/pbmtextps.c.orig 2003-10-08 02:39:27.000000000 +0000 +++ generator/pbmtextps.c @@@@ -15,7 +15,6 @@@@ * Additions by Bryan Henderson contributed to public domain by author. * */ -#define _XOPEN_SOURCE /* Make sure popen() is in stdio.h */ #define _BSD_SOURCE /* Make sure stdrup() is in string.h */ #include #include @ 1.10 log @Changes 10.26.1: * pamcomp: fix bug that duplicates last row of overlay image. * pamcut: fix bug that fills the rightmost column with black. * pnmtopalm: fix bug with -offset option. * ppmforge: fix bug: crash due to wild pointer with -night. Changes 10.26: * pnmhistmap: Add -dots, -nmax, -red, -green, -blue, -lval, -rval, -height, and -width options. * pnmnorm: accept -wpercent and -wvalue (or -bpercent and -bvalue) together. Thanks Gregg Townsend . * xwdtopnm: Add -headerdump option. * pnmtoxwd: Include 256 color color maps in direct color instead of zero. Zero has a weird effect. * pamtotga: recognize RGB_ALPHA instead of RGBA. * palmtopnm: fix bug in determination of compression type. * palmtopnm: fix bug in handling of multi-image streams. * pnmtopalm: fix bugs in computation of nextDepthOffset. * pamtotga: fix TGA pixel size for TGA with alpha. Don't do colormap if input has transparency. * pamtotga: fix crash due to uninitialized "id" field in TGA header. * pbm_writepbmrow(): Fix bug in MMX/SSE code that causes segmentation fault. * pnmhistmap: Fix bug: doesn't work with maxval != 255. * pbmtext: fix crash with code point > 127. * ppmtompeg: major cleanup. * pnmtopng: fix "internal error" and crash bug with -transparent. * pnmtoxwd: fix endianness on littleendian machines. * pnmtoxwd: fix bug: doesn't work if you specify an option. * jpegtopnm: fix bug: -dumpexif all wrong. * jpegtopnm: fix bug: newline written to stdout instead of stderr with -dumpexif. * Add missing 'col' declaration so -msse compile works. * pcdovtoppm: fix syntax error * pnmtojbig/jbigtopnm: add newline to "usage" message. * pamperspective: fix bugs with -frame_include, etc. * build: Jeg2k programs build properly with newer Jasper library. * build: Fix bug: "no rule to build xxx.so" with external * Jasper or Jbig library. * Add NAME and DESCRIPTION section to pointer man pages. @ text @d1 1 a1 1 $NetBSD$ @ 1.9 log @Make this compile on Irix. (use 'ar rs' instead of ranlib on Irix, don't use '-fPIC', make sure strdup is properly prototyped) @ text @d1 1 a1 1 $NetBSD: $ d3 4 a6 4 --- generator/pbmtextps.c.orig Sat Sep 6 23:31:49 2003 +++ generator/pbmtextps.c Sat Sep 6 23:32:23 2003 @@@@ -13,7 +13,6 @@@@ * PostScript is a registered trademark of Adobe Systems International. @ 1.8 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-ae,v 1.7 2000/08/10 10:44:10 wiz Exp $ d3 4 a6 3 --- ppm/ppmtompeg/parallel.c.orig Sat Jul 1 09:51:53 2000 +++ ppm/ppmtompeg/parallel.c Thu Aug 10 12:14:53 2000 @@@@ -70,9 +70,6 @@@@ d9 4 a12 7 -#define _POSIX_SOURCE -#define _POSIX_C_SOURCE 2 - /* This makes sure pclose() is in stdio.h */ /* On SunOS 5.6, netinet/in.h, via sys/vnode.h uses non-POSIX typedefs, but when _POSIX_SOURCE is defined, it doesn't cause those typedefs to be defined. In later releases, this is fixed. If we @ 1.7 log @Update to 9.7. Changes: Many bugfixes, new pam file format. @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Update to netpbm-9.5. Fixes pkg/8949. Changes: o Extend formats to allow multiple images per file. Add -allimages option to pnmfile. Add pnmsplit. Extend pnmtops. o Add pbmtowbmp, wbmptopbm. Thanks Terje Sannum. o ppmtobmp: Add 24 bit (truecolor) capability. o pnmcut: easier, more expressive syntax for specifying what to cut. o pnminterp: handle maxval != 255, convert to use Netpbm libraries. o Translate pstopnm from Csh to C, eliminate dependency on the 'bc' program. o Fix bug in tiff library build which caused null soname. o Add optParseopt2() to shhopt.a so you can use long options with one hyphen instead of two. o giftopnm: fix bug with variable used before set. Fix bug (coding error -- 0=>i). Unknown impact. o bmptoppm: fix bug with 24 bit (truecolor) Windows BMPs. o xwdtopnm: fix one more bug with bits_per_item <> bits_per_pixel. o Fix ppmtompeg build bug with static libraries. o Make build clean with gcc -ansi (albeit with some files that need extensions declaring the _BSD_SOURCE etc.). o Rebase pnmtopng, pngtopnm on Pnmtopng 2.37.4. o pbmtolj: fix bug where blank lines get discarded. Thanks Charles Howes. o ppmtompeg: fix bug with "PNM" format files with maxval != 255. Get rid of built-in PPM file parsing. o Fix 'make install' where mkinstalldirs is not found. o Fix bug where rle_global.c would not compile with GNU C Library 2. @ text @d3 3 a5 3 --- ppm/ppmtompeg/parallel.c.orig Fri Jun 30 20:04:09 2000 +++ ppm/ppmtompeg/parallel.c Mon Jul 10 00:37:49 2000 @@@@ -70,10 +70,6 @@@@ d12 3 a14 4 - /*==============* * HEADER FILES * *==============*/ @ 1.5 log @Update to 9.3. Use USE_LIBTOOL instead of USE_PKGLIBTOOL. Changes since 9.2: o pnmfile: check for file size error. o ppmhist: handle larger maxvals, image sizes o xwdtopnm: Use color map with DirectColor to fix wrong color bug on some DirectColor xwds. o xwdtopnm: Correct bug with 24/32 DirectColor LSBfirst xwds. o Add pXmcheck() library function. o Add leaftoppm and ppmtoleaf. Thanks Bill O'Donnell. o Add winicontoppm and ppmtowinicon. Thanks Lee Benfield. o Add pgmslice. Thanks to Jos Dingjan. o Include subset of RLE library in the package. o stamp-date doesn't rely on whoami. o Make file fixes to accomodate more install programs. o Replace tmpnam() with mkstemp(). o Add pXm_init() into all programs that didn't have it. @ text @d3 5 a7 4 --- pbm/pbmtoppa/Makefile.orig Thu Jun 1 19:27:29 2000 +++ pbm/pbmtoppa/Makefile Mon Jun 5 01:44:49 2000 @@@@ -15,7 +15,7 @@@@ merge: pbmtoppa d9 7 a15 6 pbmtoppa: pbmtoppa.o ppa.o pbm.o cutswath.o $(NETPBMLIBS) $(LIBOPT) - $(CC) $(LDFLAGS) -o pbmtoppa pbmtoppa.o ppa.o pbm.o cutswath.o \ + $(LD) $(LDFLAGS) -o pbmtoppa pbmtoppa.o ppa.o pbm.o cutswath.o \ `$(LIBOPT) $(NETPBMLIBS)` %.o: %.c @ 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-ae,v 1.3 1999/01/10 23:52:16 tron Exp $ d3 4 a6 12 --- pbm/pbmmerge.c.orig Wed Nov 3 10:28:55 1993 +++ pbm/pbmmerge.c Sun Jan 10 23:48:40 1999 @@@@ -29,6 +29,10 @@@@ { ++argv; --argc; + if(!*argv) { + fprintf(stderr, "Usage: pbmmerge pbm_program_name [args ...]\n"); + exit(1); + } goto again; } d8 6 @ 1.3 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$ @ 1.2 log @Update to more current version; fixes PR 4737 by Matthias Scheler . @ text @d1 14 a14 4 --- ./pnm/anytopnm.org Mon Oct 4 02:11:29 1993 +++ ./pnm/anytopnm Sat Aug 12 15:05:58 1995 @@@@ -53,7 +53,7 @@@@ ;; a15 63 *GIF* ) - giftoppm "$file" + giftopnm "$file" break ;; @@@@ -130,7 +130,7 @@@@ fitstopgm "$file" ;; *.gif | *.gif.* ) - giftoppm "$file" + giftopnm "$file" ;; *.iff | *.iff.* | *.ilbm | *.ilbm.* ) ilbmtoppm "$file" --- ./ppm/ppm.5.org Mon Oct 4 02:12:19 1993 +++ ./ppm/ppm.5 Sat Aug 12 15:06:18 1995 @@@@ -73,7 +73,7 @@@@ it will automatically fall back on the slower but more general plain format. .SH "SEE ALSO" -giftoppm(1), gouldtoppm(1), ilbmtoppm(1), imgtoppm(1), mtvtoppm(1), +giftopnm(1), gouldtoppm(1), ilbmtoppm(1), imgtoppm(1), mtvtoppm(1), pcxtoppm(1), pgmtoppm(1), pi1toppm(1), picttoppm(1), pjtoppm(1), qrttoppm(1), rawtoppm(1), rgb3toppm(1), sldtoppm(1), spctoppm(1), sputoppm(1), tgatoppm(1), ximtoppm(1), xpmtoppm(1), yuvtoppm(1), --- ./ppm/ppmtoicr.1.org Mon Oct 4 02:12:38 1993 +++ ./ppm/ppmtoicr.1 Sat Aug 12 15:06:36 1995 @@@@ -83,7 +83,7 @@@@ the displayed image by a factor of 2, and run-length encode the data: .nf - giftoppm giffile | ppmtoicr -w giffile -r -e 2 + giftopnm giffile | ppmtoicr -w giffile -r -e 2 .fi .SH BUGS .PP --- ./ppm/ppmtogif.1.org Sat Aug 12 15:08:41 1995 +++ ./ppm/ppmtogif.1 Sat Aug 12 15:06:51 1995 @@@@ -54,7 +54,7 @@@@ .PP All flags can be abbreviated to their shortest unique prefix. .SH "SEE ALSO" -giftoppm(1), ppmquant(1), ppm(5) +giftopnm(1), ppmquant(1), ppm(5) .SH AUTHOR Based on GIFENCOD by David Rowley . Lempel-Ziv compression based on "compress". --- pnm/pnmarith.c~ Wed Jan 5 04:04:53 1994 +++ pnm/pnmarith.c Mon Aug 19 14:20:21 1996 @@@@ -142,9 +142,9 @@@@ break; case '*': - r1 = r1 * r2 / maxval3; - g1 = g1 * g2 / maxval3; - b1 = b1 * b2 / maxval3; + r1 = (unsigned) r1 * r2 / maxval3; + g1 = (unsigned)g1 * g2 / maxval3; + b1 =(unsigned) b1 * b2 / maxval3; break; case 'D': @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @Initial import of FreeBSD's netpbm port into the NetBSD packages system. @ text @@