Add support for FreeBSD 4.X (requested by kris). Update to 1.9.4.

Fix ordering of packing list.

9 files changed, 154 insertions, 20 deletions

diff --git a/x11-wm/pawm/Makefile b/x11-wm/pawm/Makefile
index eec99c8ec1e9..f5481a036524 100644
--- a/x11-wm/pawm/Makefile
+++ b/x11-wm/pawm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pawm
-PORTVERSION=	1.9.3
+PORTVERSION=	1.9.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.pleyades.net/pawm/files/
 
@@ -34,10 +34,10 @@ pre-install:
 	${ECHO_CMD} @dirrm share/pawm/icons >> ${PLIST}
 	${ECHO_CMD} @dirrm share/pawm >> ${PLIST}
 .if !defined(NOPORTDOCS)
-	${ECHO_CMD} @dirrm share/doc/pawm >> ${PLIST}
 .for ii in ${DOCS}
 	${ECHO_CMD} share/doc/pawm/${ii} >> ${PLIST}
 .endfor
+	${ECHO_CMD} @dirrm share/doc/pawm >> ${PLIST}
 .endif
 
 do-install:
diff --git a/x11-wm/pawm/distinfo b/x11-wm/pawm/distinfo
index fbccaa7270f9..ab7932f1f10c 100644
--- a/x11-wm/pawm/distinfo
+++ b/x11-wm/pawm/distinfo
@@ -1,2 +1 @@
-$FreeBSD$
-MD5 (pawm-1.9.3.tar.bz2) = a7d49d77451976d63a3ef1d491829968
+MD5 (pawm-1.9.4.tar.bz2) = e13fb27eac50ef95566566b77667a551
diff --git a/x11-wm/pawm/files/patch-0 b/x11-wm/pawm/files/patch-0
index 4edc3321b846..bc932d486704 100644
--- a/x11-wm/pawm/files/patch-0
+++ b/x11-wm/pawm/files/patch-0
@@ -1,8 +1,8 @@
 $FreeBSD$
 
---- 0.orig	Tue Aug 19 21:13:14 2003
-+++ 0	Fri Aug 22 04:49:07 2003
-@@ -31,8 +31,8 @@
+--- 0.orig	Thu Sep 11 13:37:45 2003
++++ 0	Sat Oct 18 14:55:36 2003
+@@ -31,8 +31,8 @@ AUTHOR="David Gómez <david@pleyades.net>
  #   LDIRS: A *space separated* list of additional library or .o search dirs.
  #   LIBES: A *space separated* list of additional library names to link,
  ########################################
@@ -10,6 +10,6 @@ $FreeBSD$
 -LDIRS="/usr/X11R6/lib /usr/lib/X11R6"
 +IDIRS="/usr/X11R6/include/"
 +LDIRS="/usr/X11R6/lib"
- LIBES="libX11 libXext libXpm libm"
+ LIBES="libX11 libXpm libXext libm"
  
  ########################################
diff --git a/x11-wm/pawm/files/patch-signals.c b/x11-wm/pawm/files/patch-signals.c
deleted file mode 100644
index 56a32d497f51..000000000000
--- a/x11-wm/pawm/files/patch-signals.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$FreeBSD$
-
---- src/signals.c.orig	Sun Jul  6 22:45:30 2003
-+++ src/signals.c	Fri Aug 22 04:54:29 2003
-@@ -22,6 +22,7 @@
- */
- 
- 
-+#include <sys/types.h>
- #include "signals.h"
- 
- /* Non-ignored signals. This array marks its end with '0',
diff --git a/x11-wm/pawm/files/patch-src_cfgpool.c b/x11-wm/pawm/files/patch-src_cfgpool.c
new file mode 100644
index 000000000000..b18c298f3264
--- /dev/null
+++ b/x11-wm/pawm/files/patch-src_cfgpool.c
@@ -0,0 +1,56 @@
+$FreeBSD$
+
+FreeBSD 4 is not C99-compliant.
+
+--- src/cfgpool.c.orig	Wed Aug  6 14:27:17 2003
++++ src/cfgpool.c	Sat Oct 18 17:18:40 2003
+@@ -309,13 +309,13 @@ legal value*. So, for proper error check
+     EINVAL: Couldn't parse a well-formed natural number.
+     ERANGE: Overflow while parsing the number.
+ */
+-uintmax_t
++u_int32_t
+ cfgpool_getnatural (CfgPool pool, const char *key, unsigned int base) {
+ 
+     char *value=NULL;
+     char *tailptr=NULL;
+     int tmperrno=errno;
+-    uintmax_t natural=0;
++    u_int32_t natural=0;
+ 
+     ASSERT(pool);
+     ASSERT(key);
+@@ -329,7 +329,7 @@ cfgpool_getnatural (CfgPool pool, const 
+ 
+     /* Well, it seems we have a value... Translate to correct type */
+     errno=0;
+-    natural=strtoumax(value, &tailptr, base);
++    natural=strtoull(value, &tailptr, base);
+     
+     if (errno) natural=0,tmperrno=ERANGE;
+     if ((!natural) && (tailptr==value)) tmperrno=EINVAL;
+@@ -359,13 +359,13 @@ legal value*. So, for proper error check
+     ERANGE: Overflow while parsing the number.
+ */
+ 
+-intmax_t
++u_int32_t
+ cfgpool_getinteger (CfgPool pool, const char *key, unsigned int base) {
+ 
+     char *value=NULL;
+     char *tailptr=NULL;
+     int tmperrno=errno;
+-    intmax_t integer=0;
++    u_int32_t integer=0;
+ 
+     ASSERT(pool);
+     ASSERT(key);
+@@ -379,7 +379,7 @@ cfgpool_getinteger (CfgPool pool, const 
+ 
+     /* Well, it seems we have a value... Translate to correct type */
+     errno=0;
+-    integer=strtoimax(value, &tailptr, base);
++    integer=strtoll(value, &tailptr, base);
+     
+     if (errno) integer=0,tmperrno=ERANGE;
+     if ((!integer) && (tailptr==value)) tmperrno=EINVAL;
diff --git a/x11-wm/pawm/files/patch-src_cfgpool.h b/x11-wm/pawm/files/patch-src_cfgpool.h
new file mode 100644
index 000000000000..e340f836d7ba
--- /dev/null
+++ b/x11-wm/pawm/files/patch-src_cfgpool.h
@@ -0,0 +1,30 @@
+$FreeBSD$
+
+FreeBSD 4 is not C99-compliant.
+
+--- src/cfgpool.h.orig	Wed Jul 10 07:33:57 2002
++++ src/cfgpool.h	Sat Oct 18 16:14:11 2003
+@@ -25,21 +25,16 @@
+ #ifndef __X_CFGPOOL_X__
+ #define __X_CFGPOOL_X__
+ 
+-#include <stdint.h>
+ #include <limits.h>
+ #include <inttypes.h>
+ 
+-#if SSIZE_MAX > SIZE_MAX
+-#error Cannot build, since SSIZE_MAX appears to be greater than SIZE_MAX!!!
+-#endif
+-
+ typedef struct CfgPool *CfgPool;
+ 
+ CfgPool cfgpool_create (const char *);
+ CfgPool cfgpool_delete (CfgPool);
+ 
+ char *    cfgpool_getstring  (CfgPool, const char *);
+-uintmax_t cfgpool_getnatural (CfgPool, const char *, unsigned int);
+-intmax_t  cfgpool_getinteger (CfgPool, const char *, unsigned int);
++u_int32_t cfgpool_getnatural (CfgPool, const char *, unsigned int);
++u_int32_t cfgpool_getinteger (CfgPool, const char *, unsigned int);
+ 
+ #endif
diff --git a/x11-wm/pawm/files/patch-src_chain.c b/x11-wm/pawm/files/patch-src_chain.c
new file mode 100644
index 000000000000..592e81a1308b
--- /dev/null
+++ b/x11-wm/pawm/files/patch-src_chain.c
@@ -0,0 +1,24 @@
+$FreeBSD$
+
+FreeBSD 4 is not C99-compliant.
+
+--- src/chain.c.orig	Wed Aug  6 14:27:17 2003
++++ src/chain.c	Sat Oct 18 16:30:50 2003
+@@ -22,7 +22,7 @@ Copyright (C) 2002,03 Raúl Núñez de Aren
+ #include <stddef.h>
+ #include <errno.h>
+ #include <limits.h>
+-#include <stdint.h>
++#include <sys/types.h>
+ #include "chain.h"
+ #include "mobs.h"
+ 
+@@ -199,7 +199,7 @@ void *chain_put (Chain chain, void *item
+     ASSERT(chain);
+     ASSERT(item);
+ 
+-    if (chain->size==SIZE_MAX) {
++    if (chain->size==UINT_MAX) {
+         errno=EFBIG;
+         return NULL;
+     }
diff --git a/x11-wm/pawm/files/patch-src_timux.c b/x11-wm/pawm/files/patch-src_timux.c
new file mode 100644
index 000000000000..170d4d61f851
--- /dev/null
+++ b/x11-wm/pawm/files/patch-src_timux.c
@@ -0,0 +1,15 @@
+$FreeBSD$
+
+FreeBSD 4 is not C99-compliant.
+
+--- src/timux.c.orig	Wed Aug  6 14:27:19 2003
++++ src/timux.c	Sat Oct 18 17:14:40 2003
+@@ -45,7 +45,7 @@ struct TiMux {
+     TiMuxEvent target;
+ };
+ 
+-static volatile uintmax_t timux_count=0;
++static volatile uint32_t timux_count=0;
+ static TiMux theTiMux=NULL;
+ 
+ static void TheHandlerTM   (int);
diff --git a/x11-wm/pawm/files/patch-src_timux.h b/x11-wm/pawm/files/patch-src_timux.h
new file mode 100644
index 000000000000..eab3422b1f75
--- /dev/null
+++ b/x11-wm/pawm/files/patch-src_timux.h
@@ -0,0 +1,22 @@
+$FreeBSD$
+
+FreeBSD 4 is not C99-compliant.
+
+--- src/timux.h.orig	Wed Apr 24 11:07:32 2002
++++ src/timux.h	Sat Oct 18 17:15:40 2003
+@@ -25,13 +25,11 @@
+ #ifndef __X_TIMUX_X__
+ #define __X_TIMUX_X__
+ 
+-#include <stdint.h>
+-
+ /* NOTE: timestamps, and so resolutions, are expressed in milliseconds */
+ 
+ typedef struct TiMux *TiMux;
+-typedef uint_fast32_t tempus;
+-typedef uint_fast64_t jobid;
++typedef uint32_t tempus;
++typedef uint64_t jobid;
+ typedef void (*duty) (void *);
+ 
+ TiMux timux_create (void);