include bugfix patch from FreeBSD port and merge out subst into it, too

netpbm/netpbm.patch

@@ -0,0 +1,43 @@
+Index: converter/other/jpeg2000/jpeg2ktopam.c
+--- 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
+@@ -9,7 +9,6 @@
+ *****************************************************************************/
+ 
+ #define _BSD_SOURCE 1      /* Make sure strdup() is in string.h */
+-#define _XOPEN_SOURCE 500  /* Make sure strdup() is in string.h */
+ #include <string.h>
+ 
+ #include "pam.h"
+Index: converter/other/jpeg2000/pamtojpeg2k.c
+--- converter/other/jpeg2000/pamtojpeg2k.c.orig	2005-02-21 04:56:41 +0100
++++ converter/other/jpeg2000/pamtojpeg2k.c	2005-04-05 20:22:37 +0200
+@@ -9,7 +9,6 @@
+ *****************************************************************************/
+ 
+ #define _BSD_SOURCE 1    /* Make sure strdup() is in string.h */
+-#define _XOPEN_SOURCE 500  /* Make sure strdup() is in string.h */
+ #include <string.h>
+ 
+ #include "pam.h"
+Index: lib/libpm.c
+--- lib/libpm.c.orig	2004-11-20 17:55:27 +0100
++++ lib/libpm.c	2005-04-05 20:22:46 +0200
+@@ -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

netpbm/netpbm.spec

@@ -37,6 +37,7 @@ Release:      20050405
 
 #   list of sources
 Source0:      http://osdn.dl.sourceforge.net/sourceforge/netpbm/netpbm-%{version}.tgz
+Patch0:       netpbm.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -63,10 +64,7 @@ AutoReqProv:  no
 
 %prep
     %setup -q
-    %{l_shtool} subst \
-        -e 's;#define _XOPEN_SOURCE;#define _PATCHED_XOPEN_SOURCE;' \
-        converter/other/jpeg2000/jpeg2ktopam.c \
-        converter/other/jpeg2000/pamtojpeg2k.c
+    %patch -p0
 
 %build
     ( cat Makefile.config.in