head 1.5; access; symbols pkgsrc-2014Q2:1.3.0.66 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.64 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.62 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.60 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.58 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.56 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.54 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.52 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.50 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.48 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.46 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.44 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.42 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.40 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.38 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.36 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.34 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.32 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.30 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.28 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.26 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.24 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.22 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.20 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.18 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.16 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.14 pkgsrc-2008Q1:1.3.0.12 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.10 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.8 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.6 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.4 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.2 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.2.0.24 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.22 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.20 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.18 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.16 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.14 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 buildlink2-base:1.2 netbsd-1-4-PATCH002:1.1 comdex-fall-1999:1.1 netbsd-1-4-PATCH001:1.1 netbsd-1-4-RELEASE:1.1; locks; strict; comment @# @; 1.5 date 2014.09.08.21.22.29; author wiz; state dead; branches; next 1.4; commitid 0IuhkyUPMU5rtAPx; 1.4 date 2014.08.25.08.23.22; author wiz; state Exp; branches; next 1.3; commitid JZNX8Fr2LhvjCINx; 1.3 date 2006.11.19.15.50.59; author tron; state Exp; branches; next 1.2; 1.2 date 2000.05.17.10.13.23; author tron; state dead; branches; next 1.1; 1.1 date 99.01.10.23.52.17; author tron; state Exp; branches; next ; desc @@ 1.5 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-ax,v 1.4 2014/08/25 08:23:22 wiz Exp $ Fix unportablet test(1) construct. Will be included in next Advanced release. --- converter/ppm/hpcdtoppm/pcdovtoppm.orig 2004-10-23 00:12:12.000000000 +0100 +++ converter/ppm/hpcdtoppm/pcdovtoppm 2006-11-19 15:46:03.000000000 +0000 @@@@ -195,7 +195,7 @@@@ rowfiles="$rowfiles $rowfile" fi -if [ ${#rowfiles[*]} == 1 ]; then +if [ ${#rowfiles[*]} = 1 ]; then cat $rowfiles else if [ "$colors" = "n" ] ; then @ 1.4 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-ax,v 1.3 2006/11/19 15:50:59 tron Exp $ @ 1.3 log @Fix non-portable shell script "pcdovtoppm". @ text @d1 4 a4 1 $NetBSD$ @ 1.2 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-ax,v 1.1 1999/01/10 23:52:17 tron Exp $ d3 11 a13 122 --- ppm/Makefile.orig Mon Jan 31 17:44:34 1994 +++ ppm/Makefile Mon Jan 11 00:18:52 1999 @@@@ -10,22 +10,24 @@@@ # implied warranty. # 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 -#LDFLAGS = -s -LDFLAGS = -INSTALLBINARIES = /usr/new/pbm +LDFLAGS = -s +#LDFLAGS = +INSTALLBINARIES = $(PREFIX)/bin INSTALLSCRIPTS = $(INSTALLBINARIES) -INSTALLMANUALS1 = /usr/man/mann +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 = install -c -m 0644 +INSTALLLIBS = $(PREFIX)/lib +INSTALLDEFS = $(PREFIX)/include PGMDIR = ../pgm INCLUDEPGM = -I$(PGMDIR) @@@@ -43,6 +45,7 @@@@ INCLUDE = -I.. $(INCLUDEPGM) $(INCLUDEPBM) ALLCFLAGS = $(CFLAGS) $(INCLUDE) LIBPPM = libppm.a +DEFPPM = ppm.h PORTBINARIES = bmptoppm gouldtoppm hpcdtoppm ilbmtoppm imgtoppm \ mtvtoppm pcxtoppm pgmtoppm pi1toppm picttoppm \ @@@@ -85,21 +88,21 @@@@ MANUALS5 = ppm -#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 $(LIBPPM) $(INSTALLLIBS) + install -c -m 0644 $(DEFPPM) $(INSTALLDEFS) merge: ppmmerge ppmmerge: ppmmerge.c $(OBJECTS) $(LIBPPM) $(LIBPGM) $(LIBPBM) @@@@ -132,15 +135,15 @@@@ # Rule for plain programs. -$(PORTBINARIES): ppm.h $(DEFPGM) $(DEFPBM) $(LIBPPM) $(LIBPGM) $(LIBPBM) +$(PORTBINARIES): $(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPPM) $(LIBPGM) $(LIBPBM) $(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@@ $@@.c $(LIBPPM) $(LIBPGM) $(LIBPBM) # Rule for math-dependent programs. -$(MATHBINARIES): ppm.h $(DEFPGM) $(DEFPBM) $(LIBPPM) $(LIBPGM) $(LIBPBM) +$(MATHBINARIES): $(DEFPPM) $(DEFPGM) $(DEFPBM) $(LIBPPM) $(LIBPGM) $(LIBPBM) $(CC) $(ALLCFLAGS) $(LDFLAGS) -o $@@ $@@.c -lm $(LIBPPM) $(LIBPGM) $(LIBPBM) # Rule for objects. -$(OBJECTS): ppm.h $(DEFPGM) $(DEFPBM) +$(OBJECTS): $(DEFPPM) $(DEFPGM) $(DEFPBM) $(CC) $(ALLCFLAGS) "-Dmain=$*_main" -c $*.c # And libraries. @@@@ -155,16 +158,16 @@@@ libppm5.o bitio.o -ranlib $(LIBPPM) -libppm1.o: ppm.h $(DEFPGM) $(DEFPBM) libppm.h libppm1.c +libppm1.o: $(DEFPPM) $(DEFPGM) $(DEFPBM) libppm.h libppm1.c $(CC) $(ALLCFLAGS) -c libppm1.c -libppm2.o: ppm.h $(DEFPGM) $(DEFPBM) libppm.h libppm2.c $(DEFLIBPGM) \ +libppm2.o: $(DEFPPM) $(DEFPGM) $(DEFPBM) libppm.h libppm2.c $(DEFLIBPGM) \ $(DEFLIBPBM) $(CC) $(ALLCFLAGS) -c libppm2.c -libppm3.o: ppm.h $(DEFPGM) $(DEFPBM) ppmcmap.h libppm.h libppm3.c +libppm3.o: $(DEFPPM) $(DEFPGM) $(DEFPBM) ppmcmap.h libppm.h libppm3.c $(CC) $(ALLCFLAGS) -c libppm3.c -libppm4.o: ppm.h $(DEFPGM) $(DEFPBM) libppm4.c +libppm4.o: $(DEFPPM) $(DEFPGM) $(DEFPBM) libppm4.c $(CC) $(ALLCFLAGS) -c libppm4.c -libppm5.o: ppm.h $(DEFPGM) $(DEFPBM) ppmdraw.h libppm5.c +libppm5.o: $(DEFPPM) $(DEFPGM) $(DEFPBM) ppmdraw.h libppm5.c $(CC) $(ALLCFLAGS) -c libppm5.c bitio.o: ../pbmplus.h bitio.c $(CC) $(ALLCFLAGS) -c bitio.c @@@@ -235,4 +238,4 @@@@ yuvsplittoppm yuvsplittoppm.o: yuvsplittoppm.c clean: - -rm -f *.o *.a *.cat *~ core $(BINARIES) ppmmerge + -rm -f *.o *.a *.cat *~ core *.core $(BINARIES) ppmmerge @ 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$ @