Buildlink'ify, respect PKG_SYSCONFDIR, and use the general INSTALL scripts.

4 files changed, 25 insertions, 30 deletions

diff --git a/www/webalizer/patches/patch-ab b/www/webalizer/patches/patch-ab
deleted file mode 100644
index b68897b755f..00000000000
--- a/www/webalizer/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2000/10/18 16:41:26 mjl Exp $
-
---- webalizer.c.orig	Tue Oct 17 06:15:53 2000
-+++ webalizer.c	Wed Oct 18 18:12:27 2000
-@@ -267,6 +267,8 @@
-    /* check for default config file */
-    if (!access("webalizer.conf",F_OK))
-       get_config("webalizer.conf");
-+   else if (!access(PREFIX "/etc/webalizer.conf", F_OK))
-+      get_config(PREFIX "/etc/webalizer.conf");
-    else if (!access(tmp_buf,F_OK))
-       get_config(tmp_buf);
- 
diff --git a/www/webalizer/patches/patch-ac b/www/webalizer/patches/patch-ac
index a200787c31c..81a524eccd9 100644
--- a/www/webalizer/patches/patch-ac
+++ b/www/webalizer/patches/patch-ac
@@ -1,16 +1,13 @@
-$NetBSD: patch-ac,v 1.4 2000/10/18 16:41:26 mjl Exp $
+$NetBSD: patch-ac,v 1.5 2001/12/01 15:08:03 jlam Exp $
 
---- webalizer.1.orig	Wed Oct 18 18:13:37 2000
-+++ webalizer.1	Wed Oct 18 18:14:46 2000
-@@ -45,8 +45,9 @@
+--- webalizer.1.orig	Thu Sep 28 23:51:42 2000
++++ webalizer.1
+@@ -45,7 +45,7 @@
  A default configuration file is scanned for.  A file named
  \fIwebalizer.conf\fP is searched for in the current directory, and if
  found, it's configuration data is parsed.  If the file is not
 -present in the current directory,  the file \fI/etc/webalizer.conf\fP
--is searched for and, if found, is used instead.
-+present in the current directory,  the files \fI@@prefix@@/etc/webalizer.conf\fP
-+and then \fI/etc/webalizer.conf\fP
-+are searched for and, if found, are used instead.
++present in the current directory,  the file \fI@PKG_SYSCONFDIR@/webalizer.conf\fP
+ is searched for and, if found, is used instead.
  .TP 8
  .B o
- Any command line arguments given to the program are parsed.  This
diff --git a/www/webalizer/patches/patch-ad b/www/webalizer/patches/patch-ad
index ac3e6dc532a..105dd6288fc 100644
--- a/www/webalizer/patches/patch-ad
+++ b/www/webalizer/patches/patch-ad
@@ -1,14 +1,12 @@
-$NetBSD: patch-ad,v 1.6 2000/10/18 16:41:26 mjl Exp $
+$NetBSD: patch-ad,v 1.7 2001/12/01 15:08:03 jlam Exp $
 
---- Makefile.in.orig	Wed Oct 18 18:15:54 2000
-+++ Makefile.in	Wed Oct 18 18:18:05 2000
-@@ -23,8 +23,8 @@
- MANDIR = @mandir@/man1
+--- Makefile.in.orig	Tue Oct 17 00:15:53 2000
++++ Makefile.in
+@@ -24,7 +24,7 @@
  ETCDIR = @ETCDIR@
  CC     = @CC@
--CFLAGS = @CFLAGS@
+ CFLAGS = @CFLAGS@
 -LIBS   = @LIBS@
-+CFLAGS = @CFLAGS@ -DPREFIX=\"${PREFIX}\"
 +LIBS   = @LIBS@ -lpng -ljpeg -lz -lttf -lintl -lXpm -lX11
  DEFS   = -DETCDIR=\"@ETCDIR@\" @DEFS@ @OPTS@
  LDFLAGS= @LDFLAGS@
@@ -18,7 +16,7 @@ $NetBSD: patch-ad,v 1.6 2000/10/18 16:41:26 mjl Exp $
  	$(INSTALL_PROGRAM) webalizer ${BINDIR}/webalizer
  	$(INSTALL_DATA) webalizer.1 ${MANDIR}/webalizer.1
 -	$(INSTALL_DATA) sample.conf ${ETCDIR}/webalizer.conf.sample
-+	$(INSTALL_DATA) sample.conf ${PREFIX}/etc/webalizer.conf.sample
++	$(INSTALL_DATA) sample.conf ${PREFIX}/share/examples/webalizer.conf.sample
  	rm -f ${BINDIR}/webazolver
  	@LN_S@ ${BINDIR}/webalizer ${BINDIR}/webazolver
  
diff --git a/www/webalizer/patches/patch-ae b/www/webalizer/patches/patch-ae
new file mode 100644
index 00000000000..f3153c73e99
--- /dev/null
+++ b/www/webalizer/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.3 2001/12/01 15:08:03 jlam Exp $
+
+--- sample.conf.orig	Thu Sep 28 23:51:42 2000
++++ sample.conf
+@@ -17,7 +17,7 @@
+ #
+ # As of version 0.98, The Webalizer will look for a 'default' configuration
+ # file named "webalizer.conf" in the current directory, and if not found
+-# there, will look for "/etc/webalizer.conf".
++# there, will look for "@PKG_SYSCONFDIR@/webalizer.conf".
+ 
+ 
+ # LogFile defines the web server log file to use.  If not specified