From bba9f89e9ecbe499db1ba2a7a77651f3b9796c5d Mon Sep 17 00:00:00 2001
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Wed, 18 Aug 2004 06:37:40 +0000
Subject: [PATCH] - update to 10.24

---
 graphics/netpbm/Makefile                      |  6 +++---
 graphics/netpbm/distinfo                      |  4 ++--
 .../netpbm/files/patch-lib-util-wordaccess.h  | 11 ----------
 ...patch-pm_config.h => patch-pm_config.in.h} | 21 ++++++-------------
 4 files changed, 11 insertions(+), 31 deletions(-)
 delete mode 100644 graphics/netpbm/files/patch-lib-util-wordaccess.h
 rename graphics/netpbm/files/{patch-pm_config.h => patch-pm_config.in.h} (58%)

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 83ccf7ca8fca..e5d9812822a2 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	netpbm
-PORTVERSION=	10.23
+PORTVERSION=	10.24
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -43,10 +43,10 @@ CFLAGS+=	-O0
 .endif
 .endif
 
-post-patch:
+pre-configure:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		 s|%%LOCALBASE%%|${LOCALBASE}|g ; \
-		 s|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/pm_config.h
+		 s|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/pm_config.in.h
 	@${REINPLACE_CMD} -e 's|<shhopt.h>|<pm_shhopt.h>|g' ${WRKSRC}/lib/pm.h
 	@${CP} ${FILESDIR}/Makefile.config.FreeBSD ${WRKSRC}/Makefile.config
 	@${LN} -sf ${WRKSRC}/lib/util/shhopt.h ${WRKSRC}/lib/util/pm_shhopt.h
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 4b64c4ae8cc5..b03c7b1900c7 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,2 +1,2 @@
-MD5 (netpbm-10.23.tgz) = 9c2dbf5eee38e2fb15e7ea1bd9fda7f4
-SIZE (netpbm-10.23.tgz) = 2544076
+MD5 (netpbm-10.24.tgz) = 06580a8cadb6908f95733dcbd3f4e3d8
+SIZE (netpbm-10.24.tgz) = 2500156
diff --git a/graphics/netpbm/files/patch-lib-util-wordaccess.h b/graphics/netpbm/files/patch-lib-util-wordaccess.h
deleted file mode 100644
index 9d89d045e11e..000000000000
--- a/graphics/netpbm/files/patch-lib-util-wordaccess.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/util/wordaccess.h.orig	Tue Jun 29 23:20:25 2004
-+++ lib/util/wordaccess.h	Mon Jul 26 23:08:10 2004
-@@ -65,7 +65,7 @@
-    exact same format as wordintBytes.  It's a simple matter of casting
-    to fool the compiler.  
- */
--static __inline__ wordn
-+static __inline__ wordint
- bytesToWordint(wordintBytes bytes) {
-     return *((wordint *)bytes);
- }
diff --git a/graphics/netpbm/files/patch-pm_config.h b/graphics/netpbm/files/patch-pm_config.in.h
similarity index 58%
rename from graphics/netpbm/files/patch-pm_config.h
rename to graphics/netpbm/files/patch-pm_config.in.h
index 3070acf3116e..673f882f5496 100644
--- a/graphics/netpbm/files/patch-pm_config.h
+++ b/graphics/netpbm/files/patch-pm_config.in.h
@@ -1,8 +1,8 @@
---- pm_config.h.orig	Sat Aug 10 01:19:45 2002
-+++ pm_config.h	Sat Oct  5 00:00:00 2002
-@@ -35,6 +35,10 @@
- typedef unsigned int uint32n;
- typedef signed int int32n;
+--- 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>
@@ -11,16 +11,7 @@
  #if defined(USG) || defined(SVR4) || defined(VMS) || defined(__SVR4)
  #define SYSV
  #endif
-@@ -44,7 +48,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 */
- /* #define AMIGA */
-@@ -118,9 +122,9 @@
+@@ -99,9 +103,9 @@
  #define RGB_DB2 "PBMplus_Dir:RGB.TXT"
  #define RGB_DB3 "PBMplus_Dir:RGB.TXT"
  #else