From 6945839dd6ade82cdfed95e8f54e1c22ac2dae86 Mon Sep 17 00:00:00 2001 From: mjl Date: Tue, 23 Mar 1999 21:16:06 +0000 Subject: Update webalizer to 1.22-01. --- www/webalizer/Makefile | 20 +++++---------- www/webalizer/files/md5 | 4 +-- www/webalizer/patches/patch-aa | 57 +++++++++++++++++++++++++---------------- www/webalizer/patches/patch-ab | 36 ++++++++++---------------- www/webalizer/patches/patch-ac | 58 +++++++++++++++--------------------------- www/webalizer/pkg/PLIST | 4 +-- 6 files changed, 81 insertions(+), 98 deletions(-) (limited to 'www/webalizer') diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile index c47345721bb..ce308bb271f 100644 --- a/www/webalizer/Makefile +++ b/www/webalizer/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.1.1.1 1998/11/07 13:22:53 frueauf Exp $ +# $NetBSD: Makefile,v 1.2 1999/03/23 21:16:06 mjl Exp $ # -DISTNAME= webalizer-1.20-07-src -PKGNAME= webalizer-1.20-07 +DISTNAME= webalizer-1.22-01-src +PKGNAME= webalizer-1.22-01 CATEGORIES= www -MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/ \ - ftp://samhain.unix.cslab.tuwien.ac.at/pub/webalizer/ +MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/ EXTRACT_SUFX= .tgz MAINTAINER= mjl@emsi.priv.at @@ -13,17 +12,12 @@ HOMEPAGE= http://www.mrunix.net/webalizer/ DEPENDS= gd-1.3:../../graphics/gd -NO_WRKSUBDIR= yes +WRKSRC = ${WRKDIR}/${PKGNAME} post-patch: @for f in webalizer.c webalizer.1; do \ - ${SED} 's:@@prefix@@:'${PREFIX}':g' ${WRKDIR}/$$f >${WRKDIR}/$$f.new && \ - ${MV} ${WRKDIR}/$$f.new ${WRKDIR}/$$f; \ + ${SED} 's:@@prefix@@:'${PREFIX}':g' ${WRKSRC}/$$f >${WRKSRC}/$$f.new && \ + ${MV} ${WRKSRC}/$$f.new ${WRKSRC}/$$f; \ done -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/webalizer ${PREFIX}/bin/ - ${INSTALL_MAN} ${WRKSRC}/webalizer.1 ${PREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/sample.conf ${PREFIX}/etc/webalizer.conf-sample - .include "../../mk/bsd.pkg.mk" diff --git a/www/webalizer/files/md5 b/www/webalizer/files/md5 index 7058103546a..69fc331a290 100644 --- a/www/webalizer/files/md5 +++ b/www/webalizer/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 1998/11/07 13:22:53 frueauf Exp $ +$NetBSD: md5,v 1.2 1999/03/23 21:16:06 mjl Exp $ -MD5 (webalizer-1.20-07-src.tgz) = d81f5798b2992de6cf51c6c440b67b07 +MD5 (webalizer-1.22-01-src.tgz) = 37c66cb8fa62e2c9b4217e291008555b diff --git a/www/webalizer/patches/patch-aa b/www/webalizer/patches/patch-aa index 85dab284997..c38a7b70c13 100644 --- a/www/webalizer/patches/patch-aa +++ b/www/webalizer/patches/patch-aa @@ -1,23 +1,36 @@ -$NetBSD: patch-aa,v 1.1.1.1 1998/11/07 13:22:53 frueauf Exp $ +$NetBSD: patch-aa,v 1.2 1999/03/23 21:16:06 mjl Exp $ -*** Makefile.orig Sat Nov 7 00:12:47 1998 ---- Makefile Sat Nov 7 00:20:43 1998 -*************** -*** 18,25 **** - CC=gcc - CFLAGS= -O2 -Wall -fsigned-char - -! GDLIB = /usr/local/include/gd -! LIBS= -lgd -lm - - all: webalizer - ---- 18,25 ---- - CC=gcc - CFLAGS= -O2 -Wall -fsigned-char - -! GDLIB = ${PREFIX}/include/gd -! LIBS= -L${PREFIX}/lib -lgd -lm - - all: webalizer - +--- Makefile.orig Tue Mar 2 08:37:06 1999 ++++ Makefile Tue Mar 23 21:49:01 1999 +@@ -17,14 +17,14 @@ + #LIBS = -lgd -lm + + # These for Linux (most GCC based systems) +-BINDIR = /usr/local/bin +-MANDIR = /usr/local/man/man1 ++BINDIR = ${PREFIX}/bin ++MANDIR = ${PREFIX}/man/man1 + CC = gcc +-CFLAGS = -O2 -Wall -fsigned-char +-LIBS = -lgd -lm ++CFLAGS = -O2 -Wall -fsigned-char -DPREFIX=\"${PREFIX}\" ++LIBS = -L${PREFIX}/lib -lgd -lm + + # where are the GD header files? +-GDLIB = /usr/local/include/gd ++GDLIB = ${PREFIX}/include/gd + + # Shouldn't have to touch below here! + +@@ -51,9 +51,9 @@ + install: all + cp webalizer.1 ${MANDIR}/webalizer.1 + cp webalizer ${BINDIR}/webalizer +- cp sample.conf /etc/webalizer.conf.sample ++ cp sample.conf ${PREFIX}/etc/webalizer.conf.sample + + uninstall: + rm -f ${MANDIR}/webalizer.1 + rm -f ${BINDIR}/webalizer +- rm -f /etc/webalizer.conf.sample ++ rm -f ${PREFIX}/etc/webalizer.conf.sample diff --git a/www/webalizer/patches/patch-ab b/www/webalizer/patches/patch-ab index e7c81bd99f0..9b36cb706a6 100644 --- a/www/webalizer/patches/patch-ab +++ b/www/webalizer/patches/patch-ab @@ -1,23 +1,15 @@ -$NetBSD: patch-ab,v 1.1.1.1 1998/11/07 13:22:53 frueauf Exp $ +$NetBSD: patch-ab,v 1.2 1999/03/23 21:16:06 mjl Exp $ -*** webalizer.c.orig Sat Nov 7 00:22:21 1998 ---- webalizer.c Sat Nov 7 00:27:09 1998 -*************** -*** 250,257 **** - /* check for default config file */ - if (!access("webalizer.conf",F_OK)) - get_config("webalizer.conf"); -! else if (!access("/etc/webalizer.conf",F_OK)) -! get_config("/etc/webalizer.conf"); - - /* get command line options */ - opterr = 0; /* disable parser errors */ ---- 250,257 ---- - /* 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"); - - /* get command line options */ - opterr = 0; /* disable parser errors */ +--- webalizer.c.orig Tue Mar 23 21:50:47 1999 ++++ webalizer.c Tue Mar 23 21:51:26 1999 +@@ -201,8 +201,8 @@ + /* check for default config file */ + if (!access("webalizer.conf",F_OK)) + get_config("webalizer.conf"); +- else if (!access("/etc/webalizer.conf",F_OK)) +- get_config("/etc/webalizer.conf"); ++ else if (!access(PREFIX "/etc/webalizer.conf",F_OK)) ++ get_config(PREFIX "/etc/webalizer.conf"); + + /* get command line options */ + opterr = 0; /* disable parser errors */ diff --git a/www/webalizer/patches/patch-ac b/www/webalizer/patches/patch-ac index ea3359d5f85..9946c50dd55 100644 --- a/www/webalizer/patches/patch-ac +++ b/www/webalizer/patches/patch-ac @@ -1,38 +1,22 @@ -$NetBSD: patch-ac,v 1.1.1.1 1998/11/07 13:22:53 frueauf Exp $ +$NetBSD: patch-ac,v 1.2 1999/03/23 21:16:06 mjl Exp $ -*** webalizer.1.orig Sat Nov 7 00:30:17 1998 ---- webalizer.1 Sat Nov 7 00:30:47 1998 -*************** -*** 27,33 **** - 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. - .TP 8 - .B o ---- 27,33 ---- - 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@@prefix@@/etc/webalizer.conf\fP - is searched for and, if found, is used instead. - .TP 8 - .B o -*************** -*** 373,379 **** - .TP 20 - .I webalizer.conf - Default configuration file. Is searched for in the current directory -! and if not found, in the \fI/etc/\fP directory. - .TP 20 - .I webalizer.hist - Monthly history file for previous 12 months. ---- 373,379 ---- - .TP 20 - .I webalizer.conf - Default configuration file. Is searched for in the current directory -! and if not found, in the \fI@@prefix@@/etc/\fP directory. - .TP 20 - .I webalizer.hist - Monthly history file for previous 12 months. +--- webalizer.1.orig Tue Mar 23 21:52:56 1999 ++++ webalizer.1 Tue Mar 23 21:53:35 1999 +@@ -27,7 +27,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 ++present in the current directory, the file \fI@@prefix@@/etc/webalizer.conf\fP + is searched for and, if found, is used instead. + .TP 8 + .B o +@@ -431,7 +431,7 @@ + .TP 20 + .I webalizer.conf + Default configuration file. Is searched for in the current directory +-and if not found, in the \fI/etc/\fP directory. ++and if not found, in the \fI@@prefix@@/etc/\fP directory. + .TP 20 + .I webalizer.hist + Monthly history file for previous 12 months. (can be changed) diff --git a/www/webalizer/pkg/PLIST b/www/webalizer/pkg/PLIST index 9b437bcd80d..43612603c34 100644 --- a/www/webalizer/pkg/PLIST +++ b/www/webalizer/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 1998/11/07 13:22:53 frueauf Exp $ +@comment $NetBSD: PLIST,v 1.2 1999/03/23 21:16:06 mjl Exp $ bin/webalizer man/man1/webalizer.1 -etc/webalizer.conf-sample +etc/webalizer.conf.sample -- cgit v1.2.3