- seperate patches for STABLE and DEVEL

svn path=/head/; revision=205744

graphics/netpbm-devel/files/Makefile.config.FreeBSD

@@ -0,0 +1,33 @@
+DEFAULT_TARGET = nomerge
+BUILD_FIASCO = Y
+LD = ${CC}
+CC_FOR_BUILD = ${CC}
+LD_FOR_BUILD = ${CC}
+SYMLINK = ${LN} -sf
+LDFLAGS = -Wl,--rpath,$(NETPBMLIB_RUNTIME_DIR)
+LDSHLIB = -shared -Wl,-soname,$(SONAME)
+CFLAGS_SHLIB = -fpic -DPIC
+TIFFLIB = ${LOCALBASE}/lib/libtiff.so
+TIFFHDR_DIR = ${LOCALBASE}/include
+JPEGLIB = ${LOCALBASE}/lib/libjpeg.so
+JPEGHDR_DIR = ${LOCALBASE}/include
+PNGLIB = ${LOCALBASE}/lib/libpng.so
+PNGHDR_DIR = ${LOCALBASE}/include
+ZLIB = /usr/lib/libz.so
+ZHDR_DIR = /usr/include
+JBIGLIB = ${LOCALBASE}/lib/libjbig.so
+JBIGHDR_DIR = ${LOCALBASE}/include
+URTLIB =  $(BUILDDIR)/urt/librle.a
+URTHDR_DIR = $(SRCDIR)/urt
+JASPERHDR_DIR = ${LOCALBASE}/include
+LINUXSVGALIB = NONE
+LINUXSVGAHDR_DIR = NONE
+NETPBMLIBTYPE = unixshared
+NETPBMLIBSUFFIX = so
+STATICLIB_TOO = y
+STATICLIBSUFFIX = a
+SHLIBPREFIXLIST = lib
+NETPBMSHLIBPREFIX = $(firstword $(SHLIBPREFIXLIST))
+NETPBMLIB_RUNTIME_DIR = ${PREFIX}/lib
+SOVER = 1
+pkgdir = ${PREFIX}

graphics/netpbm-devel/files/patch-GNUmakefile

@@ -0,0 +1,11 @@
+--- GNUmakefile.orig	Fri Jun 14 11:57:11 2002
++++ GNUmakefile	Tue Jun 18 00:00:00 2002
+@@ -236,7 +236,7 @@
+ 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
+ 
+ ifeq ($(STATICLIB_TOO),y)

graphics/netpbm-devel/files/patch-Makefile.common

@@ -0,0 +1,26 @@
+--- Makefile.common.orig	Wed Oct  9 11:17:24 2002
++++ Makefile.common	Sat Oct 12 00:00:00 2002
+@@ -231,19 +231,19 @@
+ INSTALLBIN_TARGETS = $(BINARIES:%=%_installbin) netpbm_installbin
+ .PHONY: $(INSTALLBIN_TARGETS)
+ $(INSTALLBIN_TARGETS): $(PKGDIR)/bin
+-	$(INSTALL) -c $(STRIPFLAG) -m $(INSTALL_PERM_BIN) \
++	${BSD_INSTALL_PROGRAM} \
+ 	  $(@:%_installbin=%) $<
+ 
+ $(SCRIPTS:%=%_installscript): $(PKGDIR)/bin
+-	$(INSTALL) -c -m $(INSTALL_PERM_BIN) \
++	${BSD_INSTALL_SCRIPT} \
+ 	  $(SRCDIR)/$(SUBDIR)/$(@:%_installscript=%) $<
+ 
+ .PHONY: install.data
+ install.data: $(DATAFILES:%=%_installdata) $(SUBDIRS:%=%/install.data)
+ 
+ .PHONY: $(DATAFILES:%=%_installdata) 
+-$(DATAFILES:%=%_installdata): $(PKGDIR)/misc
+-	$(INSTALL) -c -m $(INSTALL_PERM_DATA) \
++$(DATAFILES:%=%_installdata): $(PKGDIR)/share/netpbm
++	${BSD_INSTALL_DATA} \
+ 	  $(SRCDIR)/$(SUBDIR)/$(@:%_installdata=%) $<
+ 
+ 

graphics/netpbm-devel/files/patch-lib-Makefile

@@ -0,0 +1,93 @@
+--- lib/Makefile.orig	2005-12-03 17:52:33.000000000 +0100
++++ lib/Makefile	2008-01-17 11:05:04.000000000 +0100
+@@ -36,6 +36,8 @@
+ # Library objects to be linked but not built by Makefile.common:
+ LIBOBJECTS_X = util/shhopt.o util/nstring.o
+ 
++SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS))
++
+ MANUALS3 = libnetpbm
+ MANUALS5 = pbm pgm ppm pnm pam
+ 
+@@ -79,13 +81,17 @@
+ 
+ $(LIBOBJECTS): %.o: %.c $(HEADERLINKS)
+ # Note that the user may have configured -I options into CFLAGS.
++	$(CC) -c $(INCLUDES) -DNDEBUG $(CFLAGS) \
++	  $(CFLAGS_PERSONAL) $(CADD) -o $@ $<
++
++$(SHLIBOBJECTS): %.lo: %.c $(HEADERLINKS)
+ 	$(CC) -c $(INCLUDES) -DNDEBUG $(CFLAGS) $(CFLAGS_SHLIB) \
+ 	  $(CFLAGS_PERSONAL) $(CADD) -o $@ $<
+ 
+ MAJ = $(NETPBM_MAJOR_RELEASE)
+ MIN = $(NETPBM_MINOR_RELEASE)
+ 
+-SONAME = libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ)
++SONAME = libnetpbm.$(NETPBMLIBSUFFIX).$(SOVER)
+ 
+ ifeq ($(NETPBMLIBTYPE),irixshared)
+ # The libxxx.so link is needed to link the executables.
+@@ -110,11 +116,8 @@
+ # The $(SONAME) link is needed only to test the programs without
+ # installing the libraries (in that case, you also need to direct the 
+ # dynamic linker to the source directories, e.g. set LD_LIBRARY_PATH).
+-$(SONAME): libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN)
+-	rm -f $@
+-	$(SYMLINK) $< $@
+-libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X)
+-	$(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
++$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X)
++	$(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \
+           $(SHLIB_CLIB) $(LADD)
+ endif
+ 
+@@ -208,13 +211,10 @@
+ .PHONY: install.lib
+ ifeq ($(NETPBMLIBTYPE),unixshared)
+ # install a Unix-style shared library
+-install.lib: $(PKGDIR)/lib $(PKGDIR)/link
+-	cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).*
+-	$(INSTALL) -c -m $(INSTALL_PERM_LIBD) \
+-	  libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN)  $(PKGDIR)/lib/
+-	cd $(PKGDIR)/lib/ ; \
+-          rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ); \
+-          $(SYMLINK) libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(SONAME)
++install.lib: $(PKGDIR)/lib
++	cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).*
++	${BSD_INSTALL_DATA} \
++          $(SONAME) $(PKGDIR)/lib/
+ endif
+ ifeq ($(NETPBMLIBTYPE),dll)
+ #install a Windows DLL shared library
+@@ -244,23 +244,23 @@
+ # directory when you compile your programs.
+ 
+ %_installhdr: $(PKGDIR)/include
+-	$(INSTALL) -c -m $(INSTALL_PERM_HDR) \
++	${BSD_INSTALL_DATA} \
+ 	  $(SRCDIR)/lib/$(@:%_installhdr=%) $(PKGDIR)/include/;
+ 
+ .PHONY: install.staticlib
+-install.staticlib: $(PKGDIR)/link
+-	$(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
+-	  $(PKGDIR)/link
++install.staticlib: $(PKGDIR)/lib
++	${BSD_INSTALL_DATA} libnetpbm.$(STATICLIBSUFFIX) \
++	  $(PKGDIR)/lib
+ 
+ # Install a shared library stub -- the ".so" file used at link time to
+ # prepare a program for dynamically linking a library at run time 
+ .PHONY: install.sharedlibstub
+-install.sharedlibstub: $(PKGDIR)/link
++install.sharedlibstub: $(PKGDIR)/lib
+ ifeq ($(NETPBMLIBTYPE),unixshared)
+ # install the link-time (.so) links to the runtime libraries
+-	cd $(PKGDIR)/link ; \
++	cd $(PKGDIR)/lib ; \
+           rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
+-          $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
++          $(SYMLINK) $(SONAME) \
+             libnetpbm.$(NETPBMLIBSUFFIX)
+ endif
+ ifeq ($(NETPBMLIBTYPE),dll)

graphics/netpbm-devel/files/patch-lib-libpm.c

@@ -0,0 +1,20 @@
+--- lib/libpm.c~	Sun Nov 21 03:55:27 2004
++++ lib/libpm.c	Sat Mar 19 12:39:00 2005
+@@ -617,7 +617,7 @@
+ pm_openr(const char * const name) {
+     FILE* f;
+ 
+-    if (strcmp(name, "-") == 0)
++    if (name == NULL || strcmp(name, "-") == 0)
+         f = stdin;
+     else {
+ #ifndef VMS
+@@ -639,7 +639,7 @@
+ pm_openw(const char * const name) {
+     FILE* f;
+ 
+-    if (strcmp(name, "-") == 0)
++    if (name == NULL || strcmp(name, "-") == 0)
+         f = stdout;
+     else {
+ #ifndef VMS

graphics/netpbm-devel/files/patch-pm_config.in.h

@@ -0,0 +1,26 @@
+--- pm_config.in.h.orig	Sat Jul 24 04:40:06 2004
++++ pm_config.in.h	Tue Aug 17 16:53:30 2004
+@@ -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
+@@ -99,9 +103,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_DB3 "/usr/X11R6/lib/X11/rgb.txt"
++#define RGB_DB1 "%%PREFIX%%/share/netpbm/rgb.txt"
++#define RGB_DB2 "%%LOCALBASE%%/share/netpbm/rgb.txt"
++#define RGB_DB3 "%%X11BASE%%/lib/X11/rgb.txt"
+ #endif
+ 
+ /* CONFIGURE: This is the name of an environment variable that tells

graphics/netpbm/Makefile

@@ -31,6 +31,9 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		png.5:${PORTSDIR}/graphics/png \
 		jbig.1:${PORTSDIR}/graphics/jbigkit
 #		jasper.4:${PORTSDIR}/graphics/jasper
+.if defined(WITH_NETPBM_DEVEL)
+LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
+.endif
 
 USE_PERL5=	yes
 USE_GMAKE=	yes
@@ -46,6 +49,13 @@ PORTSCOUT=	limit:^10\.26\.
 MAN1=		netpbm.1
 
 DEVEL_PORTVERSION=	10.31
+.if defined(WITH_NETPBM_DEVEL)
+PATCHDIR?=	${MASTERDIR}/../netpbm-devel/files
+CFLAGS+=	-Iutil
+PLIST_SUB+=	DEVEL=""
+.else
+PLIST_SUB+=	DEVEL="@comment "
+.endif
 
 .include <bsd.port.pre.mk>
 
@@ -54,16 +64,6 @@ DEVEL_PORTVERSION=	10.31
 CFLAGS+=	-O0
 .endif
 
-.if defined(WITH_NETPBM_DEVEL)
-EXTRA_PATCHES+=	${FILESDIR}/editor-pnmquant-devel.patch
-EXTRA_PATCHES+=	${FILESDIR}/converter-other-cameratopam-identify.patch
-PLIST_SUB+=	DEVEL=""
-.else
-EXTRA_PATCHES+=	${FILESDIR}/editor-pnmquant-stable.patch
-EXTRA_PATCHES+=	${FILESDIR}/converter-other-pstopnm.patch
-PLIST_SUB+=	DEVEL="@comment "
-.endif
-
 pre-configure:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		 s|%%LOCALBASE%%|${LOCALBASE}|g ; \