head 1.42; access; symbols pkgsrc-2014Q2:1.41.0.16 pkgsrc-2014Q2-base:1.41 pkgsrc-2014Q1:1.41.0.14 pkgsrc-2014Q1-base:1.41 pkgsrc-2013Q4:1.41.0.12 pkgsrc-2013Q4-base:1.41 pkgsrc-2013Q3:1.41.0.10 pkgsrc-2013Q3-base:1.41 pkgsrc-2013Q2:1.41.0.8 pkgsrc-2013Q2-base:1.41 pkgsrc-2013Q1:1.41.0.6 pkgsrc-2013Q1-base:1.41 pkgsrc-2012Q4:1.41.0.4 pkgsrc-2012Q4-base:1.41 pkgsrc-2012Q3:1.41.0.2 pkgsrc-2012Q3-base:1.41 pkgsrc-2012Q2:1.40.0.20 pkgsrc-2012Q2-base:1.40 pkgsrc-2012Q1:1.40.0.18 pkgsrc-2012Q1-base:1.40 pkgsrc-2011Q4:1.40.0.16 pkgsrc-2011Q4-base:1.40 pkgsrc-2011Q3:1.40.0.14 pkgsrc-2011Q3-base:1.40 pkgsrc-2011Q2:1.40.0.12 pkgsrc-2011Q2-base:1.40 pkgsrc-2011Q1:1.40.0.10 pkgsrc-2011Q1-base:1.40 pkgsrc-2010Q4:1.40.0.8 pkgsrc-2010Q4-base:1.40 pkgsrc-2010Q3:1.40.0.6 pkgsrc-2010Q3-base:1.40 pkgsrc-2010Q2:1.40.0.4 pkgsrc-2010Q2-base:1.40 pkgsrc-2010Q1:1.40.0.2 pkgsrc-2010Q1-base:1.40 pkgsrc-2009Q4:1.39.0.28 pkgsrc-2009Q4-base:1.39 pkgsrc-2009Q3:1.39.0.26 pkgsrc-2009Q3-base:1.39 pkgsrc-2009Q2:1.39.0.24 pkgsrc-2009Q2-base:1.39 pkgsrc-2009Q1:1.39.0.22 pkgsrc-2009Q1-base:1.39 pkgsrc-2008Q4:1.39.0.20 pkgsrc-2008Q4-base:1.39 pkgsrc-2008Q3:1.39.0.18 pkgsrc-2008Q3-base:1.39 cube-native-xorg:1.39.0.16 cube-native-xorg-base:1.39 pkgsrc-2008Q2:1.39.0.14 pkgsrc-2008Q2-base:1.39 cwrapper:1.39.0.12 pkgsrc-2008Q1:1.39.0.10 pkgsrc-2008Q1-base:1.39 pkgsrc-2007Q4:1.39.0.8 pkgsrc-2007Q4-base:1.39 pkgsrc-2007Q3:1.39.0.6 pkgsrc-2007Q3-base:1.39 pkgsrc-2007Q2:1.39.0.4 pkgsrc-2007Q2-base:1.39 pkgsrc-2007Q1:1.39.0.2 pkgsrc-2007Q1-base:1.39 pkgsrc-2006Q4:1.38.0.6 pkgsrc-2006Q4-base:1.38 pkgsrc-2006Q3:1.38.0.4 pkgsrc-2006Q3-base:1.38 pkgsrc-2006Q2:1.38.0.2 pkgsrc-2006Q2-base:1.38 pkgsrc-2006Q1:1.35.0.2 pkgsrc-2006Q1-base:1.35 pkgsrc-2005Q4:1.33.0.2 pkgsrc-2005Q4-base:1.33 pkgsrc-2005Q3:1.32.0.2 pkgsrc-2005Q3-base:1.32 pkgsrc-2005Q2:1.30.0.4 pkgsrc-2005Q2-base:1.30 pkgsrc-2005Q1:1.30.0.2 pkgsrc-2005Q1-base:1.30 pkgsrc-2004Q4:1.28.0.2 pkgsrc-2004Q4-base:1.28 pkgsrc-2004Q3:1.27.0.4 pkgsrc-2004Q3-base:1.27 pkgsrc-2004Q2:1.27.0.2 pkgsrc-2004Q2-base:1.27 pkgsrc-2004Q1:1.26.0.4 pkgsrc-2004Q1-base:1.26 pkgsrc-2003Q4:1.26.0.2 pkgsrc-2003Q4-base:1.26 netbsd-1-6-1:1.20.0.2 netbsd-1-6-1-base:1.20 netbsd-1-6:1.19.0.6 netbsd-1-6-RELEASE-base:1.19 pkgviews:1.19.0.2 pkgviews-base:1.19 buildlink2:1.18.0.2 buildlink2-base:1.19 netbsd-1-5-PATCH003:1.17 netbsd-1-5-PATCH001:1.12 netbsd-1-5-RELEASE:1.11 netbsd-1-4-PATCH003:1.11 netbsd-1-4-PATCH002:1.8 comdex-fall-1999:1.8 netbsd-1-4-PATCH001:1.6 netbsd-1-4-RELEASE:1.5 netbsd-1-3-PATCH003:1.4 netbsd-1-3-PATCH002:1.3 FreeBSD-current-1997-10-09:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.42 date 2014.09.08.21.22.28; author wiz; state dead; branches; next 1.41; commitid 0IuhkyUPMU5rtAPx; 1.41 date 2012.07.25.14.42.03; author jperkin; state Exp; branches; next 1.40; 1.40 date 2010.02.19.18.25.44; author drochner; state Exp; branches; next 1.39; 1.39 date 2007.02.19.02.25.19; author rillig; state Exp; branches 1.39.28.1; next 1.38; 1.38 date 2006.06.25.06.35.58; author adam; state Exp; branches; next 1.37; 1.37 date 2006.06.18.16.18.11; author minskim; state Exp; branches; next 1.36; 1.36 date 2006.04.19.20.52.29; author wiz; state Exp; branches; next 1.35; 1.35 date 2006.02.27.22.01.16; author adam; state Exp; branches 1.35.2.1; next 1.34; 1.34 date 2006.01.16.15.17.02; author adam; state Exp; branches; next 1.33; 1.33 date 2005.10.19.09.30.09; author adam; state Exp; branches; next 1.32; 1.32 date 2005.08.21.04.47.24; author grant; state Exp; branches; next 1.31; 1.31 date 2005.06.30.15.58.59; author minskim; state Exp; branches; next 1.30; 1.30 date 2005.02.17.11.36.01; author adam; state Exp; branches 1.30.4.1; next 1.29; 1.29 date 2005.01.18.14.16.20; author adam; state Exp; branches; next 1.28; 1.28 date 2004.10.21.20.45.52; author tv; state Exp; branches; next 1.27; 1.27 date 2004.04.29.08.02.39; author adam; state Exp; branches; next 1.26; 1.26 date 2003.09.07.17.22.16; author jschauma; state Exp; branches; next 1.25; 1.25 date 2003.06.11.07.10.47; author wiz; state Exp; branches; next 1.24; 1.24 date 2003.06.11.06.59.27; author tron; state Exp; branches; next 1.23; 1.23 date 2003.04.11.22.45.56; author cjep; state Exp; branches; next 1.22; 1.22 date 2003.03.21.08.30.49; author tron; state Exp; branches; next 1.21; 1.21 date 2003.03.18.12.11.57; author tron; state Exp; branches; next 1.20; 1.20 date 2002.08.25.18.39.19; author jlam; state Exp; branches; next 1.19; 1.19 date 2002.05.14.18.03.18; author tron; state Exp; branches; next 1.18; 1.18 date 2002.05.06.11.46.22; author tron; state Exp; branches 1.18.2.1; next 1.17; 1.17 date 2002.03.20.12.42.12; author wiz; state Exp; branches; next 1.16; 1.16 date 2002.03.15.11.04.30; author wiz; state Exp; branches; next 1.15; 1.15 date 2002.03.14.22.21.42; author wiz; state Exp; branches; next 1.14; 1.14 date 2001.06.19.04.21.04; author jlam; state Exp; branches; next 1.13; 1.13 date 2001.06.16.19.50.57; author jlam; state Exp; branches; next 1.12; 1.12 date 2001.01.14.13.17.55; author tron; state Exp; branches; next 1.11; 1.11 date 2000.07.10.11.12.10; author wiz; state Exp; branches; next 1.10; 1.10 date 2000.06.05.00.36.31; author wiz; state Exp; branches; next 1.9; 1.9 date 2000.05.17.10.13.20; author tron; state Exp; branches; next 1.8; 1.8 date 99.10.08.21.18.33; author jlam; state Exp; branches; next 1.7; 1.7 date 99.07.25.21.17.33; author tron; state Exp; branches; next 1.6; 1.6 date 99.06.03.20.55.55; author christos; state Exp; branches; next 1.5; 1.5 date 99.01.10.23.52.15; author tron; state Exp; branches; next 1.4; 1.4 date 98.08.07.10.40.50; author agc; state Exp; branches; next 1.3; 1.3 date 98.02.25.01.40.48; author tron; state Exp; branches; next 1.2; 1.2 date 97.12.31.03.34.49; author hubertf; state Exp; branches; next 1.1; 1.1 date 97.10.15.15.12.13; author agc; state Exp; branches 1.1.1.1; next ; 1.39.28.1 date 2010.02.25.08.43.28; author spz; state Exp; branches; next ; 1.35.2.1 date 2006.06.26.07.06.35; author ghen; state Exp; branches; next ; 1.30.4.1 date 2005.07.02.07.12.05; author snj; state Exp; branches; next ; 1.18.2.1 date 2002.06.23.18.46.50; author jlam; state Exp; branches; next 1.18.2.2; 1.18.2.2 date 2002.06.24.06.03.43; author jlam; state Exp; branches; next ; 1.1.1.1 date 97.10.15.15.12.13; author agc; state Exp; branches; next ; desc @@ 1.42 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-aa,v 1.41 2012/07/25 14:42:03 jperkin Exp $ --- Makefile.config.in.orig 2008-12-07 01:58:20.000000000 +0000 +++ Makefile.config.in 2012-07-25 14:32:55.129209505 +0000 @@@@ -24,7 +24,7 @@@@ # and skip it on those systems unless you want to debug it and fix it. # OpenBSD: #BUILD_FIASCO = N -BUILD_FIASCO = Y +BUILD_FIASCO?= Y # The following are commands for the build process to use. These values # do not get built into anything. @@@@ -33,7 +33,7 @@@@ #CC = gcc # Note that 'cc' is usually an alias for whatever is the main compiler # on a system, e.g. the GNU Compiler on Linux. -CC = cc +#CC = cc # The linker. LD = $(CC) @@@@ -100,7 +100,7 @@@@ # MAKE is set automatically by Make to what was used to invoke Make. -INSTALL = $(SRCDIR)/buildtools/install.sh +#INSTALL = $(SRCDIR)/buildtools/install.sh #Solaris: #INSTALL = /usr/ucb/install #Tru64: @@@@ -112,7 +112,7 @@@@ # STRIPFLAG is the option you pass to the above install program to make it # strip unnecessary information out of binaries. -STRIPFLAG = -s +#STRIPFLAG = -s # If you don't want to strip the binaries, just leave it null: #STRIPFLAG = @@@@ -131,13 +131,15 @@@@ AR = ar RANLIB = ranlib # IRIX, SCO don't have Ranlib: -#RANLIB = true +ifeq ($(OPSYS),IRIX) +RANLIB = ar rs +endif # LEX is the beginning of a shell command that runs a Lex-like # pattern matcher generator. Null string means there isn't any such # command. That means the build will skip parts that need one. -LEX = flex +#LEX = flex # Solaris: # LEX = flex -e # Windows Mingw: @@@@ -228,7 +230,7 @@@@ # Here, $(SONAME) resolves to the soname for the shared library being created. # The following are gcc options. This works on GNU libc systems. -LDSHLIB = -shared -Wl,-soname,$(SONAME) +LDSHLIB = -shared -Wl,-h,$(SONAME) # You need -nostart instead of -shared on BeOS. Though the BeOS compiler is # ostensibly gcc, it has the -nostart option, which is not mentioned in gcc # documentation and doesn't exist in at least one non-BeOS installation. @@@@ -261,6 +263,15 @@@@ #LDRELOC = ld --reloc #LDRELOC = ld -r +ifeq ($(OPSYS),Darwin) +LDSHLIB = -dynamiclib -install_name $(PREFIX)/lib/libnetpbm.$(MAJ).dylib \ + -compatibility_version $(MAJ) -current_version $(MAJ).$(MIN) +endif + +ifeq ($(OPSYS),Interix) +# random base address between 0x6B000000 and 0x6D000000 +LDSHLIB+= -Wl,--image-base,$$(($$RANDOM %64/2*1048576+1795162112)) +endif # On older systems, you have to make shared libraries out of position # independent code, so you need -fpic or fPIC here. (The rule is: if @@@@ -283,11 +294,23 @@@@ CFLAGS_SHLIB = # Gcc: #CFLAGS_SHLIB = -fpic -#CFLAGS_SHLIB = -fPIC +CFLAGS_SHLIB = -fPIC # Sun compiler: #CFLAGS_SHLIB = -Kpic #CFLAGS_SHLIB = -KPIC +ifeq ($(OPSYS),Darwin) +CFLAGS_SHLIB = -fno-common +endif + +ifeq ($(OPSYS),IRIX) +CFLAGS_SHLIB = -KPIC +endif + +ifeq ($(OPSYS),Interix) +CFLAGS_SHLIB = # none! +endif + # SHLIB_CLIB is the link option to include the C library in a shared library, # normally "-lc". On typical systems, this serves no purpose. On some, # though, it causes information about which C library to use to be recorded @@@@ -356,8 +379,8 @@@@ #TIFFLIB = libtiff.so #TIFFHDR_DIR = /usr/include/libtiff #NetBSD: -#TIFFLIB = $(LOCALBASE)/lib/libtiff.so -#TIFFHDR_DIR = $(LOCALBASE)/include +TIFFLIB = $(BUILDLINK_DIR)/lib/libtiff.so +TIFFHDR_DIR = $(BUILDLINK_DIR)/include # OSF, Tru64: #TIFFLIB = /usr/local1/DEC/lib/libtiff.so #TIFFHDR_DIR = /usr/local1/DEC/include @@@@ -387,8 +410,8 @@@@ #JPEGLIB = libjpeg.so #JPEGHDR_DIR = /usr/include/jpeg # Netbsd: -#JPEGLIB = ${LOCALBASE}/lib/libjpeg.so -#JPEGHDR_DIR = ${LOCALBASE}/include +JPEGLIB = ${BUILDLINK_DIR}/lib/libjpeg.so +JPEGHDR_DIR = ${BUILDLINK_DIR}/include # OSF, Tru64: #JPEGLIB = /usr/local1/DEC/libjpeg.so #JPEGHDR_DIR = /usr/local1/DEC/include @@@@ -415,12 +438,12 @@@@ PNGLIB = NONE PNGHDR_DIR = -PNGVER = +PNGVER = 12 #PNGLIB = libpng$(PNGVER).so #PNGHDR_DIR = /usr/include/libpng$(PNGVER) # NetBSD: -#PNGLIB = $(LOCALBASE)/lib/libpng$(PNGVER).so -#PNGHDR_DIR = $(LOCALBASE)/include +PNGLIB = $(BUILDLINK_DIR)/lib/libpng$(PNGVER).so +#PNGHDR_DIR = $(BUILDLINK_DIR)/include # OSF/Tru64: #PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so #PNGHDR_DIR = /usr/local1/DEC/include @@@@ -432,8 +455,8 @@@@ # # If you have 'libpng-config' (see above), these are irrelevant. -ZLIB = NONE -ZHDR_DIR = +ZLIB = $(BUILDLINK_DIR)/lib/libz.so +ZHDR_DIR = $(BUILDLINK_DIR)/include #ZLIB = libz.so # The JBIG lossless image compression library (aka JBIG-KIT): @@@@ -442,8 +465,8 @@@@ JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig # The Jasper JPEG-2000 image compression library (aka JasPer): -JASPERLIB = $(INTERNAL_JASPERLIB) -JASPERHDR_DIR = $(INTERNAL_JASPERHDR_DIR) +JASPERLIB = -ljasper +JASPERHDR_DIR = /doesnt-matter # JASPERDEPLIBS is the libraries (-l options or file names) on which # The Jasper library depends -- i.e. what you have to link into any # executable that links in the Jasper library. @@@@ -488,7 +511,7 @@@@ # built into the standard C library, so this can be null. This is irrelevant # if OMIT_NETWORK is "y". -NETWORKLD = +#NETWORKLD = # Solaris, SunOS: #NETWORKLD = -lsocket -lnsl # SCO: @@@@ -542,7 +565,7 @@@@ #Netpbm library functions. The value is used only in make file tests. # "unixshared" means a unix-style shared library, typically named like # libxyz.so.2.3 -NETPBMLIBTYPE = unixshared +NETPBMLIBTYPE? = unixshared # "unixstatic" means a unix-style static library, (like libxyz.a) #NETPBMLIBTYPE = unixstatic # "dll" means a Windows DLL shared library @@@@ -553,7 +576,7 @@@@ #NETPBMLIBSUFFIX is the suffix used on whatever kind of library is #selected above. All this is used for is to construct library names. #The make files never examine the actual value. -NETPBMLIBSUFFIX = so +NETPBMLIBSUFFIX?= so # "a" is the suffix for unix-style static libraries. It is also # traditionally used for shared libraries on AIX. The Visual Age C @ 1.41 log @Remove SunOS patch, the ld(1) options are actively harmful and cause R_AMD64_32 relocation errors in 64-bit mode. The default options should work fine. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.40 2010/02/19 18:25:44 drochner Exp $ @ 1.40 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$ d4 2 a5 2 +++ Makefile.config.in @@@@ -24,7 +24,7 @@@@ DEFAULT_TARGET = nonmerge d14 1 a14 1 @@@@ -33,7 +33,7 @@@@ BUILD_FIASCO = Y d23 1 a23 1 @@@@ -100,7 +100,7 @@@@ CFLAGS_FOR_BUILD = $(CFLAGS) d32 1 a32 1 @@@@ -112,7 +112,7 @@@@ INSTALL = $(SRCDIR)/buildtools/install.s d41 1 a41 1 @@@@ -131,13 +131,15 @@@@ MANPAGE_FORMAT = nroff d59 1 a59 1 @@@@ -228,7 +230,7 @@@@ EXE = d68 1 a68 1 @@@@ -261,6 +263,19 @@@@ LDRELOC = NONE a71 4 +ifeq ($(OPSYS),SunOS) +LDSHLIB = -Wl,-B,dynamic,-G,-h,$(SONAME) +endif + d84 1 a84 1 @@@@ -283,11 +298,23 @@@@ LDRELOC = NONE d109 1 a109 1 @@@@ -356,8 +383,8 @@@@ TIFFHDR_DIR = d120 1 a120 1 @@@@ -387,8 +414,8 @@@@ JPEGHDR_DIR = d131 1 a131 1 @@@@ -415,12 +442,12 @@@@ JPEGHDR_DIR = d147 1 a147 1 @@@@ -432,8 +459,8 @@@@ PNGVER = d158 1 a158 1 @@@@ -442,8 +469,8 @@@@ JBIGLIB = $(BUILDDIR)/converter/other/jb d169 1 a169 1 @@@@ -488,7 +515,7 @@@@ OMIT_NETWORK = d178 1 a178 1 @@@@ -542,7 +569,7 @@@@ SUFFIXMANUALS5 = 5 d187 1 a187 1 @@@@ -553,7 +580,7 @@@@ NETPBMLIBTYPE = unixshared @ 1.39 log @Fixed the build on IRIX, which had been broken since about one year, when the build on Solaris had been fixed, "not affecting other platforms". ;) @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.38 2006/06/25 06:35:58 adam Exp $ d3 1 a3 1 --- Makefile.config.in.orig 2006-06-18 21:23:40.000000000 +0200 d23 1 a23 1 @@@@ -99,7 +99,7 @@@@ CFLAGS_FOR_BUILD = $(CFLAGS) d32 1 a32 1 @@@@ -111,7 +111,7 @@@@ INSTALL = $(SRCDIR)/buildtools/install.s d41 1 a41 1 @@@@ -130,8 +130,10 @@@@ MANPAGE_FORMAT = nroff a45 1 -LEX = flex d49 6 d58 2 a59 2 # Or just skip parts that need Lex: @@@@ -220,7 +222,7 @@@@ EXE = d68 1 a68 1 @@@@ -253,6 +255,19 @@@@ LDRELOC = NONE d88 1 a88 1 @@@@ -275,11 +290,23 @@@@ LDRELOC = NONE d90 1 a90 1 # Solaris or SunOS with gcc, and NetBSD: d113 1 a113 1 @@@@ -348,8 +375,8 @@@@ TIFFHDR_DIR = d124 1 a124 1 @@@@ -379,8 +406,8 @@@@ JPEGHDR_DIR = d135 2 a136 2 @@@@ -400,12 +427,12 @@@@ JPEGHDR_DIR = # option. d147 1 a147 1 +PNGHDR_DIR = $(BUILDLINK_DIR)/include d151 3 a153 3 @@@@ -415,8 +442,8 @@@@ PNGVER = # NONE for the PNG library, it doesn't matter what you specify here -- # it won't get used. d162 1 a162 1 @@@@ -425,8 +452,8 @@@@ JBIGLIB = $(BUILDDIR)/converter/other/jb d173 1 a173 1 @@@@ -471,7 +498,7 @@@@ OMIT_NETWORK = d182 1 a182 1 @@@@ -525,7 +552,7 @@@@ SUFFIXMANUALS5 = 5 d191 1 a191 1 @@@@ -536,7 +563,7 @@@@ NETPBMLIBTYPE = unixshared @ 1.39.28.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-aa,v 1.40 2010/02/19 18:25:44 drochner Exp $ d3 1 a3 1 --- Makefile.config.in.orig 2008-12-07 01:58:20.000000000 +0000 d23 1 a23 1 @@@@ -100,7 +100,7 @@@@ CFLAGS_FOR_BUILD = $(CFLAGS) d32 1 a32 1 @@@@ -112,7 +112,7 @@@@ INSTALL = $(SRCDIR)/buildtools/install.s d41 1 a41 1 @@@@ -131,13 +131,15 @@@@ MANPAGE_FORMAT = nroff d46 1 a49 6 # LEX is the beginning of a shell command that runs a Lex-like # pattern matcher generator. Null string means there isn't any such # command. That means the build will skip parts that need one. -LEX = flex d53 2 a54 2 # Windows Mingw: @@@@ -228,7 +230,7 @@@@ EXE = d63 1 a63 1 @@@@ -261,6 +263,19 @@@@ LDRELOC = NONE d83 1 a83 1 @@@@ -283,11 +298,23 @@@@ LDRELOC = NONE d85 1 a85 1 # Gcc: d108 1 a108 1 @@@@ -356,8 +383,8 @@@@ TIFFHDR_DIR = d119 1 a119 1 @@@@ -387,8 +414,8 @@@@ JPEGHDR_DIR = d130 2 a131 2 @@@@ -415,12 +442,12 @@@@ JPEGHDR_DIR = d142 1 a142 1 +#PNGHDR_DIR = $(BUILDLINK_DIR)/include d146 3 a148 3 @@@@ -432,8 +459,8 @@@@ PNGVER = # # If you have 'libpng-config' (see above), these are irrelevant. d157 1 a157 1 @@@@ -442,8 +469,8 @@@@ JBIGLIB = $(BUILDDIR)/converter/other/jb d168 1 a168 1 @@@@ -488,7 +515,7 @@@@ OMIT_NETWORK = d177 1 a177 1 @@@@ -542,7 +569,7 @@@@ SUFFIXMANUALS5 = 5 d186 1 a186 1 @@@@ -553,7 +580,7 @@@@ NETPBMLIBTYPE = unixshared @ 1.38 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$ d163 2 a164 2 +#JASPERLIB = $(INTERNAL_JASPERLIB) +#JASPERHDR_DIR = $(INTERNAL_JASPERHDR_DIR) @ 1.37 log @Build .dylib instead of .so on Darwin. Bump PKGREVISION. @ text @d3 1 a3 1 --- Makefile.config.in.orig 2006-01-02 16:15:17.000000000 -0800 d54 1 a54 1 @@@@ -219,7 +221,7 @@@@ EXE = d63 1 a63 1 @@@@ -252,6 +254,19 @@@@ LDRELOC = NONE d83 1 a83 1 @@@@ -274,11 +289,23 @@@@ LDRELOC = NONE d108 1 a108 1 @@@@ -347,8 +374,8 @@@@ TIFFHDR_DIR = d119 1 a119 1 @@@@ -378,8 +405,8 @@@@ JPEGHDR_DIR = d130 1 a130 1 @@@@ -399,12 +426,12 @@@@ JPEGHDR_DIR = d146 1 a146 1 @@@@ -414,8 +441,8 @@@@ PNGVER = d157 1 a157 1 @@@@ -424,8 +451,8 @@@@ JBIGLIB = $(BUILDDIR)/converter/other/jb d168 1 a168 1 @@@@ -461,7 +488,7 @@@@ OMIT_NETWORK = d177 1 a177 1 @@@@ -510,7 +537,7 @@@@ SUFFIXMANUALS5 = 5 d186 1 a186 1 @@@@ -521,7 +548,7 @@@@ NETPBMLIBTYPE = unixshared @ 1.36 log @Use versioned png library. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.35 2006/02/27 22:01:16 adam Exp $ d3 1 a3 1 --- Makefile.config.in.orig 2006-01-03 01:15:17.000000000 +0100 d63 1 a63 1 @@@@ -252,6 +254,18 @@@@ LDRELOC = NONE d72 2 a73 1 +LDSHLIB = -dynamiclib -install_name $(NETPBM_RUNTIME_PATH)/libnetpbm.$(MAJ).dylib d83 1 a83 1 @@@@ -274,11 +288,23 @@@@ LDRELOC = NONE d108 1 a108 1 @@@@ -347,8 +373,8 @@@@ TIFFHDR_DIR = d119 1 a119 1 @@@@ -378,8 +404,8 @@@@ JPEGHDR_DIR = d130 1 a130 1 @@@@ -399,12 +425,12 @@@@ JPEGHDR_DIR = d146 1 a146 1 @@@@ -414,8 +440,8 @@@@ PNGVER = d157 1 a157 1 @@@@ -424,8 +450,8 @@@@ JBIGLIB = $(BUILDDIR)/converter/other/jb d168 1 a168 1 @@@@ -461,7 +487,7 @@@@ OMIT_NETWORK = d177 18 @ 1.35 log @Changes 10.32: * Add rlatopam. * Add pgmmake. * bmptopnm: Understands RLE4/RLE8 compressed BMP. * pnmgamma: Add -bt709tosrgb -srgbtobt709, -bt709tolinear, -lineartobt709, -gamma, -rgamma, -ggamma, -bgamma (gammma values were formerly specified as parameters). * pnmgamma: Rename -cieramp to -bt709ramp. * ppmdraw: work on multi-image streams. * anytopnm: add mime time image/x-ms-bmp for BMP * pamchannel: works on multi-image streams. * pamstack: works on multi-image streams. * Convert pnmdepth to pamdepth. Add multi-image stream capability. * pamcut: works on multi-image streams. * pnmtops: allow -flate and -rle together. * pnmtops: overhaul of -psfilter output. * pnmrotate: fine adjustment to arithmetic (rounding, pixel quantization). * pbmtopsg3: Put currentfile ... in exec block. * pbmtopsg3: Add missing /EndOfBlock. * pnmtops: Don't claim EPSF if using setpagedevice. * giftopnm: do "reading image sequence N" message only if being verbose. * ppmtobmp, bmptopnm: major speed improvement for PBM. * other @ text @d1 1 a1 1 $NetBSD$ d129 6 a134 1 @@@@ -403,8 +429,8 @@@@ PNGVER = @ 1.35.2.1 log @Pullup ticket 1711 - requested by salo security update for netpbm Revisions pulled up: - pkgsrc/graphics/netpbm/Makefile 1.136, 1.137, 1.138, 1.142, 1.143 - pkgsrc/graphics/netpbm/distinfo 1.54, 1.56, 1.58, 1.59 - pkgsrc/graphics/netpbm/patches/patch-aa 1.37, 1.38 - pkgsrc/graphics/netpbm/patches/patch-ab 1.20 - pkgsrc/graphics/netpbm/patches/patch-ac removed - pkgsrc/graphics/netpbm/patches/patch-ag removed - pkgsrc/graphics/netpbm/patches/patch-ai removed - pkgsrc/graphics/netpbm/patches/patch-aj removed - pkgsrc/graphics/netpbm/patches/patch-ca 1.1 Module Name: pkgsrc Committed By: tron Date: Mon Apr 3 16:46:51 UTC 2006 Modified Files: pkgsrc/graphics/netpbm: Makefile Log Message: Make sure all documentation files are installed world readable. Bump package revision because this change affects the binary package. --- Module Name: pkgsrc Committed By: tron Date: Mon Apr 3 16:53:58 UTC 2006 Modified Files: pkgsrc/graphics/netpbm: Makefile Log Message: Make last change work with IRIX's old fashioned "find" command. --- Module Name: pkgsrc Committed By: adam Date: Mon Apr 17 08:11:17 UTC 2006 Modified Files: pkgsrc/graphics/netpbm: Makefile distinfo Removed Files: pkgsrc/graphics/netpbm/patches: patch-ag Log Message: Changes 10.33: Add pamtosvg. g3topbm: Add -width, -paper_size. libnetpbm / most newer programs: Fix bug that produces plain format output when it should be raw because pnm_readpaminit() does not set 'plainformat' and most programs just copy the input pam to the output pam. pamflip: fix bug with left/right flip of PBM that has width an even multiple of 8 plus something less than 8. pnmquant: turn on autoflush when creating seekable file. install: fix symbolic link pnmdepth -> pamdepth. build: fix some importinc dependencies. --- Module Name: pkgsrc Committed By: jlam Date: Wed May 10 17:19:00 UTC 2006 Modified Files: pkgsrc/graphics/netpbm: distinfo Added Files: pkgsrc/graphics/netpbm/patches: patch-ca Log Message: On FreeBSD 4.x, needs to be included first. --- Module Name: pkgsrc Committed By: minskim Date: Sun Jun 18 16:18:11 UTC 2006 Modified Files: pkgsrc/graphics/netpbm: Makefile distinfo pkgsrc/graphics/netpbm/patches: patch-aa Log Message: Build .dylib instead of .so on Darwin. Bump PKGREVISION. --- Module Name: pkgsrc Committed By: adam Date: Sun Jun 25 06:35:58 UTC 2006 Modified Files: pkgsrc/graphics/netpbm: Makefile distinfo pkgsrc/graphics/netpbm/patches: patch-aa patch-ab Removed Files: pkgsrc/graphics/netpbm/patches: patch-ac patch-ag patch-ai patch-aj Log Message: 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 @d3 2 a4 2 --- Makefile.config.in.orig 2006-06-18 21:23:40.000000000 +0200 +++ Makefile.config.in 2006-06-25 17:21:17.000000000 +0200 d54 1 a54 1 @@@@ -220,7 +222,7 @@@@ EXE = d63 1 a63 1 @@@@ -253,6 +255,19 @@@@ LDRELOC = NONE d72 1 a72 2 +LDSHLIB = -dynamiclib -install_name $(PREFIX)/lib/libnetpbm.$(MAJ).dylib \ + -compatibility_version $(MAJ) -current_version $(MAJ).$(MIN) d82 1 a82 1 @@@@ -275,11 +290,23 @@@@ LDRELOC = NONE d107 1 a107 1 @@@@ -348,8 +375,8 @@@@ TIFFHDR_DIR = d118 1 a118 1 @@@@ -379,8 +406,8 @@@@ JPEGHDR_DIR = d129 1 a129 1 @@@@ -404,8 +431,8 @@@@ PNGVER = d140 1 a140 1 @@@@ -415,8 +442,8 @@@@ PNGVER = d151 1 a151 1 @@@@ -425,8 +452,8 @@@@ JBIGLIB = $(BUILDDIR)/converter/other/jb d162 1 a162 1 @@@@ -471,7 +498,7 @@@@ OMIT_NETWORK = a170 18 @@@@ -525,7 +552,7 @@@@ SUFFIXMANUALS5 = 5 #Netpbm library functions. The value is used only in make file tests. # "unixshared" means a unix-style shared library, typically named like # libxyz.so.2.3 -NETPBMLIBTYPE = unixshared +NETPBMLIBTYPE? = unixshared # "unixstatic" means a unix-style static library, (like libxyz.a) #NETPBMLIBTYPE = unixstatic # "dll" means a Windows DLL shared library @@@@ -536,7 +563,7 @@@@ NETPBMLIBTYPE = unixshared #NETPBMLIBSUFFIX is the suffix used on whatever kind of library is #selected above. All this is used for is to construct library names. #The make files never examine the actual value. -NETPBMLIBSUFFIX = so +NETPBMLIBSUFFIX?= so # "a" is the suffix for unix-style static libraries. It is also # traditionally used for shared libraries on AIX. The Visual Age C @ 1.34 log @Changes 10.31: * Bug fixes @ text @d3 1 a3 1 --- Makefile.config.in.orig 2005-12-10 18:19:13.000000000 +0100 d54 1 a54 1 @@@@ -217,7 +219,7 @@@@ EXE = d63 1 a63 1 @@@@ -250,6 +252,18 @@@@ LDRELOC = NONE d82 1 a82 1 @@@@ -272,11 +286,23 @@@@ LDRELOC = NONE d107 1 a107 1 @@@@ -345,8 +371,8 @@@@ TIFFHDR_DIR = d118 1 a118 1 @@@@ -376,8 +402,8 @@@@ JPEGHDR_DIR = d129 1 a129 1 @@@@ -401,8 +427,8 @@@@ PNGVER = d140 1 a140 1 @@@@ -412,8 +438,8 @@@@ PNGVER = d151 1 a151 1 @@@@ -422,8 +448,8 @@@@ JBIGLIB = $(BUILDDIR)/converter/other/jb d162 1 a162 1 @@@@ -459,7 +485,7 @@@@ OMIT_NETWORK = @ 1.33 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 @d3 1 a3 1 --- Makefile.config.in.orig 2005-10-08 02:37:24.000000000 +0000 d23 1 a23 1 @@@@ -98,7 +98,7 @@@@ LD_FOR_BUILD = $(LD) d32 1 a32 1 @@@@ -110,7 +110,7 @@@@ INSTALL = $(SRCDIR)/buildtools/install.s d41 1 a41 1 @@@@ -129,8 +129,10 @@@@ MANPAGE_FORMAT = nroff d54 1 a54 1 @@@@ -216,7 +218,7 @@@@ EXE = d63 1 a63 1 @@@@ -249,6 +251,18 @@@@ LDRELOC = NONE d82 1 a82 1 @@@@ -271,11 +285,23 @@@@ LDRELOC = NONE d107 1 a107 1 @@@@ -344,8 +370,8 @@@@ TIFFHDR_DIR = d118 1 a118 1 @@@@ -375,8 +401,8 @@@@ JPEGHDR_DIR = d129 1 a129 1 @@@@ -400,8 +426,8 @@@@ PNGVER = d140 1 a140 1 @@@@ -411,8 +437,8 @@@@ PNGVER = d151 1 a151 1 @@@@ -421,8 +447,8 @@@@ JBIGLIB = $(BUILDDIR)/converter/other/jb d162 1 a162 1 @@@@ -458,7 +484,7 @@@@ OMIT_NETWORK = @ 1.32 log @fix build on Solaris: - use graphics/jasper instead of built-in jasper which has little hope of building on Solaris - use putenv() instead of setenv() - fix abuse of _XOPEN_SOURCE no PKGREVISION bump as no dependency change except on Solaris, where this didn't build before. @ text @d3 1 a3 1 --- Makefile.config.in.orig 2005-05-25 06:15:26.000000000 +1000 d23 1 a23 1 @@@@ -92,7 +92,7 @@@@ LD_FOR_BUILD = $(LD) d32 1 a32 1 @@@@ -104,7 +104,7 @@@@ INSTALL = $(SRCDIR)/buildtools/install.s d41 1 a41 1 @@@@ -123,8 +123,10 @@@@ MANPAGE_FORMAT = nroff d54 1 a54 1 @@@@ -210,7 +212,7 @@@@ EXE = d63 1 a63 1 @@@@ -243,6 +245,18 @@@@ LDRELOC = NONE d82 1 a82 1 @@@@ -265,11 +279,23 @@@@ LDRELOC = NONE d107 1 a107 1 @@@@ -338,8 +364,8 @@@@ TIFFHDR_DIR = d118 1 a118 1 @@@@ -369,8 +395,8 @@@@ JPEGHDR_DIR = d129 1 a129 1 @@@@ -394,8 +420,8 @@@@ PNGVER = d140 1 a140 1 @@@@ -405,8 +431,8 @@@@ PNGVER = d151 1 a151 1 @@@@ -415,8 +441,8 @@@@ JBIGLIB = $(BUILDDIR)/converter/other/jb d162 1 a162 1 @@@@ -452,7 +478,7 @@@@ OMIT_NETWORK = @ 1.31 log @Do not build fiasco on Darwin-8.x, where it causes a bus error. This should be OK since the netpbm Makefile has the following: # Fiasco has some special requirements that make it fail to compile on # some systems, and since it isn't very important, just set this to "N" # and skip it on those systems unless you want to debug it and fix it. BUILD_FIASCO = Y @ text @d3 1 a3 1 --- Makefile.config.in.orig 2005-01-12 21:50:04.000000000 -0600 d23 1 a23 1 @@@@ -86,7 +86,7 @@@@ LD_FOR_BUILD = $(LD) d32 1 a32 1 @@@@ -98,7 +98,7 @@@@ INSTALL = $(SRCDIR)/buildtools/install.s d41 1 a41 1 @@@@ -117,8 +117,10 @@@@ MANPAGE_FORMAT = nroff d54 1 a54 1 @@@@ -204,7 +206,7 @@@@ EXE = d63 1 a63 1 @@@@ -237,6 +239,18 @@@@ LDRELOC = NONE d82 1 a82 1 @@@@ -255,11 +269,23 @@@@ LDRELOC = NONE d107 1 a107 1 @@@@ -328,8 +354,8 @@@@ TIFFHDR_DIR = d118 1 a118 1 @@@@ -359,8 +385,8 @@@@ JPEGHDR_DIR = d129 1 a129 1 @@@@ -384,8 +410,8 @@@@ PNGVER = d140 1 a140 1 @@@@ -395,8 +421,8 @@@@ PNGVER = d151 12 a162 1 @@@@ -437,7 +463,7 @@@@ OMIT_NETWORK = @ 1.30 log @Changes 10.26.3: * pnmremap: fix rounding error where map maxval is small and unequal to image maxval. * ppmtompeg: fix compile failures on "no parallel" builds and where prototypes don't match definitions in bitio.c. Changes 10.26.2: * Build: handle zlib prerequisite of tiff library. * giftopnm: fix crash with input that has bogus color indices in the raster. * giftopnm: fix crash with input that has a bogus minimum code length field. * pnmtopalm: fix padding with -offset. * pnmtopalm: fix compressed images. use 0 compressed size field - not totally correct, but passable. * palmtopnm: fix incorrect handling of some combinations of PALM_IS_COMPRESSED flag and compression type field. * palmtopnm: fix totally broken RLE and scanline compression. * palmtopnm: fix wrong check for disallowed combination of -transparent and -rendition. @ text @d3 1 a3 1 --- Makefile.config.in.orig 2005-01-13 03:50:04.000000000 +0000 d5 9 @ 1.30.4.1 log @Pullup ticket 581 - requested by Min Sik KIm portability fix for netpbm Revisions pulled up: - pkgsrc/graphics/netpbm/Makefile 1.117 - pkgsrc/graphics/netpbm/distinfo 1.37 via patch - pkgsrc/graphics/netpbm/patches/patch-aa 1.31 Module Name: pkgsrc Committed By: minskim Date: Thu Jun 30 15:58:59 UTC 2005 Modified Files: pkgsrc/graphics/netpbm: Makefile distinfo pkgsrc/graphics/netpbm/patches: patch-aa Log Message: Do not build fiasco on Darwin-8.x, where it causes a bus error. This should be OK since the netpbm Makefile has the following: # Fiasco has some special requirements that make it fail to compile on # some systems, and since it isn't very important, just set this to "N" # and skip it on those systems unless you want to debug it and fix it. BUILD_FIASCO = Y @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.30 2005/02/17 11:36:01 adam Exp $ d3 1 a3 1 --- Makefile.config.in.orig 2005-01-12 21:50:04.000000000 -0600 a4 9 @@@@ -24,7 +24,7 @@@@ DEFAULT_TARGET = nonmerge # and skip it on those systems unless you want to debug it and fix it. # OpenBSD: #BUILD_FIASCO = N -BUILD_FIASCO = Y +BUILD_FIASCO?= Y # The following are commands for the build process to use. These values # do not get built into anything. @ 1.29 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 @d3 1 a3 1 --- Makefile.config.in.orig 2004-10-16 19:53:17.000000000 +0000 d109 1 a109 1 @@@@ -357,8 +383,8 @@@@ JPEGHDR_DIR = d120 1 a120 1 @@@@ -382,8 +408,8 @@@@ PNGVER = d131 1 a131 1 @@@@ -393,8 +419,8 @@@@ PNGVER = d142 1 a142 1 @@@@ -435,7 +461,7 @@@@ OMIT_NETWORK = @ 1.28 log @Make this work on Interix. @ text @d3 1 a3 1 --- Makefile.config.in.orig Tue Jan 13 18:12:28 2004 d14 1 a14 1 @@@@ -70,7 +70,7 @@@@ LD_FOR_BUILD = $(LD) d23 1 a23 1 @@@@ -82,7 +82,7 @@@@ INSTALL = $(SRCDIR)/buildtools/install.s d32 1 a32 1 @@@@ -101,8 +101,10 @@@@ MANPAGE_FORMAT = nroff d45 1 a45 10 @@@@ -151,7 +153,7 @@@@ EXE = # linker options. -LDFLAGS = +#LDFLAGS = # Eunice users may want to use -noshare so that the executables can # run standalone: #LDFLAGS = -noshare @@@@ -174,7 +176,7 @@@@ LDFLAGS = d54 2 a55 2 @@@@ -203,6 +205,18 @@@@ LDRELOC = NONE #LDRELOC = ld --relocateable d73 1 a73 1 @@@@ -221,11 +235,23 @@@@ LDRELOC = NONE d98 1 a98 1 @@@@ -294,8 +320,8 @@@@ TIFFHDR_DIR = d109 1 a109 1 @@@@ -323,8 +349,8 @@@@ JPEGHDR_DIR = d120 1 a120 1 @@@@ -348,8 +374,8 @@@@ PNGVER = d131 1 a131 1 @@@@ -359,8 +385,8 @@@@ PNGVER = d142 1 a142 1 @@@@ -401,7 +427,7 @@@@ OMIT_NETWORK = @ 1.27 log @Changes 10.18.12: * Don't try to install pm_gamma (which does not exist in this level) * pamflip: fix bug with random memory accesses due to signed/unsigned comparison Changes 10.18.11: * pnmtopng: fix bug with -transparent Changes 10.18.10: * Include pm_system.h, pm_gamma.h in install package * Fix the ftell/ftello distinction for many platforms * ppmtogif: Don't violate array bounds when GIF color map is larger than internal color map. * yuvsplittoppm: Fix -ccir601 option * ppmtomap: Change #/bin/sh to #!/bin/sh Changes 10.18.9: * ppmtobmp: Fix bug: Generates invalid bits per pixel (e.g. 3) when input image has small number of colors * pbmtog3: fix buffer overrun when image > 1728 columns * pnmtotiffcmyk: Correct abs to fabs so -theta works * sldtoppm: Correct abs to fabs * pgmramp: Correct abs to fabs so -rectangle and -ellipse work * pgmramp: Don't crash with -rectangle and height or width = 1 * pnmtojpeg: interpret "length" field in exif data as unsigned 16 bit instead of signed. * ppmforge: Correct abs to fabs so the planet is more than 2 pixels wide Changes 10.18.8: * pnmrotate: fix bug: always crashes in memory free * pnmrotate: remove debugging messages Changes 10.18.7: * ppmshadow: Fix crash in all invocations * pnmquant: Fix bug wherein all options are rejected Changes 10.18.6: * Add default RPATHOPT = rpath setting to Makefile.config.in * Add stdlib.h and pm_config.h to mallocvar.h * lib/Makefile: $(LIBNETPBMSUFFIX) instead of .so * fitstopnm: Don't produce maxval 0 Changes 10.18.5: * pnmtopng: fix bug with array bounds violation with -alpha Usual symptom: "internal inconsistency" message Changes 10.18.4: * anytopnm: Remove "function" so it works on FreeBSD Changes 10.18.3: * Fix stack corruption in pXm_check() on systems that have both 32 and 64 bit file offsets Changes 10.18.2: * installnetpbm: don't crash on mkdir on old Perl * bmptopnm: fix bug with BMPs that end prematurely Changes 10.11.15: * Bmptopnm goes into an infinite loop if you give it a BMP file that ends prematurely. The bug is in the way the program interprets the return code from fread() in readrow(). You can get the fix from the 10.18.1-10.18.2 diff. * xwdtopnm: Doesn't work with at least one direct color 24 bits-per-pixel xwd generated by Xfree86's Xwd. * ppmquant does not choose the best set of colors. pnmquant does, though. * giftopnm doesn't understand GIFs with the same color both transparent and opaque. pnmtopng -alpha fails with "internal inconsistency detected" message Changes 10.11.14: * pstopnm: fix bug in which Standard Input never works * ppmtobmp: change 'char' to 'unsigned char' to work around a Solaris C library bug * ppmtobmp: handle maxval properly for maxval != 256 truecolor BMP Changes 10.11.13: * Explicitly set SCRIPTS make variable to null so environment variable of the same name doesn't screw things up. * stamp_date: don't use LOGNAME as a variable (on AIX, you can't). * configure: put space after -o in test compiles. * ppmtompeg: adjust header files in parallel.c so it compiles on AIX Changes 10.11.12: * pnmpsnr: fix bug: Cr and Cb interchanged * Fix crash in pnmstitch Changes 10.11.10: * Declare internal subroutines in pgmabel as 'static' so they don't conflict with some C libraries Changes 10.11.9: * pstopnm: fix bug: encapsulated postscript confused with regular postscript, so all pages get overlaid as one page @ text @d3 1 a3 1 --- Makefile.config.in.orig 2004-01-13 23:12:28.000000000 +0000 d32 1 a32 1 @@@@ -101,7 +101,9 @@@@ MANPAGE_FORMAT = nroff d37 1 d41 1 a41 1 LEX = flex d44 1 d54 11 a64 1 @@@@ -204,6 +206,14 @@@@ LDRELOC = NONE a66 1 d75 5 d82 1 a82 2 # -fpic works, use it. If it bombs, go to fPIC). On newer systems, @@@@ -221,11 +231,19 @@@@ LDRELOC = NONE d100 4 d107 1 a107 1 @@@@ -294,8 +312,8 @@@@ TIFFHDR_DIR = d118 1 a118 1 @@@@ -323,8 +341,8 @@@@ JPEGHDR_DIR = d129 1 a129 1 @@@@ -348,8 +366,8 @@@@ PNGVER = d140 1 a140 1 @@@@ -359,8 +377,8 @@@@ PNGVER = d151 1 a151 1 @@@@ -401,7 +419,7 @@@@ OMIT_NETWORK = @ 1.26 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 3 a5 3 --- Makefile.config.in.orig Tue Oct 15 10:17:21 2002 +++ Makefile.config.in Sun Sep 7 12:39:12 2003 @@@@ -33,7 +33,7 @@@@ d14 1 a14 1 @@@@ -52,7 +52,7 @@@@ d23 1 a23 1 @@@@ -64,7 +64,7 @@@@ d32 1 a32 1 @@@@ -83,7 +83,9 @@@@ d43 3 a45 3 @@@@ -131,7 +133,7 @@@@ # Solaris, SunOS, NetBSD: #NEED_RUNTIME_PATH = Y d52 3 a54 3 @@@@ -171,6 +173,14 @@@@ #AIX: #LDSHLIB = ??? d67 1 a67 1 @@@@ -188,11 +198,19 @@@@ d88 1 a88 1 @@@@ -244,8 +262,8 @@@@ d99 1 a99 1 @@@@ -273,8 +291,8 @@@@ d110 1 a110 1 @@@@ -297,8 +315,8 @@@@ d121 1 a121 1 @@@@ -308,8 +326,8 @@@@ d132 3 a134 3 @@@@ -337,7 +355,7 @@@@ # network functions is the option in ppmtompeg to run it on multiple # computers simultaneously. @ 1.25 log @Remove useless "No newline at end of file" chunk that is bound to make trouble. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.24 2003/06/11 06:59:27 tron Exp $ d3 2 a4 2 --- Makefile.config.in.orig Wed Oct 16 03:17:21 2002 +++ Makefile.config.in Wed Jun 11 15:29:48 2003 d32 12 a43 1 @@@@ -131,7 +131,7 @@@@ d52 1 a52 1 @@@@ -171,6 +171,14 @@@@ d67 1 a67 1 @@@@ -188,11 +196,15 @@@@ d81 4 d88 1 a88 1 @@@@ -244,8 +256,8 @@@@ d99 1 a99 1 @@@@ -273,8 +285,8 @@@@ d110 1 a110 1 @@@@ -297,8 +309,8 @@@@ d121 1 a121 1 @@@@ -308,8 +320,8 @@@@ d132 1 a132 1 @@@@ -337,7 +349,7 @@@@ @ 1.24 log @Fix build problems under Mac OS X. The patch was contributed by Richard Grace in private e-mail. @ text @d1 1 a1 1 $NetBSD$ a125 7 @@@@ -450,4 +462,4 @@@@ #NETPBM_DOCURL = file:/usr/doc/netpbm/ # This is where everything goes when you do 'make package': -PKGDIR = /tmp/netpbm \ No newline at end of file +PKGDIR = /tmp/netpbm @ 1.23 log @Remove last hunk of patch-aa to fix build problem on 1.5.2. @ text @d3 3 a5 3 --- Makefile.config.in.orig 2002-10-15 18:17:21.000000000 +0100 +++ Makefile.config.in @@@@ -33,7 +33,7 @@@@ BUILD_FIASCO = Y d14 1 a14 1 @@@@ -52,7 +52,7 @@@@ LD_FOR_BUILD = $(LD) d23 1 a23 1 @@@@ -64,7 +64,7 @@@@ INSTALL = $(SRCDIR)/buildtools/install.s d32 1 a32 1 @@@@ -131,7 +131,7 @@@@ NEED_RUNTIME_PATH = N d41 1 a41 1 @@@@ -171,6 +171,10 @@@@ LDSHLIB = -shared -Wl,-soname,$(SONAME) d49 4 d56 1 a56 1 @@@@ -188,7 +192,7 @@@@ LDSHLIB = -shared -Wl,-soname,$(SONAME) d65 9 a73 1 @@@@ -244,8 +248,8 @@@@ TIFFHDR_DIR = d84 1 a84 1 @@@@ -273,8 +277,8 @@@@ JPEGHDR_DIR = d95 1 a95 1 @@@@ -297,8 +301,8 @@@@ PNGVER = d106 1 a106 1 @@@@ -308,8 +312,8 @@@@ PNGVER = d117 1 a117 1 @@@@ -337,7 +341,7 @@@@ LINUXSVGAHDR_DIR = d126 7 @ 1.22 log @Fix "zlib" configuration in "Makefile.common" so that PNG tools get built. Bump package revision to reflect this change. This patch was contributed by Christopher Richards in PR pkg/20809. @ text @d3 3 a5 3 --- Makefile.config.in.orig 2002-10-15 19:17:21.000000000 +0200 +++ Makefile.config.in 2003-03-18 10:44:40.000000000 +0100 @@@@ -33,7 +33,7 @@@@ d14 1 a14 1 @@@@ -52,7 +52,7 @@@@ d23 1 a23 1 @@@@ -64,7 +64,7 @@@@ d32 1 a32 1 @@@@ -131,7 +131,7 @@@@ d41 1 a41 1 @@@@ -171,6 +171,10 @@@@ d52 1 a52 1 @@@@ -188,7 +192,7 @@@@ d61 1 a61 1 @@@@ -244,8 +248,8 @@@@ d72 1 a72 1 @@@@ -273,8 +277,8 @@@@ d83 1 a83 1 @@@@ -297,8 +301,8 @@@@ d94 1 a94 1 @@@@ -308,8 +312,8 @@@@ d105 1 a105 1 @@@@ -337,7 +341,7 @@@@ a113 7 @@@@ -450,4 +454,4 @@@@ #NETPBM_DOCURL = file:/usr/doc/netpbm/ # This is where everything goes when you do 'make package': -PKGDIR = /tmp/netpbm \ No newline at end of file +PKGDIR = /tmp/netpbm @ 1.21 log @Update "netpbm" package to latest stable version 10.11.6. Numerous bugs have been fixed and a lot of features have been added since version 9.25. @ text @d94 11 @ 1.20 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. This provides sufficient buildlink2 infrastructure to start merging other packages from the buildlink2 branch that have already been converted to use the buildlink2 framework. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.18.2.2 2002/06/24 06:03:43 jlam Exp $ d3 2 a4 2 --- Makefile.config.in.orig Thu Mar 14 16:25:54 2002 +++ Makefile.config.in Tue May 14 19:52:32 2002 a5 2 #Tru64 (= Digital Unix): #CC = cc d7 4 a10 2 -CC = gcc +#CC = gcc d32 1 a32 3 @@@@ -137,10 +137,10 @@@@ # the directory information in the executable at link time. d34 1 a34 4 -NEED_RUNTIME_PATH = N -#NEED_RUNTIME_PATH = Y +#NEED_RUNTIME_PATH = N +NEED_RUNTIME_PATH = Y d41 3 a43 23 @@@@ -156,16 +156,16 @@@@ ifeq ($(NEED_RUNTIME_PATH),Y) #If the linker is gcc (e.g. NetBSD): -#LDFLAGS += -Wl,--rpath,$(INSTALLLIBS) +LDFLAGS += -Wl,-R$(INSTALLLIBS) #Any other linker: -LDFLAGS += -R$(INSTALLLIBS) +#LDFLAGS += -R$(INSTALLLIBS) endif # Linker options for created Netpbm shared libraries. # Here, $(SONAME) resolves to the soname for the shared library being created. # The following are gcc options. This works on GNU libc systems. -LDSHLIB = -shared -Wl,-soname,$(SONAME) +LDSHLIB = -nostdlib -shared -Wl,-Bshareable,-soname,$(SONAME) # You need -nostart instead of -shared on BeOS. Though the BeOS compiler is # ostensibly gcc, it has the -nostart option, which is not mentioned in gcc # documentation and doesn't exist in at least one non-BeOS installation. @@@@ -180,11 +180,15 @@@@ #Tru64: #LDSHLIB = -shared -expect_unresolved "*" a48 9 ifeq ($(NEED_RUNTIME_PATH),Y) #If the linker is gcc (e.g. NetBSD): -#LDSHLIB += -Wl,--rpath,$(INSTALLLIBS) +LDSHLIB += -Wl,-R$(INSTALLLIBS) #Any other linker: -LDSHLIB += -R$(INSTALLLIBS) +#LDSHLIB += -R$(INSTALLLIBS) endif d50 3 a52 1 @@@@ -204,7 +208,7 @@@@ d61 3 a63 8 @@@@ -222,11 +226,11 @@@@ # The TIFF library. See above. If you want to build the tiff # converters, you must have the tiff library already installed. -TIFFLIB_DIR = /usr/lib -TIFFHDR_DIR = /usr/include/libtiff +#TIFFLIB_DIR = /usr/lib +#TIFFHDR_DIR = /usr/include/libtiff d65 1 a65 1 -#TIFFLIB_DIR = $(LOCALBASE)/lib d67 1 a67 1 +TIFFLIB_DIR = $(BUILDLINK_DIR)/lib d70 1 a70 1 #TIFFLIB_DIR = /usr/local1/DEC/lib d72 3 a74 8 @@@@ -250,11 +254,11 @@@@ # JPEG stuff statically linked in, in which case you won't need # JPEGLIB_DIR in order to build the Tiff converters. -JPEGLIB_DIR = /usr/lib -JPEGHDR_DIR = /usr/include/jpeg +#JPEGLIB_DIR = /usr/lib +#JPEGHDR_DIR = /usr/include/jpeg d76 1 a76 1 -#JPEGLIB_DIR = ${LOCALBASE}/lib d78 2 a79 2 +JPEGLIB_DIR = ${LOCALBASE}/lib +JPEGHDR_DIR = ${LOCALBASE}/include d81 1 a81 1 #JPEGLIB_DIR = /usr/local1/DEC/lib d83 3 a85 8 @@@@ -269,11 +273,11 @@@@ # The PNG library. See above. If you want to build the PNG # converters you must have the PNG library already installed. -PNGLIB_DIR = /usr/lib -PNGHDR_DIR = /usr/include/png +#PNGLIB_DIR = /usr/lib +#PNGHDR_DIR = /usr/include/png d87 1 a87 1 -#PNGLIB_DIR = $(LOCALBASE)/lib d89 2 a90 2 +PNGLIB_DIR = $(LOCALBASE)/lib +PNGHDR_DIR = $(LOCALBASE)/include d92 1 a92 1 #PNGLIB_DIR = /usr/local1/DEC/lib d94 1 a94 1 @@@@ -317,7 +321,7 @@@@ d102 8 a109 10 # Don't build network functions: @@@@ -364,7 +368,7 @@@@ #INSTALL_PREFIX = /djgpp # Typical: #INSTALL_PREFIX = /usr/local/ -INSTALL_PREFIX = /usr/local/netpbm +INSTALL_PREFIX = ${PREFIX} # Specify the directory where you want the executables. # If you need scripts and binaries to be in different directories, you @ 1.19 log @Fix build problems on older "a.out" system. Based on patches supplied by Greg A. Woods in PR pkg/16030. @ text @d1 1 a1 1 $NetBSD$ d120 2 a121 2 +JPEGLIB_DIR = ${BUILDLINK_DIR}/lib +JPEGHDR_DIR = ${BUILDLINK_DIR}/include d136 2 a137 2 +PNGLIB_DIR = $(BUILDLINK_DIR)/lib +PNGHDR_DIR = $(BUILDLINK_DIR)/include @ 1.18 log @Fix build problems under Solaris. The necessary patches were contributed by Lubomir Sedlacik in PR pkg/16554. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.17 2002/03/20 12:42:12 wiz Exp $ d4 1 a4 1 +++ Makefile.config.in Mon Apr 29 17:19:59 2002 d23 9 d46 1 a46 1 @@@@ -156,9 +156,9 @@@@ d58 8 @ 1.18.2.1 log @Merge from pkgsrc-current to buildlink2 branch. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.19 2002/05/14 18:03:18 tron Exp $ d4 1 a4 1 +++ Makefile.config.in Tue May 14 19:52:32 2002 a22 9 @@@@ -64,7 +64,7 @@@@ # STRIPFLAG is the option you pass to the above install program to make it # strip unnecessary information out of binaries. -STRIPFLAG = -s +#STRIPFLAG = -s # If you don't want to strip the binaries, just leave it null: #STRIPFLAG = d37 1 a37 1 @@@@ -156,16 +156,16 @@@@ a48 8 # Here, $(SONAME) resolves to the soname for the shared library being created. # The following are gcc options. This works on GNU libc systems. -LDSHLIB = -shared -Wl,-soname,$(SONAME) +LDSHLIB = -nostdlib -shared -Wl,-Bshareable,-soname,$(SONAME) # You need -nostart instead of -shared on BeOS. Though the BeOS compiler is # ostensibly gcc, it has the -nostart option, which is not mentioned in gcc # documentation and doesn't exist in at least one non-BeOS installation. @ 1.18.2.2 log @Simplify some patches and remove others now that buildlink2 does most of the work. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.18.2.1 2002/06/23 18:46:50 jlam Exp $ d120 2 a121 2 +JPEGLIB_DIR = ${LOCALBASE}/lib +JPEGHDR_DIR = ${LOCALBASE}/include d136 2 a137 2 +PNGLIB_DIR = $(LOCALBASE)/lib +PNGHDR_DIR = $(LOCALBASE)/include @ 1.17 log @Fix compilation on 1.4.x, and remove a patch that was still referencing libtool. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.16 2002/03/15 11:04:30 wiz Exp $ d4 1 a4 1 +++ Makefile.config.in d49 3 a51 1 @@@@ -182,9 +182,9 @@@@ d53 4 d67 1 a67 1 @@@@ -204,7 +204,7 @@@@ d76 1 a76 1 @@@@ -222,11 +222,11 @@@@ d92 1 a92 1 @@@@ -250,11 +250,11 @@@@ d108 1 a108 1 @@@@ -269,11 +269,11 @@@@ d124 1 a124 1 @@@@ -317,7 +317,7 @@@@ d133 1 a133 1 @@@@ -364,7 +364,7 @@@@ @ 1.16 log @Update to 9.25: Changes since 9.24: Add pamdice, pnmnorm (replacing ppmnorm and pgmnorm), convert bmptoppm to bmptopnm, and some bug fixes and enhancements. @ text @d1 1 a1 1 $NetBSD$ d42 1 a42 1 +LDFLAGS += -Wl,--rpath,$(INSTALLLIBS) d54 1 a54 1 +LDSHLIB += -Wl,--rpath,$(INSTALLLIBS) @ 1.15 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 @d3 1 a3 1 --- Makefile.config.in.orig Sun Jan 13 20:37:46 2002 d14 1 a14 1 @@@@ -44,7 +44,7 @@@@ d18 2 a19 2 -INSTALL = ginstall +#INSTALL = ginstall d23 1 a23 10 @@@@ -96,7 +96,7 @@@@ # -ansi and -Werror should work too, but are not included # by default because there's no point in daring the build to fail. # -pedantic isn't a problem because it causes at worst a warning. -CFLAGS = -pedantic -O3 -Wall -Wno-uninitialized +CFLAGS += -pedantic -Wall -Wno-uninitialized # On DEC Tru64 4.0F (at least), you need -DLONG_32 for ppmtompeg. #Tru64: #CFLAGS = -O2 -std1 -DLONG_32 @@@@ -125,10 +125,10 @@@@ d37 1 a37 1 @@@@ -144,9 +144,9 @@@@ d49 1 a49 1 @@@@ -170,9 +170,9 @@@@ d61 1 a61 1 @@@@ -192,7 +192,7 @@@@ d70 1 a70 1 @@@@ -210,11 +210,11 @@@@ d86 1 a86 1 @@@@ -238,11 +238,11 @@@@ d102 1 a102 1 @@@@ -257,11 +257,11 @@@@ d118 1 a118 1 @@@@ -300,7 +300,7 @@@@ d127 1 a127 1 @@@@ -346,7 +346,7 @@@@ @ 1.14 log @It's ${BUILDLINK_DIR}/lib, not ${BUILDLINK_LIBDIR}. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.13 2001/06/16 19:50:57 jlam Exp $ d3 8 a10 19 --- Makefile.config.orig Thu Jun 22 13:48:03 2000 +++ Makefile.config Fri Jun 15 17:42:45 2001 @@@@ -29,8 +29,8 @@@@ # # For cygwin, only static libraries work, so set STATICLIB = Y . -STATICLIB = N -#STATICLIB = Y +#STATICLIB = N +STATICLIB = Y # The following are commands for the build process to use. These values # do not get built into anything. @@@@ -39,19 +39,20 @@@@ #Tru64: #CC = cc #CC = gcc -CC = gcc +#CC = gcc d13 2 a14 7 -LD = $(CC) +#LD = $(CC) #LD = ld #Tru64: #LD = cc #LD = gcc +LD = $(LIBTOOL) --mode=link $(CC) a16 1 SHELL = /bin/sh d20 1 a20 1 # Solaris: d23 1 a23 10 @@@@ -59,7 +60,7 @@@@ #OSF1: #INSTALL = installosf # ? -#INSTALL = install +#INSTALL = install -c # Normally the man pages are installed using "install". But via this # variable, you can use something else, for example a script that @@@@ -79,7 +80,7 @@@@ d27 2 a28 2 -CFLAGS = -pedantic -O2 -Wall -Wno-uninitialized $(CDEBUG) +CFLAGS += -pedantic -Wall -Wno-uninitialized $(CDEBUG) d31 9 a39 4 #CFLAGS = -O2 -std1 DLONG_32 $(CDEBUG) @@@@ -93,7 +94,7 @@@@ # linker options. d46 1 a46 2 @@@@ -148,11 +149,11 @@@@ # but otherwise will not. d48 39 a86 5 # Use the Tiff library included with Netpbm: -TIFFHDR_DIR = $(SRCDIR)/libtiff -TIFFLIB_DIR = $(SRCDIR)/libtiff +#TIFFHDR_DIR = $(SRCDIR)/libtiff +#TIFFLIB_DIR = $(SRCDIR)/libtiff d88 1 d90 2 a91 3 -#TIFFLIB_DIR = $(LOCALBASE)/lib +TIFFHDR_DIR = ${BUILDLINK_DIR}/include +TIFFLIB_DIR = ${BUILDLINK_DIR}/lib d93 1 d95 3 a97 4 #TIFFLIB_DIR = /usr/local1/DEC/lib @@@@ -173,11 +174,11 @@@@ # at least JPEGLIB_DIR here, or the tiff converters will not build at # all. d99 1 a99 1 -JPEGLIB_DIR = /usr/lib/jpeg d101 1 a101 1 +#JPEGLIB_DIR = /usr/lib/jpeg d111 3 a113 3 @@@@ -195,11 +196,11 @@@@ # here. If you do not have the PNG library, and still want to # successully build everything else, put NONE for these. d115 1 a115 1 -PNGLIB_DIR = /lib d117 1 a117 1 +#PNGLIB_DIR = /lib d122 2 a123 2 +PNGLIB_DIR = ${BUILDLINK_DIR}/lib +PNGHDR_DIR = ${BUILDLINK_DIR}/include d127 1 a127 1 @@@@ -222,7 +223,7 @@@@ d136 9 a144 11 @@@@ -305,8 +306,8 @@@@ #be a rule in the makefiles to make whatever the fliename turns out to be. #Only .a and .so work. ifeq ($(STATICLIB),Y) - NETPBMLIBSUFFIX = a - LIBTIFFSUFFIX = a + NETPBMLIBSUFFIX = la + LIBTIFFSUFFIX = la else NETPBMLIBSUFFIX = so LIBTIFFSUFFIX = so @ 1.13 log @Convrt to use buildlink.mk. @ text @d1 1 a1 1 $NetBSD$ d110 2 a111 2 +PNGLIB_DIR = ${BUILDLINK_LIBDIR}/lib +PNGHDR_DIR = ${BUILDLINK_LIBDIR}/include @ 1.12 log @Make this package work under Solaris. @ text @d3 2 a4 2 --- Makefile.config~ Thu Jun 22 19:48:03 2000 +++ Makefile.config Sun Jan 14 14:09:14 2001 d78 2 a79 2 +TIFFHDR_DIR = $(LOCALBASE)/include +TIFFLIB_DIR = $(LOCALBASE)/lib d94 2 a95 2 +JPEGLIB_DIR = ${LOCALBASE}/lib +JPEGHDR_DIR = ${LOCALBASE}/include d110 2 a111 2 +PNGLIB_DIR = $(LOCALBASE)/lib +PNGHDR_DIR = $(LOCALBASE)/include @ 1.11 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 2 a4 2 --- Makefile.config.orig Thu Jun 22 19:48:03 2000 +++ Makefile.config Sun Jul 9 23:54:46 2000 d45 1 a45 1 +INSTALL = install -c d115 9 @ 1.10 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 2 a4 2 --- Makefile.config.orig Thu Jun 1 19:17:32 2000 +++ Makefile.config Mon Jun 5 01:35:05 2000 d16 1 a16 1 @@@@ -39,14 +39,15 @@@@ a31 3 # Normally the man pages are installed using "install". But via this # variable, you can use something else, for example a script that @@@@ -59,7 +60,7 @@@@ d35 2 a36 2 -INSTALL = install +INSTALL = install -c d40 6 a45 3 @@@@ -73,7 +74,7 @@@@ # C compiler options d47 6 d58 1 a58 1 @@@@ -87,7 +88,7 @@@@ d67 1 a67 1 @@@@ -139,11 +140,11 @@@@ d83 1 a83 1 @@@@ -164,11 +165,11 @@@@ d99 1 a99 1 @@@@ -186,11 +187,11 @@@@ d115 1 a115 1 @@@@ -296,8 +297,8 @@@@ @ 1.9 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 @d3 2 a4 2 --- Makefile.config.orig Tue May 9 02:32:59 2000 +++ Makefile.config Wed May 17 11:34:31 2000 d9 1 d11 1 a11 1 -STATICLIB = N a12 1 +#STATICLIB = N d16 2 a17 2 @@@@ -38,12 +38,13 @@@@ # The C compiler (including macro preprocessor) d20 2 a21 2 -CC = gcc -fpcc-struct-return +#CC = gcc -fpcc-struct-return d24 2 d27 1 d29 1 a29 2 -LD = gcc +#LD = gcc d34 2 a35 1 @@@@ -57,7 +58,7 @@@@ d37 3 d42 2 a43 4 -INSTALL = install +INSTALL = install -c AR= ar RANLIB= ranlib d45 1 a45 1 @@@@ -66,7 +67,7 @@@@ d47 2 d50 1 d52 3 a54 2 -CFLAGS = -pedantic -O2 -Wall -Wno-uninitialized $(CDEBUG) +CFLAGS += -pedantic -Wall -Wno-uninitialized $(CDEBUG) a55 6 # EXE is a suffix that the linker puts on any executable it generates. # In cygwin, this is .exe and most program deal with its existence without @@@@ -89,7 +90,7 @@@@ #LDFLAGS = -R$(INSTALLLIBS) #If the linker is gcc (e.g. NetBSD): #LDFLAGS = -Wl,--rpath,$(INSTALLLIBS) d58 4 a61 4 # Linker options for created Netpbm shared libraries. @@@@ -126,13 +127,13 @@@@ d64 5 d77 2 a78 8 -TIFFHDR_DIR = $(SRCDIR)/libtiff -TIFFLIB_DIR = $(SRCDIR)/libtiff +#TIFFHDR_DIR = $(SRCDIR)/libtiff +#TIFFLIB_DIR = $(SRCDIR)/libtiff # Put the location of your JPEG library here. # If you want to build the jpeg converters or tiff @@@@ -151,8 +152,8 @@@@ d81 4 d93 2 a94 12 @@@@ -160,8 +161,8 @@@@ #JPEGHDR_DIR = /usr/local/include #JPEGLIB_DIR = NONE #JPEGHDR_DIR = NONE -JPEGLIB_DIR = /usr/lib/jpeg -JPEGHDR_DIR = /usr/include/jpeg +#JPEGLIB_DIR = /usr/lib/jpeg +#JPEGHDR_DIR = /usr/include/jpeg # Put the location of your PNG library here. If you want to build the @@@@ -171,8 +172,8 @@@@ d97 4 d109 1 a109 12 @@@@ -182,8 +183,8 @@@@ # No PNG: #PNGLIB_DIR = NONE #PNGHDR_DIR = NONE -PNGLIB_DIR = /lib -PNGHDR_DIR = /usr/include/png +#PNGLIB_DIR = /lib +#PNGHDR_DIR = /usr/include/png # And the Utah Raster Toolkit (aka URT aka RLE) library: @@@@ -275,8 +276,8 @@@@ @ 1.8 log @* Remove redundant dependency on jpeg * Update dependency on tiff * Fixes for paths to find libraries and includes @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.7 1999/07/25 21:17:33 tron Exp $ d3 3 a5 56 --- Makefile.orig Wed Jan 26 06:47:35 1994 +++ Makefile Tue May 4 16:51:11 1999 @@@@ -21,7 +21,7 @@@@ #CC = gcc -ansi -pedantic -fcombine-regs -fpcc-struct-return # CONFIGURE: cc flags go here. -CFLAGS = -O +CFLAGS = -O2 #CFLAGS = -g #CFLAGS = -g -O @@@@ -48,33 +48,36 @@@@ # By the way, you must have at least version 2.4 of libtiff. Earlier # versions will not work. 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 # CONFIGURE: Define the directory that you want the binaries copied to. # 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: Define 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 = install -c -m 0644 #MANCP = ../mantocat +INSTALLLIBS = $(PREFIX)/lib +INSTALLDEFS = $(PREFIX)/include + # CONFIGURE: Normally the Makefiles build and install separate binaries for # each program. However, on some systems (especially those without shared # libraries) this can mean a lot of space. In this case you might try @@@@ -87,10 +90,10 @@@@ d7 125 a131 62 # Note that if you make a "merge", the executables don't get created # until you do the install. -#all: binaries -#install: install.bin install.man -all: merge -install: install.merge install.man +all: binaries +install: install.bin install.man +#all: merge +#install: install.merge install.man # End of configurable definitions. @@@@ -99,10 +102,10 @@@@ SUBDIRS = pbm pgm ppm pnm binaries: - ./stamp-date - ( echo "libtiff" ; cd libtiff ; make ) +# ./stamp-date +# ( echo "libtiff" ; cd libtiff ; make ) for i in $(SUBDIRS) ; do \ - ( echo $$i ; cd $$i ; $(MAKE) $(MFLAGS) 'CC=$(CC)' 'CFLAGS=$(CFLAGS)' 'TIFFDEF=$(TIFFDEF)' 'TIFFINC=$(TIFFINC)' 'TIFFLIB=$(TIFFLIB)' 'TIFFBINARIES=$(TIFFBINARIES)' 'TIFFOBJECTS=$(TIFFOBJECTS)' 'LDFLAGS=$(LDFLAGS)' binaries ); \ + ( echo "===> $$i" ; cd $$i ; $(MAKE) $(MFLAGS) 'CC=$(CC)' 'CFLAGS=$(CFLAGS)' 'TIFFDEF=$(TIFFDEF)' 'TIFFINC=$(TIFFINC)' 'TIFFLIB=$(TIFFLIB)' 'TIFFBINARIES=$(TIFFBINARIES)' 'TIFFOBJECTS=$(TIFFOBJECTS)' 'LDFLAGS=$(LDFLAGS)' binaries ); \ done merge: @@@@ -113,15 +116,20 @@@@ done install.bin: - -mkdir $(INSTALLBINARIES) +# -mkdir $(INSTALLBINARIES) +# -mkdir $(INSTALLLIBS) +# -mkdir $(INSTALLDEFS) + $(MANCP) pbmplus.h $(INSTALLDEFS) for i in $(SUBDIRS) ; do \ - ( echo $$i ; cd $$i ; $(MAKE) $(MFLAGS) 'CC=$(CC)' 'CFLAGS=$(CFLAGS)' 'TIFFDEF=$(TIFFDEF)' 'TIFFINC=$(TIFFINC)' 'TIFFLIB=$(TIFFLIB)' 'TIFFBINARIES=$(TIFFBINARIES)' 'TIFFOBJECTS=$(TIFFOBJECTS)' 'LDFLAGS=$(LDFLAGS)' 'INSTALLBINARIES=$(INSTALLBINARIES)' 'INSTALLSCRIPTS=$(INSTALLSCRIPTS)' install.bin ); \ + ( echo $$i ; cd $$i ; $(MAKE) $(MFLAGS) 'CC=$(CC)' 'CFLAGS=$(CFLAGS)' 'TIFFDEF=$(TIFFDEF)' 'TIFFINC=$(TIFFINC)' 'TIFFLIB=$(TIFFLIB)' 'TIFFBINARIES=$(TIFFBINARIES)' 'TIFFOBJECTS=$(TIFFOBJECTS)' 'LDFLAGS=$(LDFLAGS)' 'INSTALLBINARIES=$(INSTALLBINARIES)' 'INSTALLSCRIPTS=$(INSTALLSCRIPTS)' 'INSTALLLIBS=$(INSTALLLIBS)' 'INSTALLDEFS=$(INSTALLDEFS)' install.bin ); \ done install.merge: - -mkdir $(INSTALLBINARIES) +# -mkdir $(INSTALLBINARIES) +# -mkdir $(INSTALLLIBS) +# -mkdir $(INSTALLDEFS) for i in $(SUBDIRS) ; do \ - ( echo $$i ; cd $$i ; $(MAKE) $(MFLAGS) 'CC=$(CC)' 'CFLAGS=$(CFLAGS)' 'TIFFDEF=$(TIFFDEF)' 'TIFFINC=$(TIFFINC)' 'TIFFLIB=$(TIFFLIB)' 'TIFFBINARIES=$(TIFFBINARIES)' 'TIFFOBJECTS=$(TIFFOBJECTS)' 'LDFLAGS=$(LDFLAGS)' 'INSTALLBINARIES=$(INSTALLBINARIES)' 'INSTALLSCRIPTS=$(INSTALLSCRIPTS)' install.merge ); \ + ( echo $$i ; cd $$i ; $(MAKE) $(MFLAGS) 'CC=$(CC)' 'CFLAGS=$(CFLAGS)' 'TIFFDEF=$(TIFFDEF)' 'TIFFINC=$(TIFFINC)' 'TIFFLIB=$(TIFFLIB)' 'TIFFBINARIES=$(TIFFBINARIES)' 'TIFFOBJECTS=$(TIFFOBJECTS)' 'LDFLAGS=$(LDFLAGS)' 'INSTALLBINARIES=$(INSTALLBINARIES)' 'INSTALLSCRIPTS=$(INSTALLSCRIPTS)' 'INSTALLLIBS=$(INSTALLLIBS)' 'INSTALLDEFS=$(INSTALLDEFS)' install.merge ); \ done install.man: @@@@ -131,7 +139,7 @@@@ clean: rm -f *.shar *.shar? art.* *~ - echo "" > compile.h - for i in $(SUBDIRS) libtiff ; do \ + rm -f compile.h ; echo "" > compile.h + for i in $(SUBDIRS) ; do \ ( echo $$i ; cd $$i ; $(MAKE) $(MFLAGS) clean ); \ done @ 1.7 log @Fix run time library path. Patches supplied by Dave Huang in PR pkg/8071. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.6 1999/06/03 20:55:55 christos Exp $ d20 2 a21 2 +TIFFINC = -I$(PREFIX)/include +TIFFLIB = -Wl,-R$(PREFIX)/lib -L$(PREFIX)/lib -ltiff -ljpeg @ 1.6 log @This has been broken forever. In order to compile other pbm programs using the includes and the libraries in the pkg you need to include pbmplus.h... fix the Makefile to install it and add it to the plist. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 1999/01/10 23:52:15 tron Exp $ d21 1 a21 1 +TIFFLIB = -L$(PREFIX)/lib -ltiff -ljpeg @ 1.5 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$ d3 2 a4 2 --- Makefile.orig Wed Jan 26 12:47:35 1994 +++ Makefile Mon Jan 11 00:17:07 1999 d87 1 a87 1 @@@@ -113,15 +116,19 @@@@ d95 1 d112 1 a112 1 @@@@ -131,7 +138,7 @@@@ @ 1.4 log @Add NetBSD RCS Ids. @ text @d4 11 a14 2 +++ Makefile Wed Feb 25 02:22:04 1998 @@@@ -48,31 +48,31 @@@@ d49 1 a49 1 +MANCP = ${INSTALL_MAN} d52 3 d56 3 a58 1 @@@@ -87,10 +87,10 @@@@ d73 1 a73 1 @@@@ -99,8 +99,8 @@@@ d82 38 a119 1 ( echo $$i ; cd $$i ; $(MAKE) $(MFLAGS) 'CC=$(CC)' 'CFLAGS=$(CFLAGS)' 'TIFFDEF=$(TIFFDEF)' 'TIFFINC=$(TIFFINC)' 'TIFFLIB=$(TIFFLIB)' 'TIFFBINARIES=$(TIFFBINARIES)' 'TIFFOBJECTS=$(TIFFOBJECTS)' 'LDFLAGS=$(LDFLAGS)' binaries ); \ @ 1.3 log @Install manual pages with reasonable permissions. @ text @d1 2 @ 1.2 log @Update to more current version; fixes PR 4737 by Matthias Scheler . @ text @d2 2 a3 2 +++ Makefile Sat Dec 20 22:54:14 1997 @@@@ -48,24 +48,24 @@@@ d34 8 @ 1.1 log @Initial revision @ text @d1 59 a59 91 *** Imakefile.orig Mon Dec 13 13:01:21 1993 --- Imakefile Wed Sep 21 21:26:49 1994 *************** *** 22,64 **** #endif all:: ! stamp-date 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 "" #if InstallIncludes InstallMultipleFlags(pbmplus.h,$(PBMPLUSDIR)$(PBMPLUSINCDIR),$(INSTINCFLAGS)) --- 22,64 ---- #endif all:: ! ./stamp-date 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 "" #if InstallIncludes InstallMultipleFlags(pbmplus.h,$(PBMPLUSDIR)$(PBMPLUSINCDIR),$(INSTINCFLAGS)) @ 1.1.1.1 log @Initial import of FreeBSD's netpbm port into the NetBSD packages system. @ text @@