diff -ru ijb20/Makefile ../ijb20/Makefile
--- ijb20/Makefile	Sat Oct 31 03:58:47 1998
+++ ../ijb20/Makefile	Tue Nov 13 16:09:29 2001
@@ -47,10 +47,13 @@
 #MORE_CFLAGS = -relax_pointers
 #LDFLAGS = -map junkbuster.xMAP
 
+# these settings are for darwin
+LDFLAGS = -lm
+
 CFLAGS  = $(DEFAULT_CFLAGS) $(MORE_CFLAGS)
 
 OBJS =	jcc.$(O) parsers.$(O) filters.$(O) loaders.$(O) bind.$(O) conn.$(O) \
-	encode.$(O) ssplit.$(O) socks4.$(O) acl.$(O) gnu_regex.$(O) win32.$(O)
+	encode.$(O) ssplit.$(O) socks4.$(O) acl.$(O) win32.$(O)
 
 $(PROG): $(OBJS)
 	$(CC) $(CFLAGS) -o $(PROG) $(OBJS) $(LDFLAGS)
diff -ru ijb20/junkbstr.ini ../ijb20/junkbstr.ini
--- ijb20/junkbstr.ini	Tue Nov 13 15:06:23 2001
+++ ../ijb20/junkbstr.ini	Tue Nov 13 15:06:33 2001
@@ -16,31 +16,28 @@
 # Many example lines are provided here commented out
 
 # the blockfile contains patterns to be blocked by the proxy
-blockfile		sblock.ini	# comments are OK here, too
 #
-# or can use full paths for files, like so
-#
-#blockfile		/usr/local/lib/junkbusters/blockfile
+blockfile		@PREFIX@/etc/junkbuster/sblock.ini
 
 # the cookiefile contains patterns to specify the cookie management policy
 #
-cookiefile		scookie.ini
+cookiefile		@PREFIX@/etc/junkbuster/scookie.ini
 
 # the logfile is where all logging and error messages are written
 #
-#logfile		logfile
+#logfile		@PREFIX@/var/log/junkbuster.log
 
 # the jarfile is where cookies can be stored
 #
-#jarfile		jarfile	
+#jarfile		@PREFIX@/etc/junkbuster/cookies.jar	
 
 # the forwardfile defines domain-specific routing
 #
-#forwardfile		sforward.ini
+#forwardfile		@PREFIX@/etc/junkbuster/sforward.ini
 
 # file which lists and into which trusted domains are written
 #
-#trustfile		strust.ini
+#trustfile		@PREFIX@/etc/junkbuster/strust.ini
 # files specify locations of "for information about trusted referers, see.."
 # multiple trust_info_url lines are OK
 #
@@ -51,7 +48,7 @@
 # The access control list file can be used to restrict IP addresses
 # that are permitted to use the proxy (see warnings in the FAQ).
 #
-#aclfile	saclfile.ini
+#aclfile	@PREFIX@/etc/junkbuster/saclfile.ini
 
 # add an "X-Forwarded-For:" specification to each request header
 #
@@ -89,6 +86,7 @@
 #listen-address		124.207.250.245:8080
 # to explicitly state what is now the default:
 #listen-address		localhost
+listen-address localhost:8080
 
 # user-agent specifies treatment of the "User-Agent:" (and "UA-*:") header(s)
 #user-agent		@
diff -ru ijb20/loaders.c ../ijb20/loaders.c
--- ijb20/loaders.c	Sat Oct 31 03:58:47 1998
+++ ../ijb20/loaders.c	Tue Nov 13 16:18:02 2001
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <string.h>
-#include <malloc.h>
+#include <sys/malloc.h>
 #include <errno.h>
 #include <sys/stat.h>
 #include <ctype.h>
@@ -1160,7 +1160,7 @@
 
 	extern char	*acl_rcs, *bind_rcs, *conn_rcs, *encode_rcs,
 			*jcc_rcs, *loaders_rcs, *parsers_rcs, *filters_rcs,
-			*socks4_rcs, *ssplit_rcs, *gnu_regex_rcs, *win32_rcs;
+			*socks4_rcs, *ssplit_rcs,  *win32_rcs;
 
 	b = strsav(b, "<h2>Source versions:</h2>\n");
 	b = strsav(b, "<pre>");
@@ -1174,7 +1174,6 @@
 	sprintf(buf, "%s\n", socks4_rcs    );	b = strsav(b, buf);
 	sprintf(buf, "%s\n", ssplit_rcs    );	b = strsav(b, buf);
 	sprintf(buf, "%s\n", acl_rcs       );	b = strsav(b, buf);
-	sprintf(buf, "%s\n", gnu_regex_rcs );	b = strsav(b, buf);
 	sprintf(buf, "%s\n", win32_rcs     );	b = strsav(b, buf);
 	b = strsav(b, "</pre>");
 
diff -ur ijb20.orig/jcc.h ijb20/jcc.h
--- ijb20.orig/jcc.h	1998-10-30 19:58:47.000000000 -0800
+++ ijb20/jcc.h	2005-08-03 13:09:09.000000000 -0700
@@ -37,6 +37,29 @@
 extern char *uagent;
 extern char *from;
 
+struct list {
+	char *str;
+	struct list *last;
+	struct list *next;
+};
+
+/* this allows the proxy to permit/block access to any host and/or path */
+struct url_spec {
+	char  *spec;
+	char  *domain;
+	char  *dbuf;
+	char **dvec;
+	int    dcnt;
+	int    toplevel;
+
+	char *path;
+	int   pathlen;
+	int   port;
+#ifdef REGEX
+	regex_t *preg;
+#endif
+};
+
 extern struct list       wafer_list[];
 extern struct list        xtra_list[];
 extern struct list       trust_info[];
@@ -82,12 +105,6 @@
 	int   ssl;
 };
 
-struct list {
-	char *str;
-	struct list *last;
-	struct list *next;
-};
-
 int add_to_iob();
 
 #define IOB_PEEK(CSP) ((CSP->iob->cur > CSP->iob->eod) ? (CSP->iob->eod - CSP->iob->cur) : 0)
@@ -140,23 +157,6 @@
 	char *(*interceptor)();
 };
 
-/* this allows the proxy to permit/block access to any host and/or path */
-struct url_spec {
-	char  *spec;
-	char  *domain;
-	char  *dbuf;
-	char **dvec;
-	int    dcnt;
-	int    toplevel;
-
-	char *path;
-	int   pathlen;
-	int   port;
-#ifdef REGEX
-	regex_t *preg;
-#endif
-};
-
 struct file_list {
 	void *f; /* this is a pointer to the data structures
 		  * associated with the file