--- a/ChangeLog	Tue Sep 18 09:57:20 2007 +0000
+++ b/ChangeLog	Tue Sep 18 10:01:41 2007 +0000
@@ -1,3 +1,8 @@
+2007-09-18  Mark Wright <[email protected]>
+
+	* SFEnetpbm.spec: Add netpbm. to svn_url.  Comment netpbm-02-stdlib.diff.
+	* patches/netpbm-03-no-XDefs.diff: remove #include <X11/XDefs.h>
+	
 2007-09-18  Halton Huo <[email protected]>
 
 	* SFEasciidoc.spec: Bump to 8.2.3

--- a/SFEnetpbm.spec	Tue Sep 18 09:57:20 2007 +0000
+++ b/SFEnetpbm.spec	Tue Sep 18 10:01:41 2007 +0000
@@ -4,14 +4,15 @@
 # includes module(s): SFEnetpbm
 #
 %include Solaris.inc
-%define svn_url https://svn.sourceforge.net/svnroot/netpbm/advanced
+%define svn_url https://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced
 
 Name:                    SFEnetpbm
 Summary:                 netpbm - network portable bitmap tools
 Version:                 10.35
 Patch1:			 netpbm-01-strings.diff
 Patch2:			 netpbm-Makefile.conf
-Patch3:			 netpbm-02-stdlib.diff
+# Patch3:			 netpbm-02-stdlib.diff
+Patch4:			 netpbm-03-no-XDefs.diff
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
@@ -35,7 +36,8 @@
 [ ! -d netpbm ] && bunzip2 -c ../../SOURCES/netpbm-%version.tar.bz2 | tar fxp -
 cd netpbm
 %patch1 -p1
-%patch3 -p1
+# %patch3 -p1
+%patch4 -p1
 cat Makefile.config.in %{PATCH2} > Makefile.config
 touch Makefile.depend
 
@@ -87,6 +89,10 @@
 %{_includedir}/*
 
 %changelog
+* Tue Sep 18 2007 - [email protected]
+- Add netpbm. to svn_url
+- Comment netpbm-02-stdlib.diff, as stdlib.h now included in generator/ppmrough.c
+- Add patch4 netpbm-03-no-XDefs.diff
 * Sat Apr 21 2007 - [email protected]
 - Disabled parallel make. Can be a problem on a multicpu system
 * Wed Feb 28 2007 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/netpbm-03-no-XDefs.diff	Tue Sep 18 10:01:41 2007 +0000
@@ -0,0 +1,10 @@
+--- netpbm-orig/other/pamx/window.c	2007-09-18 09:10:57.000000000 +0000
++++ netpbm/other/pamx/window.c	2007-09-18 09:23:18.643006932 +0000
+@@ -13,7 +13,6 @@
+ #include <sys/types.h>
+ #include <X11/cursorfont.h>
+ #include <X11/Xatom.h>
+-#include <X11/Xdefs.h>  /* Needed by Xutil.h */
+ #include <X11/X.h>      /* Needed by Xutil.h */
+ #include <X11/Xlib.h>   /* Needed by Xutil.h */
+ #include <X11/Xutil.h>