13 files changed, 21 insertions, 132 deletions

diff --git a/www/junkbuster/Makefile b/www/junkbuster/Makefile
index b5e55d925074..d59b7e935169 100644
--- a/www/junkbuster/Makefile
+++ b/www/junkbuster/Makefile
@@ -28,8 +28,17 @@ ALL_TARGET=	# yes, an empty target.
 JDIR=		${PREFIX}/etc/junkbuster
 MAN1=		junkbuster.1
 
+.include <bsd.port.pre.mk>
+
+.if ( ${OSVERSION} >= 500000 )
+GNUREGEXP=	's:gnu_regex.h:gnu/regex.h:'
+.else
+GNUREGEXP=	's:gnu_regex.h:gnuregex.h:'
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e "s:`/usr/bin/printf '\r'`::" ${WRKSRC}/*
+	@${REINPLACE_CMD} -e ${GNUREGEXP} ${WRKSRC}/*.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/junkbuster ${PREFIX}/sbin/junkbuster
@@ -50,4 +59,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/junkbuster/files/patch-ab b/www/junkbuster/files/patch-ab
deleted file mode 100644
index 253d19947bf2..000000000000
--- a/www/junkbuster/files/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN /usr/ports/www/ijb/work/ijb20/acl.c ./acl.c
---- /usr/ports/www/ijb/work/ijb20/acl.c	Mon Feb 28 02:35:10 2000
-+++ ./acl.c	Mon Feb 28 02:31:06 2000
-@@ -18,7 +18,7 @@
- #endif
- 
- #ifdef REGEX
--#include "gnu_regex.h"
-+#include "gnuregex.h"
- #endif
- 
- #include "jcc.h"
diff --git a/www/junkbuster/files/patch-ac b/www/junkbuster/files/patch-ac
deleted file mode 100644
index bddb2f0cf3a8..000000000000
--- a/www/junkbuster/files/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN /usr/ports/www/ijb/work/ijb20/conn.c ./conn.c
---- /usr/ports/www/ijb/work/ijb20/conn.c	Mon Feb 28 02:35:10 2000
-+++ ./conn.c	Mon Feb 28 02:31:06 2000
-@@ -34,7 +34,7 @@
- #endif
- 
- #ifdef REGEX
--#include "gnu_regex.h"
-+#include "gnuregex.h"
- #endif
- 
- #include "jcc.h"
diff --git a/www/junkbuster/files/patch-ad b/www/junkbuster/files/patch-ad
deleted file mode 100644
index 3e0c539ca92a..000000000000
--- a/www/junkbuster/files/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN /usr/ports/www/ijb/work/ijb20/encode.c ./encode.c
---- /usr/ports/www/ijb/work/ijb20/encode.c	Mon Feb 28 02:35:10 2000
-+++ ./encode.c	Mon Feb 28 02:31:06 2000
-@@ -9,7 +9,7 @@
- #include <ctype.h>
- 
- #ifdef REGEX
--#include "gnu_regex.h"
-+#include "gnuregex.h"
- #endif
- 
- #include "jcc.h"
diff --git a/www/junkbuster/files/patch-ae b/www/junkbuster/files/patch-ae
deleted file mode 100644
index c28b0ecf893d..000000000000
--- a/www/junkbuster/files/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN /usr/ports/www/ijb/work/ijb20/filters.c ./filters.c
---- /usr/ports/www/ijb/work/ijb20/filters.c	Mon Feb 28 02:35:10 2000
-+++ ./filters.c	Mon Feb 28 02:31:06 2000
-@@ -15,7 +15,7 @@
- #endif
- 
- #ifdef REGEX
--#include <gnu_regex.h>
-+#include <gnuregex.h>
- #endif
- 
- #include "jcc.h"
diff --git a/www/junkbuster/files/patch-af b/www/junkbuster/files/patch-af
deleted file mode 100644
index b89073b2eb26..000000000000
--- a/www/junkbuster/files/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN /usr/ports/www/ijb/work/ijb20/gnu_regex.c ./gnu_regex.c
---- /usr/ports/www/ijb/work/ijb20/gnu_regex.c	Mon Feb 28 02:35:10 2000
-+++ ./gnu_regex.c	Mon Feb 28 02:31:06 2000
-@@ -131,7 +131,7 @@
- #endif /* not emacs */
- 
- /* Get the interface, including the syntax bits.  */
--#include "gnu_regex.h"
-+#include "gnuregex.h"
- 
- /* isalpha etc. are used for the character classes.  */
- #include <ctype.h>
diff --git a/www/junkbuster/files/patch-ag b/www/junkbuster/files/patch-ag
index c8e942b32401..302c3f2cb915 100644
--- a/www/junkbuster/files/patch-ag
+++ b/www/junkbuster/files/patch-ag
@@ -1,11 +1,6 @@
---- jcc.c.orig	Fri Nov  3 12:28:39 2000
-+++ jcc.c	Fri Nov  3 12:31:58 2000
-@@ -39,11 +39,12 @@
- #endif
- 
- #ifdef REGEX
--#include <gnu_regex.h>
-+#include <gnuregex.h>
+--- jcc.c.orig	Fri Aug  4 14:31:14 2000
++++ jcc.c	Thu Apr 29 15:55:30 2004
+@@ -43,7 +43,8 @@
  #endif
  
  #include "jcc.h"
diff --git a/www/junkbuster/files/patch-ah b/www/junkbuster/files/patch-ah
index 5b5d0fa34446..b8c44c2f4753 100644
--- a/www/junkbuster/files/patch-ah
+++ b/www/junkbuster/files/patch-ah
@@ -10,15 +10,6 @@ diff -ruN /usr/ports/www/ijb/work/ijb20/loaders.c ./loaders.c
  #include <errno.h>
  #include <sys/stat.h>
  #include <ctype.h>
-@@ -18,7 +18,7 @@
- #endif
- 
- #ifdef REGEX
--#include <gnu_regex.h>
-+#include <gnuregex.h>
- #endif
- 
- #include "jcc.h"
 @@ -1160,7 +1160,7 @@
  
  	extern char	*acl_rcs, *bind_rcs, *conn_rcs, *encode_rcs,
diff --git a/www/junkbuster/files/patch-aj b/www/junkbuster/files/patch-aj
deleted file mode 100644
index bfdbf829703c..000000000000
--- a/www/junkbuster/files/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN /usr/ports/www/ijb/work/ijb20/parsers.c ./parsers.c
---- /usr/ports/www/ijb/work/ijb20/parsers.c	Mon Feb 28 02:35:10 2000
-+++ ./parsers.c	Mon Feb 28 02:31:06 2000
-@@ -15,7 +15,7 @@
- #endif
- 
- #ifdef REGEX
--#include <gnu_regex.h>
-+#include <gnuregex.h>
- #endif
- 
- #include "jcc.h"
diff --git a/www/junkbuster/files/patch-ak b/www/junkbuster/files/patch-ak
index 7eadcb830d2b..4dffb57c8e7d 100644
--- a/www/junkbuster/files/patch-ak
+++ b/www/junkbuster/files/patch-ak
@@ -1,13 +1,6 @@
-diff -ruN /usr/ports/www/ijb/work/ijb20/socks4.c ./socks4.c
---- /usr/ports/www/ijb/work/ijb20/socks4.c	Mon Feb 28 02:35:10 2000
-+++ ./socks4.c	Mon Feb 28 02:31:06 2000
-@@ -19,11 +19,13 @@
- #endif
- 
- #ifdef REGEX
--#include <gnu_regex.h>
-+#include <gnuregex.h>
- #endif
+--- socks4.c.orig	Fri Aug  4 08:39:21 2000
++++ socks4.c	Thu Apr 29 15:59:20 2004
+@@ -28,6 +28,8 @@
  
  #include "jcc.h"
  
@@ -16,7 +9,7 @@ diff -ruN /usr/ports/www/ijb/work/ijb20/socks4.c ./socks4.c
  #define SOCKS_REQUEST_GRANTED		90
  #define SOCKS_REQUEST_REJECT		91
  #define SOCKS_REQUEST_IDENT_FAILED	92
-@@ -56,7 +58,7 @@
+@@ -60,7 +62,7 @@
  	unsigned char sbuf[BUFSIZ];
  	struct socks_op    *c = (struct socks_op    *)cbuf;
  	struct socks_reply *s = (struct socks_reply *)sbuf;
diff --git a/www/junkbuster/files/patch-al b/www/junkbuster/files/patch-al
index 98010e51f392..5922cba56427 100644
--- a/www/junkbuster/files/patch-al
+++ b/www/junkbuster/files/patch-al
@@ -1,14 +1,10 @@
---- ssplit.c.orig	Fri Aug  4 09:39:24 2000
-+++ ssplit.c	Fri Nov  3 12:24:59 2000
-@@ -22,9 +22,10 @@
+--- ssplit.c.orig	Fri Aug  4 08:39:24 2000
++++ ssplit.c	Thu Apr 29 15:56:41 2004
+@@ -22,6 +22,7 @@
   *      l = flag indicating whether to ignore leading field separators
   */
  
 +#include "loaders.h"
  #include <stdlib.h>	/*  For free()		*/
  #include <stdio.h>	/*  Required by jcc.h	*/
--#include "gnu_regex.h"
-+#include "gnuregex.h"
- #include "jcc.h"	/*  For zalloc()	*/
- #undef DEBUG 		/*  DEBUG macro use in this file is not	*/
- 			/*  	consistent with use in jcc.h	*/
+ #include "gnu_regex.h"
diff --git a/www/junkbuster/files/patch-am b/www/junkbuster/files/patch-am
deleted file mode 100644
index 7ff4eb1b9e6a..000000000000
--- a/www/junkbuster/files/patch-am
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN /usr/ports/www/ijb/work/ijb20/win32.c ./win32.c
---- /usr/ports/www/ijb/work/ijb20/win32.c	Mon Feb 28 02:35:10 2000
-+++ ./win32.c	Mon Feb 28 02:31:06 2000
-@@ -7,7 +7,7 @@
- 
- #include <stdio.h>
- #ifdef REGEX
--#include "gnu_regex.h"
-+#include "gnuregex.h"
- #endif
- #include "jcc.h"
- #include <windows.h>
diff --git a/www/junkbuster/files/patch-an b/www/junkbuster/files/patch-an
deleted file mode 100644
index cc89552a1df2..000000000000
--- a/www/junkbuster/files/patch-an
+++ /dev/null
@@ -1,11 +0,0 @@
---- bind.c	2000/11/03 10:27:18	1.1
-+++ bind.c	2000/11/03 10:27:22
-@@ -37,7 +37,7 @@
- #endif
- 
- #ifdef REGEX
--#include <gnu_regex.h>
-+#include <gnuregex.h>
- #endif
- 
- #include "jcc.h"	/* For atoip() */