The netpbm "super stable" branch--the only one with releases--has jumped from 10.26 to the slightly less ancient 10.35, so here is an update to 10.35.75.
I didn't notice any exciting changes, apart from the addition of pamx, a minimal X11 viewer for files in the various netpbm formats. Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/netpbm/Makefile,v retrieving revision 1.50 diff -u -p -r1.50 Makefile --- Makefile 11 Oct 2009 19:36:15 -0000 1.50 +++ Makefile 30 Jun 2010 20:51:19 -0000 @@ -2,8 +2,8 @@ COMMENT= toolkit for converting images between different formats -DISTNAME= netpbm-10.26.64 -SHARED_LIBS= netpbm 1.0 +DISTNAME= netpbm-10.35.75 +SHARED_LIBS= netpbm 2.0 CATEGORIES= graphics HOMEPAGE= http://netpbm.sourceforge.net/ @@ -15,12 +15,14 @@ PERMIT_PACKAGE_CDROM= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netpbm/} EXTRACT_SUFX= .tgz -WANTLIB= c m z -LIB_DEPENDS= tiff.>=35::graphics/tiff \ - jpeg.>=62::graphics/jpeg \ - png.>=2::graphics/png \ +MODULES= converters/libiconv +WANTLIB= X11 Xau Xdmcp c m pthread-stubs xcb z +LIB_DEPENDS= tiff.>=38::graphics/tiff \ + jpeg.>=64::graphics/jpeg \ + png.>=10::graphics/png \ jbig.>=2::graphics/jbigkit \ - jasper.>=1::graphics/jasper + jasper.>=2::graphics/jasper \ + xml2.>=11::textproc/libxml USE_GMAKE= Yes MAKE_FILE= GNUmakefile @@ -31,6 +33,9 @@ INSTALL_TARGET= install.bin install.lib MAKE_FLAGS= CC="${CC}" \ LIBnetpbm_VERSION=${LIBnetpbm_VERSION} FAKE_FLAGS= PKGDIR="${WRKINST}${TRUEPREFIX}" + +pre-patch: + @rm -f ${WRKSRC}/converter/other/jpeg2000/libjasper/include/jasper/jas_types.h.orig pre-build: @perl -i -pe 's#%%X11BASE%%#${X11BASE}#g;' \ Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/netpbm/distinfo,v retrieving revision 1.14 diff -u -p -r1.14 distinfo --- distinfo 11 Oct 2009 19:36:15 -0000 1.14 +++ distinfo 30 Jun 2010 20:51:19 -0000 @@ -1,5 +1,5 @@ -MD5 (netpbm-10.26.64.tgz) = qJXwAtjiC8aNAD7nctt28Q== -RMD160 (netpbm-10.26.64.tgz) = w+kiquwyClaS+w1xteNDA9ncL58= -SHA1 (netpbm-10.26.64.tgz) = FRjWJoo1ogix31V9bhkyNtLsVvg= -SHA256 (netpbm-10.26.64.tgz) = HPiRc/FB4uj0bFS5U380TIdPjj/9HUGpXUHeAtknJXs= -SIZE (netpbm-10.26.64.tgz) = 2545993 +MD5 (netpbm-10.35.75.tgz) = Q/poZ+EUfx/1zvSw1+EiYA== +RMD160 (netpbm-10.35.75.tgz) = ABVI9a7zMAQin+8Gp1sqx9UxTt0= +SHA1 (netpbm-10.35.75.tgz) = BYfUBS7VY+qPfIqUQmzZ+nn/aVk= +SHA256 (netpbm-10.35.75.tgz) = Vf+qgwzXBDX7k0lhrzCS1euKCa+d2UBvSGZeweP3M2o= +SIZE (netpbm-10.35.75.tgz) = 2546804 Index: files/Makefile.config.OpenBSD =================================================================== RCS file: /cvs/ports/graphics/netpbm/files/Makefile.config.OpenBSD,v retrieving revision 1.8 diff -u -p -r1.8 Makefile.config.OpenBSD --- files/Makefile.config.OpenBSD 19 Oct 2006 16:05:19 -0000 1.8 +++ files/Makefile.config.OpenBSD 30 Jun 2010 20:51:19 -0000 @@ -2,15 +2,17 @@ # Indented variables are unchanged from the defaults in Makefile.config.in. # Commented out variables are set in MAKE_FLAGS. # -DEFAULT_TARGET=nonmerge - BUILD_FIASCO=Y + DEFAULT_TARGET = nonmerge + BUILD_FIASCO = Y #CC - LD=$(CC) + LD = $(CC) LINKERISCOMPILER=Y LINKER_CAN_DO_EXPLICIT_LIBRARY=N INTTYPES_H = <inttypes.h> + HAVE_INT64 = Y CC_FOR_BUILD = $(CC) LD_FOR_BUILD = $(LD) + CFLAGS_FOR_BUILD = $(CFLAGS) #INSTALL = $(SRCDIR)/buildtools/install.sh STRIPFLAG = -s SYMLINK = ln -s @@ -18,10 +20,10 @@ DEFAULT_TARGET=nonmerge AR = ar RANLIB = ranlib LEX = flex -#CFLAGS= +#CFLAGS = EXE = - LDFLAGS= - LDSHLIB= -shared + LDFLAGS = +LDSHLIB = -shared LDRELOC = NONE CFLAGS_SHLIB = -fpic SHLIB_CLIB = @@ -33,20 +35,24 @@ TIFFHDR_DIR = $(LOCALBASE)/include TIFFLIB_NEEDS_Z = Y JPEGLIB = -L$(LOCALBASE)/lib -ljpeg JPEGHDR_DIR = $(LOCALBASE)/include -PNGLIB = -L$(LOCALBASE)/lib -lpng -PNGHDR_DIR = $(LOCALBASE)/include/libpng + PNGVER = ZLIB = -lz + ZHDR_DIR = JBIGLIB = -L$(LOCALBASE)/lib -ljbig JBIGHDR_DIR = $(LOCALBASE)/include JASPERLIB = -L$(LOCALBASE)/lib -ljasper JASPERHDR_DIR = $(LOCALBASE)/include URTLIB = $(BUILDDIR)/urt/librle.a URTHDR_DIR = $(SRCDIR)/urt +X11LIB = -L$(X11BASE)/lib -lX11 -lXau -lXdmcp -lxcb -lpthread-stubs +X11HDR_DIR = $(X11BASE)/include LINUXSVGALIB = NONE OMIT_NETWORK = NETWORKLD = VMS = + DONT_HAVE_PROCESS_MGMT = N #PKGDIR_DEFAULT = /tmp/netpbm + PKGMANDIR = man INSTALL_PERM_BIN = 755 INSTALL_PERM_LIBD = 755 INSTALL_PERM_LIBS = 644 Index: patches/patch-GNUmakefile =================================================================== RCS file: /cvs/ports/graphics/netpbm/patches/patch-GNUmakefile,v retrieving revision 1.4 diff -u -p -r1.4 patch-GNUmakefile --- patches/patch-GNUmakefile 9 May 2007 15:47:57 -0000 1.4 +++ patches/patch-GNUmakefile 30 Jun 2010 20:51:19 -0000 @@ -1,12 +1,12 @@ -$OpenBSD: patch-GNUmakefile,v 1.4 2007/05/09 15:47:57 naddy Exp $ ---- GNUmakefile.orig Sat Oct 16 22:27:50 2004 -+++ GNUmakefile Wed May 9 16:32:31 2007 -@@ -312,7 +312,7 @@ install-dev: install.hdr install.staticlib install.lib +$OpenBSD$ +--- GNUmakefile.orig Wed Jun 30 02:04:26 2010 ++++ GNUmakefile Wed Jun 30 02:04:50 2010 +@@ -361,7 +361,7 @@ install-dev: install.hdr install.staticlib install.lib install.hdr: $(PKGDIR)/include $(MAKE) -C lib -f $(SRCDIR)/lib/Makefile \ SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) install.hdr - $(INSTALL) -c -m $(INSTALL_PERM_HDR) \ + $(BSD_INSTALL_DATA) \ - $(SRCDIR)/pm_config.h $(PKGDIR)/include + $(BUILDDIR)/pm_config.h $(PKGDIR)/include ifeq ($(STATICLIB_TOO),y) Index: patches/patch-Makefile_common =================================================================== RCS file: /cvs/ports/graphics/netpbm/patches/patch-Makefile_common,v retrieving revision 1.6 diff -u -p -r1.6 patch-Makefile_common --- patches/patch-Makefile_common 9 May 2007 15:47:57 -0000 1.6 +++ patches/patch-Makefile_common 30 Jun 2010 20:51:19 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_common,v 1.6 2007/05/09 15:47:57 naddy Exp $ ---- Makefile.common.orig Mon Nov 13 05:15:44 2006 -+++ Makefile.common Wed May 9 16:32:31 2007 -@@ -355,19 +355,19 @@ install.bin: $(BINARIES:%=%_installbin) $(SCRIPTS:%=%_ +$OpenBSD$ +--- Makefile.common.orig Mon Nov 13 05:14:19 2006 ++++ Makefile.common Wed Jun 30 02:05:13 2010 +@@ -408,19 +408,19 @@ install.bin: $(BINARIES:%=%_installbin) $(SCRIPTS:%=%_ INSTALLBIN_TARGETS = $(BINARIES:%=%_installbin) netpbm_installbin .PHONY: $(INSTALLBIN_TARGETS) $(INSTALLBIN_TARGETS): $(PKGDIR)/bin Index: patches/patch-converter_other_pstopnm_c =================================================================== RCS file: patches/patch-converter_other_pstopnm_c diff -N patches/patch-converter_other_pstopnm_c --- patches/patch-converter_other_pstopnm_c 11 Jun 2006 18:22:06 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-converter_other_pstopnm_c,v 1.1 2006/06/11 18:22:06 naddy Exp $ ---- converter/other/pstopnm.c.orig Sat Nov 5 04:42:26 2005 -+++ converter/other/pstopnm.c Tue May 30 21:52:55 2006 -@@ -702,13 +702,13 @@ execGhostscript(int const inputPipeFd, - - if (verbose) { - pm_message("execing '%s' with args '%s' (arg 0), " -- "'%s', '%s', '%s', '%s', '%s', '%s', '%s'", -+ "'%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s", - ghostscriptProg, arg0, -- deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", "-"); -+ deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", "-dSAFER", "-"); - } - - execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q", -- "-dNOPAUSE", "-", NULL); -+ "-dNOPAUSE", "-dSAFER", "-", NULL); - - pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)", - ghostscriptProg, errno, strerror(errno)); Index: patches/patch-converter_ppm_ppmtompeg_jpeg_c =================================================================== RCS file: patches/patch-converter_ppm_ppmtompeg_jpeg_c diff -N patches/patch-converter_ppm_ppmtompeg_jpeg_c --- patches/patch-converter_ppm_ppmtompeg_jpeg_c 11 Oct 2009 19:36:15 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-converter_ppm_ppmtompeg_jpeg_c,v 1.1 2009/10/11 19:36:15 naddy Exp $ ---- converter/ppm/ppmtompeg/jpeg.c.orig Sun Oct 11 21:08:27 2009 -+++ converter/ppm/ppmtompeg/jpeg.c Sun Oct 11 21:14:24 2009 -@@ -481,7 +481,11 @@ ReadJPEG(mf, fp) - #ifdef JPEG4 - buffer_height = 8; /* could be 2, 4,8 rows high */ - #else -+#if JPEG_LIB_VERSION < 70 - buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size; -+#else -+ buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size; -+#endif - #endif - - for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components; Index: patches/patch-converter_ppm_ppmtompeg_parallel_c =================================================================== RCS file: patches/patch-converter_ppm_ppmtompeg_parallel_c diff -N patches/patch-converter_ppm_ppmtompeg_parallel_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-converter_ppm_ppmtompeg_parallel_c 30 Jun 2010 20:51:19 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- converter/ppm/ppmtompeg/parallel.c.orig Wed Jun 30 05:58:21 2010 ++++ converter/ppm/ppmtompeg/parallel.c Wed Jun 30 05:58:48 2010 +@@ -12,7 +12,7 @@ + * HEADER FILES * + *==============*/ + +-#define _XOPEN_SOURCE 500 /* Make sure stdio.h contains pclose() */ ++/*#define _XOPEN_SOURCE 500*/ /* Make sure stdio.h contains pclose() */ + /* _ALL_SOURCE is needed on AIX to make the C library include the + socket services (e.g. define struct sockaddr) + Index: patches/patch-lib_Makefile =================================================================== RCS file: /cvs/ports/graphics/netpbm/patches/patch-lib_Makefile,v retrieving revision 1.3 diff -u -p -r1.3 patch-lib_Makefile --- patches/patch-lib_Makefile 22 Apr 2008 19:20:59 -0000 1.3 +++ patches/patch-lib_Makefile 30 Jun 2010 20:51:19 -0000 @@ -1,9 +1,9 @@ -$OpenBSD: patch-lib_Makefile,v 1.3 2008/04/22 19:20:59 naddy Exp $ ---- lib/Makefile.orig Thu Dec 13 17:23:52 2007 -+++ lib/Makefile Tue Apr 22 21:15:55 2008 -@@ -35,6 +35,9 @@ endif +$OpenBSD$ +--- lib/Makefile.orig Wed Jun 30 02:15:15 2010 ++++ lib/Makefile Wed Jun 30 02:22:04 2010 +@@ -42,6 +42,9 @@ endif # Library objects to be linked but not built by Makefile.common: - LIBOBJECTS_X = util/shhopt.o util/nstring.o + LIBOBJECTS_X = util/shhopt.o util/nstring.o util/filename.o +SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS)) +SHLIBOBJECTS_X = $(patsubst %.o, %.lo, $(LIBOBJECTS_X)) @@ -11,18 +11,18 @@ $OpenBSD: patch-lib_Makefile,v 1.3 2008/ MANUALS3 = libnetpbm MANUALS5 = pbm pgm ppm pnm pam -@@ -76,6 +79,10 @@ extra_staticlib: $(EXTRA_STATICLIB) +@@ -80,6 +83,10 @@ extra_staticlib: $(EXTRA_STATICLIB) - $(LIBOBJECTS): %.o: %.c $(HEADERLINKS) + $(LIBOBJECTS): %.o: %.c importinc # Note that the user may have configured -I options into CFLAGS. + $(CC) -c $(INCLUDES) -DNDEBUG $(CFLAGS) \ + $(CFLAGS_PERSONAL) $(CADD) -o $@ $< + -+$(SHLIBOBJECTS): %.lo: %.c $(HEADERLINKS) ++$(SHLIBOBJECTS): %.lo: %.c importinc $(CC) -c $(INCLUDES) -DNDEBUG $(CFLAGS) $(CFLAGS_SHLIB) \ $(CFLAGS_PERSONAL) $(CADD) -o $@ $< -@@ -101,7 +108,7 @@ endif +@@ -107,7 +114,7 @@ endif ifeq ($(NETPBMLIBTYPE),unixshared) # The libxxx.so link is needed to link the executables. @@ -31,7 +31,7 @@ $OpenBSD: patch-lib_Makefile,v 1.3 2008/ rm -f $@ $(SYMLINK) $< $@ # The $(SONAME) link is needed only to test the programs without -@@ -110,9 +117,9 @@ libnetpbm.$(NETPBMLIBSUFFIX): $(SONAME) +@@ -116,9 +123,9 @@ libnetpbm.$(NETPBMLIBSUFFIX): $(SONAME) $(SONAME): libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) rm -f $@ $(SYMLINK) $< $@ @@ -40,20 +40,20 @@ $OpenBSD: patch-lib_Makefile,v 1.3 2008/ - $(SHLIB_CLIB) -lm $(LADD) +libnetpbm.$(NETPBMLIBSUFFIX).$(LIBnetpbm_VERSION): $(SHLIBOBJECTS) $(SHLIBOBJECTS_X) + $(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(SHLIBOBJECTS_X) \ -+ $(SHLIB_CLIB) $(LADD) ++ $(SHLIB_CLIB) $(LADD) endif ifeq ($(NETPBMLIBTYPE),dll) -@@ -179,7 +186,7 @@ endif +@@ -193,7 +200,7 @@ standardppmdfont.c:standard.ppmdfont compile.h: $(SRCDIR)/buildtools/stamp-date >$@ || rm $@ --util/shhopt.o util/nstring.o: FORCE -+util/shhopt.o util/nstring.o util/shhopt.lo util/nstring.lo: FORCE +-$(LIBOBJECTS_X): FORCE ++$(LIBOBJECTS_X) $(SHLIBOBJECTS_X): FORCE @if [ ! -d $(dir $@) ] ; then mkdir $(dir $@) ; fi $(MAKE) -C $(dir $@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@)Makefile \ SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@) -@@ -189,13 +196,9 @@ util/shhopt.o util/nstring.o: FORCE +@@ -205,13 +212,9 @@ libpm.o: compile.h .PHONY: install.lib ifeq ($(NETPBMLIBTYPE),unixshared) # install a Unix-style shared library @@ -70,7 +70,7 @@ $OpenBSD: patch-lib_Makefile,v 1.3 2008/ endif ifeq ($(NETPBMLIBTYPE),dll) #install a Windows DLL shared library -@@ -225,13 +228,13 @@ install.hdr: $(INTERFACE_HEADERS:%=%_installhdr) +@@ -241,13 +244,13 @@ install.hdr: $(INTERFACE_HEADERS:%=%_installhdr) # directory when you compile your programs. %_installhdr: $(PKGDIR)/include Index: patches/patch-lib_libsystem_c =================================================================== RCS file: patches/patch-lib_libsystem_c diff -N patches/patch-lib_libsystem_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-lib_libsystem_c 30 Jun 2010 20:51:19 -0000 @@ -0,0 +1,23 @@ +$OpenBSD$ +--- lib/libsystem.c.orig Wed Jun 30 05:59:20 2010 ++++ lib/libsystem.c Wed Jun 30 05:59:43 2010 +@@ -12,7 +12,7 @@ + + Contributed to the public domain. + =============================================================================*/ +-#define _XOPEN_SOURCE ++/*#define _XOPEN_SOURCE*/ + + #include <unistd.h> + #include <stdlib.h> +@@ -225,8 +225,8 @@ signalName(unsigned int const signalClass) { + not defined by POSIX, including: SIGPWR, SIGLOST, SIGINFO + */ + } +- } else if ((int)signalClass >= SIGRTMIN && (int)signalClass <= SIGRTMAX) +- return "SIGRTxxx"; ++ } /* else if ((int)signalClass >= SIGRTMIN && (int)signalClass <= SIGRTMAX) ++ return "SIGRTxxx"; */ + else + return "???"; + } Index: patches/patch-lib_util_Makefile =================================================================== RCS file: /cvs/ports/graphics/netpbm/patches/patch-lib_util_Makefile,v retrieving revision 1.2 diff -u -p -r1.2 patch-lib_util_Makefile --- patches/patch-lib_util_Makefile 9 May 2007 15:47:57 -0000 1.2 +++ patches/patch-lib_util_Makefile 30 Jun 2010 20:51:19 -0000 @@ -1,27 +1,24 @@ -$OpenBSD: patch-lib_util_Makefile,v 1.2 2007/05/09 15:47:57 naddy Exp $ ---- lib/util/Makefile.orig Sat Feb 1 23:30:58 2003 -+++ lib/util/Makefile Wed May 9 16:32:31 2007 -@@ -12,17 +12,21 @@ CCOPT = $(CFLAGS) $(CFLAGS_SHLIB) $(CADD) +$OpenBSD$ +--- lib/util/Makefile.orig Wed Jun 30 02:26:13 2010 ++++ lib/util/Makefile Wed Jun 30 02:27:31 2010 +@@ -12,14 +12,19 @@ INCLUDES = -I $(BUILDDIR) -I $(SRCDIR)/$(SUBDIR)/.. # nstring is required for asprintf(), etc. Also some systems don't have # snprintf(), e.g. Solaris 2.5.1. 2002.03.29. - UTILOBJECTS = shhopt.o nstring.o + UTILOBJECTS = shhopt.o nstring.o filename.o +SHUTILOBJECTS = $(patsubst %.o, %.lo, $(UTILOBJECTS)) - # We have nothing to contribute to the merge, but must supply at least one - # merge object file. - MERGE_OBJECTS = empty.o + MERGE_OBJECTS = -all: $(UTILOBJECTS) +all: $(UTILOBJECTS) $(SHUTILOBJECTS) include $(SRCDIR)/Makefile.common - $(UTILOBJECTS):%.o:%.c -- $(CC) -c $(CCOPT) -o $@ $< -+ $(CC) -c $(CFLAGS) $(CADD) -o $@ $< + $(UTILOBJECTS):%.o:%.c importinc ++ $(CC) -c $(INCLUDES) -DNDEBUG $(CFLAGS) \ ++ $(CFLAGS_PERSONAL) $(CADD) -o $@ $< + -+$(SHUTILOBJECTS):%.lo:%.c -+ $(CC) -c $(CFLAGS) $(CFLAGS_SHLIB) $(CADD) -o $@ $< ++$(SHUTILOBJECTS):%.lo:%.c importinc + $(CC) -c $(INCLUDES) -DNDEBUG $(CFLAGS) $(CFLAGS_SHLIB) \ + $(CFLAGS_PERSONAL) $(CADD) -o $@ $< - testnstring: test.c nstring.h nstring.o - $(CC) $(CFLAGS) $(CADD) -o $@ nstring.o $< Index: patches/patch-pm_config_in_h =================================================================== RCS file: /cvs/ports/graphics/netpbm/patches/patch-pm_config_in_h,v retrieving revision 1.1 diff -u -p -r1.1 patch-pm_config_in_h --- patches/patch-pm_config_in_h 11 Jun 2006 18:22:06 -0000 1.1 +++ patches/patch-pm_config_in_h 30 Jun 2010 20:51:19 -0000 @@ -1,35 +1,15 @@ -$OpenBSD: patch-pm_config_in_h,v 1.1 2006/06/11 18:22:06 naddy Exp $ ---- pm_config.in.h.orig Sat May 27 20:39:49 2006 -+++ pm_config.in.h Sat May 27 20:43:08 2006 -@@ -15,6 +15,10 @@ - - **************************************************************************/ - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif -+ - #if defined(USG) || defined(SVR4) || defined(VMS) || defined(__SVR4) - #define SYSV - #endif -@@ -24,7 +28,7 @@ - ** and if you run on an Amiga, set AMIGA. If your compiler is ANSI C, you're - ** probably better off setting SYSV - all it affects is string handling. - */ --#define BSD -+/* #define BSD */ - /* #define SYSV */ - /* #define MSDOS */ - #endif -@@ -99,9 +103,9 @@ typedef int bool; +$OpenBSD$ +--- pm_config.in.h.orig Wed Jun 30 02:05:34 2010 ++++ pm_config.in.h Wed Jun 30 02:06:24 2010 +@@ -67,9 +67,9 @@ #define RGB_DB2 "PBMplus_Dir:RGB.TXT" #define RGB_DB3 "PBMplus_Dir:RGB.TXT" #else -#define RGB_DB1 "/usr/lib/X11/rgb.txt" --#define RGB_DB2 "/usr/openwin/lib/rgb.txt" +-#define RGB_DB2 "/usr/share/X11/rgb.txt" -#define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt" -+#define RGB_DB1 "%%X11BASE%%/lib/X11/rgb.txt" -+#define RGB_DB2 "%%X11BASE%%/lib/X11/rgb.txt" ++#define RGB_DB1 "%%X11BASE%%/share/X11/rgb.txt" ++#define RGB_DB2 "%%X11BASE%%/share/X11/rgb.txt" +#define RGB_DB3 "%%PREFIX%%/share/netpbm/rgb.txt" #endif Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/netpbm/pkg/PLIST,v retrieving revision 1.8 diff -u -p -r1.8 PLIST --- pkg/PLIST 11 Oct 2009 19:36:15 -0000 1.8 +++ pkg/PLIST 30 Jun 2010 20:51:19 -0000 @@ -8,6 +8,7 @@ bin/anytopnm @bin bin/bmptopnm bin/bmptoppm @bin bin/brushtopbm +...@bin bin/cameratopam @bin bin/cmuwmtopbm @bin bin/ddbugtopbm @bin bin/escp2topbm @@ -40,11 +41,14 @@ bin/manweb @bin bin/mtvtoppm @bin bin/neotoppm @bin bin/palmtopnm +...@bin bin/pamaddnoise @bin bin/pamarith +...@bin bin/pambayer @bin bin/pamchannel @bin bin/pamcomp @bin bin/pamcut @bin bin/pamdeinterlace +...@bin bin/pamdepth @bin bin/pamdice @bin bin/pamditherbw @bin bin/pamedge @@ -54,30 +58,42 @@ bin/manweb @bin bin/pamflip @bin bin/pamfunc @bin bin/pamgauss +...@bin bin/pamgradient @bin bin/pamlookup @bin bin/pammasksharpen +...@bin bin/pammixinterlace @bin bin/pamoil @bin bin/pamperspective +...@bin bin/pampick @bin bin/pampop9 +...@bin bin/pamrgbatopng @bin bin/pamscale @bin bin/pamseq @bin bin/pamsharpmap @bin bin/pamsharpness @bin bin/pamslice +...@bin bin/pamsplit @bin bin/pamstack @bin bin/pamstereogram @bin bin/pamstretch bin/pamstretch-gen @bin bin/pamsumm @bin bin/pamsummcol +...@bin bin/pamthreshold +...@bin bin/pamtilt @bin bin/pamtodjvurle +...@bin bin/pamtofits @bin bin/pamtohdiff @bin bin/pamtohtmltbl @bin bin/pamtojpeg2k @bin bin/pamtopfm @bin bin/pamtopnm +...@bin bin/pamtosvg @bin bin/pamtotga +...@bin bin/pamtotiff @bin bin/pamtouil +...@bin bin/pamtoxvmini +...@bin bin/pamx @bin bin/pbmclean @bin bin/pbmlife @bin bin/pbmmake @@ -131,10 +147,13 @@ bin/pcdovtoppm @bin bin/pgmabel @bin bin/pgmbentley @bin bin/pgmcrater +...@bin bin/pgmdeshadow bin/pgmedge @bin bin/pgmenhance @bin bin/pgmhist @bin bin/pgmkernel +...@bin bin/pgmmake +...@bin bin/pgmmedian @bin bin/pgmminkowski @bin bin/pgmmorphconv @bin bin/pgmnoise @@ -162,14 +181,14 @@ bin/pnmarith @bin bin/pnmconvol @bin bin/pnmcrop @bin bin/pnmcut -...@bin bin/pnmdepth +bin/pnmdepth bin/pnmenlarge bin/pnmfile bin/pnmflip @bin bin/pnmgamma @bin bin/pnmhisteq @bin bin/pnmhistmap -bin/pnmindex +...@bin bin/pnmindex bin/pnminterp @bin bin/pnminvert bin/pnmmargin @@ -187,25 +206,25 @@ bin/pnmquant @bin bin/pnmscalefixed @bin bin/pnmshear @bin bin/pnmsmooth -...@bin bin/pnmsplit +bin/pnmsplit @bin bin/pnmstitch @bin bin/pnmtile @bin bin/pnmtoddif @bin bin/pnmtofiasco -...@bin bin/pnmtofits +bin/pnmtofits @bin bin/pnmtojbig @bin bin/pnmtojpeg @bin bin/pnmtopalm @bin bin/pnmtopclxl bin/pnmtoplainpnm @bin bin/pnmtopng -...@bin bin/pnmtopnm +bin/pnmtopnm @bin bin/pnmtops @bin bin/pnmtorast @bin bin/pnmtorle @bin bin/pnmtosgi @bin bin/pnmtosir -...@bin bin/pnmtotiff +bin/pnmtotiff @bin bin/pnmtotiffcmyk @bin bin/pnmtoxwd @bin bin/ppm3d @@ -214,9 +233,13 @@ bin/pnmtoplainpnm @bin bin/ppmcie @bin bin/ppmcolormask @bin bin/ppmcolors +...@bin bin/ppmdcfont +...@bin bin/ppmddumpfont @bin bin/ppmdim @bin bin/ppmdist @bin bin/ppmdither +...@bin bin/ppmdmkfont +...@bin bin/ppmdraw bin/ppmfade @bin bin/ppmflash @bin bin/ppmforge @@ -275,6 +298,7 @@ bin/ppmtouil @bin bin/rawtopgm @bin bin/rawtoppm @bin bin/rgb3toppm +...@bin bin/rlatopam @bin bin/rletopnm @bin bin/sbigtopgm @bin bin/sgitopnm @@ -283,6 +307,7 @@ bin/ppmtouil @bin bin/spctoppm @bin bin/spottopgm @bin bin/sputoppm +...@bin bin/svgtopam @bin bin/tgatoppm @bin bin/thinkjettopbm @bin bin/tifftopnm -- Christian "naddy" Weisgerber na...@mips.inka.de
