head 1.6; access; symbols OPENPKG_E1_MP_HEAD:1.4 OPENPKG_E1_MP:1.4 OPENPKG_E1_MP_2_STABLE:1.3.6.1 OPENPKG_E1_FP:1.3.6.1 OPENPKG_2_STABLE_MP:1.4 OPENPKG_2_STABLE_20061018:1.3 OPENPKG_2_STABLE_20060622:1.3 OPENPKG_2_STABLE:1.3.0.6 OPENPKG_2_STABLE_BP:1.3 OPENPKG_2_5_RELEASE:1.3 OPENPKG_2_5_SOLID:1.3.0.4 OPENPKG_2_5_SOLID_BP:1.3 OPENPKG_2_4_RELEASE:1.3 OPENPKG_2_4_SOLID:1.3.0.2 OPENPKG_2_4_SOLID_BP:1.3 OPENPKG_2_3_RELEASE:1.2 OPENPKG_2_3_SOLID:1.2.0.6 OPENPKG_2_3_SOLID_BP:1.2 OPENPKG_2_2_RELEASE:1.2 OPENPKG_2_2_SOLID:1.2.0.4 OPENPKG_2_2_SOLID_BP:1.2 OPENPKG_2_1_RELEASE:1.2 OPENPKG_2_1_SOLID:1.2.0.2 OPENPKG_2_1_SOLID_BP:1.2; locks; strict; comment @# @; 1.6 date 2009.12.30.08.47.44; author rse; state Exp; branches; next 1.5; commitid f7TXQlQuCKWKmnhu; 1.5 date 2009.12.12.12.01.13; author rse; state Exp; branches; next 1.4; commitid u6kA9wyIjgM015fu; 1.4 date 2006.10.24.06.21.11; author rse; state Exp; branches; next 1.3; commitid mfnKewFlFxyeWTRr; 1.3 date 2005.04.05.18.26.13; author rse; state Exp; branches 1.3.6.1; next 1.2; 1.2 date 2004.04.08.10.13.37; author ms; state dead; branches; next 1.1; 1.1 date 2004.03.19.08.34.19; author rse; state Exp; branches; next ; 1.3.6.1 date 2006.10.24.06.21.55; author rse; state Exp; branches; next ; commitid EoKmrseTVMiuWTRr; desc @@ 1.6 log @upgrading package: netpbm 10.35.71 -> 10.35.72 @ text @Index: converter/other/jpeg2000/jpeg2ktopam.c --- converter/other/jpeg2000/jpeg2ktopam.c.orig 2007-12-27 23:32:59 +0100 +++ converter/other/jpeg2000/jpeg2ktopam.c 2009-09-28 17:42:28 +0200 @@@@ -10,7 +10,6 @@@@ #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ /* Make sure strdup() is in string.h and int_fast32_t is in inttypes.h */ -#define _XOPEN_SOURCE 600 #include #include "pam.h" Index: converter/other/jpeg2000/pamtojpeg2k.c --- converter/other/jpeg2000/pamtojpeg2k.c.orig 2007-12-27 23:32:59 +0100 +++ converter/other/jpeg2000/pamtojpeg2k.c 2009-09-28 17:42:41 +0200 @@@@ -10,7 +10,6 @@@@ #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ /* Make sure strdup() is in string.h and int_fast32_t is in inttypes.h */ -#define _XOPEN_SOURCE 600 #include #include "pam.h" Index: lib/libpm.c --- lib/libpm.c.orig 2006-08-19 05:12:28 +0200 +++ lib/libpm.c 2009-09-28 17:41:00 +0200 @@@@ -669,7 +669,7 @@@@ pm_openr(const char * const name) { FILE* f; - if (strcmp(name, "-") == 0) + if (name == NULL || strcmp(name, "-") == 0) f = stdin; else { #ifndef VMS @@@@ -691,7 +691,7 @@@@ pm_openw(const char * const name) { FILE* f; - if (strcmp(name, "-") == 0) + if (name == NULL || strcmp(name, "-") == 0) f = stdout; else { #ifndef VMS Index: lib/pm_gamma.h --- lib/pm_gamma.h.orig 2006-08-19 05:12:28 +0200 +++ lib/pm_gamma.h 2009-09-28 17:41:00 +0200 @@@@ -12,7 +12,7 @@@@ } /* to fake out automatic code indenters */ #endif -static __inline__ float +static float pm_gamma709(float const intensity) { /* Here are parameters of the gamma transfer function @@@@ -41,7 +41,7 @@@@ -static __inline__ float +static float pm_ungamma709(float const brightness) { /* These are the same parameters as in pm_gamma, above */ Index: GNUmakefile --- GNUmakefile.orig 2008-09-27 03:37:09 +0200 +++ GNUmakefile 2009-12-12 12:46:13 +0100 @@@@ -263,11 +263,7 @@@@ MERGELIBS += $(X11LIB) endif -ifeq ($(shell libpng-config --version),) PNGLD = $(shell $(LIBOPT) $(LIBOPTR) $(PNGLIB) $(ZLIB)) -else - PNGLD = $(shell libpng-config --ldflags) -endif ifeq ($(shell xml2-config --version),) XML2LD= Index: converter/other/Makefile --- converter/other/Makefile.orig 2009-09-18 21:04:37 +0200 +++ converter/other/Makefile 2009-12-12 12:54:11 +0100 @@@@ -27,7 +27,6 @@@@ endif endif -ifeq ($(shell libpng-config --version),) ifneq ($(PNGLIB),NONE) HAVE_PNGLIB = Y ifneq ($(PNGHDR_DIR)x,x) @@@@ -37,10 +36,6 @@@@ INCLUDES += -I$(ZHDR_DIR) endif endif -else - HAVE_PNGLIB = Y - INCLUDES += $(shell libpng-config --cflags) -endif ifneq ($(JPEGLIB),NONE) ifneq ($(JPEGHDR_DIR)x,x) @@@@ -148,11 +143,7 @@@@ $(LD) -o $@@ $@@.o tiff.o \ $(LIBOPTS_TIFF) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) -ifeq ($(shell libpng-config --version),) PNGLIB_LIBOPTS = $(shell $(LIBOPT) $(LIBOPTR) $(PNGLIB) $(ZLIB)) -else - PNGLIB_LIBOPTS = $(shell libpng-config --ldflags) -endif pngtopnm: %: %.o $(NETPBMLIB) $(LIBOPT) $(LD) -o $@@ $@@.o \ Index: lib/libsystem.c --- lib/libsystem.c.orig 2009-12-29 21:46:34 +0100 +++ lib/libsystem.c 2009-12-30 09:41:53 +0100 @@@@ -216,8 +216,10 @@@@ return "SIGWINCH"; case SIGIO: return "SIGIO"; +#ifdef SIGPWR case SIGPWR: return "SIGPWR"; +#endif case SIGSYS: return "SIGSYS"; default: @ 1.5 log @upgrading package: netpbm 10.26.63 -> 10.35.71 @ text @d114 14 @ 1.4 log @fix building under FreeBSD/amd64 @ text @d2 3 a4 4 --- converter/other/jpeg2000/jpeg2ktopam.c.orig 2005-05-19 17:29:47 +0200 +++ converter/other/jpeg2000/jpeg2ktopam.c 2006-10-24 08:07:49 +0200 @@@@ -9,7 +9,6 @@@@ *****************************************************************************/ d7 2 a8 1 -#define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ d13 3 a15 4 --- converter/other/jpeg2000/pamtojpeg2k.c.orig 2005-02-21 04:56:41 +0100 +++ converter/other/jpeg2000/pamtojpeg2k.c 2006-10-24 08:07:49 +0200 @@@@ -9,7 +9,6 @@@@ *****************************************************************************/ d18 2 a19 1 -#define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ d24 3 a26 3 --- lib/libpm.c.orig 2004-11-20 17:55:27 +0100 +++ lib/libpm.c 2006-10-24 08:07:49 +0200 @@@@ -617,7 +617,7 @@@@ d35 1 a35 1 @@@@ -639,7 +639,7 @@@@ d45 5 a49 5 --- lib/pm_gamma.h.orig 2004-06-13 00:53:25 +0200 +++ lib/pm_gamma.h 2006-10-24 08:18:26 +0200 @@@@ -5,7 +5,7 @@@@ #include d56 1 a56 1 @@@@ -34,7 +34,7 @@@@ d65 49 @ 1.3 log @include bugfix patch from FreeBSD port and merge out subst into it, too @ text @d2 2 a3 2 --- converter/other/jpeg2000/jpeg2ktopam.c.orig 2005-03-06 21:27:28 +0100 +++ converter/other/jpeg2000/jpeg2ktopam.c 2005-04-05 20:22:33 +0200 d14 1 a14 1 +++ converter/other/jpeg2000/pamtojpeg2k.c 2005-04-05 20:22:37 +0200 d25 1 a25 1 +++ lib/libpm.c 2005-04-05 20:22:46 +0200 d44 21 @ 1.3.6.1 log @MFC: fix building under FreeBSD/amd64 @ text @d2 2 a3 2 --- converter/other/jpeg2000/jpeg2ktopam.c.orig 2005-05-19 17:29:47 +0200 +++ converter/other/jpeg2000/jpeg2ktopam.c 2006-10-24 08:07:49 +0200 d14 1 a14 1 +++ converter/other/jpeg2000/pamtojpeg2k.c 2006-10-24 08:07:49 +0200 d25 1 a25 1 +++ lib/libpm.c 2006-10-24 08:07:49 +0200 a43 21 Index: lib/pm_gamma.h --- lib/pm_gamma.h.orig 2004-06-13 00:53:25 +0200 +++ lib/pm_gamma.h 2006-10-24 08:18:26 +0200 @@@@ -5,7 +5,7 @@@@ #include -static __inline__ float +static float pm_gamma709(float const intensity) { /* Here are parameters of the gamma transfer function @@@@ -34,7 +34,7 @@@@ -static __inline__ float +static float pm_ungamma709(float const brightness) { /* These are the same parameters as in pm_gamma, above */ @ 1.2 log @upgrading package: netpbm 10.18.11 -> 10.18.12 @ text @d1 5 a5 9 Index: lib/Makefile --- lib/Makefile.orig 2004-03-18 19:10:15.000000000 +0100 +++ lib/Makefile 2004-03-19 09:31:50.000000000 +0100 @@@@ -38,7 +38,7 @@@@ INTERFACE_HEADERS = pm.h pbm.h bitio.h pbmfont.h \ pgm.h ppm.h ppm.h ppmcmap.h ppmfloyd.h colorname.h \ pnm.h pam.h pammap.h util/shhopt.h util/nstring.h util/mallocvar.h \ - pm_system.h pm_gamma.h + pm_system.h d7 3 a9 1 DATAFILES = rgb.txt d11 33 @ 1.1 log @upgrading package: netpbm 10.18.9 -> 10.18.10 @ text @@