From dinoex@net2.dinoex.sub.org Mon Mar 22 23:18:47 1999
Return-Path: <dinoex@net2.dinoex.sub.org>
Received: from mail.dinoex.sub.org (unknown [195.243.29.14])
	by hub.freebsd.org (Postfix) with ESMTP id AE73514C27
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 22 Mar 1999 23:18:43 -0800 (PST)
	(envelope-from dinoex@net2.dinoex.sub.org)
Received: (from uucp@localhost)
	by mail.dinoex.sub.org (8.9.1/8.9.1) with UUCP id IAA24063
	for FreeBSD-gnats-submit@freebsd.org; Tue, 23 Mar 1999 08:18:24 +0100 (CET)
Received: (from dinoex@localhost)
	by net2.dinoex.sub.org (8.9.1/8.9.1) id HAA25552;
	Tue, 23 Mar 1999 07:58:38 +0100 (CET)
Message-Id: <199903230658.HAA25552@net2.dinoex.sub.org>
Date: Tue, 23 Mar 1999 07:58:38 +0100 (CET)
From: dirk.meyer@dinoex.sub.org
Sender: dinoex@net2.dinoex.sub.org
Reply-To: dirk.meyer@dinoex.sub.org
To: FreeBSD-gnats-submit@freebsd.org
Subject: port www/webalizer update
X-Send-Pr-Version: 3.2

>Number:         10742
>Category:       ports
>Synopsis:       port www/webalizer update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dinoex
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 22 23:20:01 PST 1999
>Closed-Date:    Wed Mar 31 07:10:31 PST 1999
>Last-Modified:  Sun Nov 24 01:25:13 PST 2002
>Originator:     Dirk Meyer
>Release:        FreeBSD 2.2.7-19981027-SNAP i386
>Organization:
privat
>Environment:

	gd-lib, apache

>Description:

	generates statistics in HTML output,
	for Apache web server.

>How-To-Repeat:

	old Release is out of date
	old distfile no longer on server

>Fix:

	new version
	more languages are supported
	apply the patches to use the new version

diff webalizer/Makefile webalizer-1.22.1/Makefile
--- webalizer/Makefile	Sat Jan 30 11:12:10 1999
+++ webalizer-1.22.1/Makefile	Tue Mar 23 07:47:31 1999
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	webalizer
-# Version required:	1.20
+# Version required:	1.22
 # Date created:		02.Jun 1998
 # Whom:			dirk.meyer@dinoex.sub.org
 #
-# $Id: Makefile,v 1.5 1999/01/26 02:18:07 steve Exp $
+# $Id: Makefile,v 1.4 1998/08/17 00:34:42 steve Exp $
 
-DISTNAME=	webalizer-1.20-07-src
-PKGNAME=	webalizer-1.20
+DISTNAME=	webalizer-1.22-01-src
+PKGNAME=	webalizer-1.22.1
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
 		ftp://ftp.dinoex.sub.de/pub/approved/
@@ -20,12 +20,15 @@
 MAN1=		webalizer.1
 DOC1=		CHANGES COPYING Copyright INSTALL \
 		README country-codes.txt webalizer.LSM
-SUPP_LANG=	english german french spanish dutch italian polish
-WRKSRC=		${WRKDIR}
+SUPP_LANG=	english german french spanish dutch italian polish \
+		catalan czech portuguese_brazil russian slovak swedish \
+		portugues
+WRKSRC=		${WRKDIR}/webalizer-1.22-01
 
 .if defined(BATCH)
 WEBALIZER_LANG=english
 .endif
+WEBALIZER_LANG=english
 
 pre-fetch:
 .if !defined(WEBALIZER_LANG)
@@ -39,8 +42,8 @@
 .for i in ${SUPP_LANG}
 .if defined(WEBALIZER_LANG) && ${WEBALIZER_LANG} == ${i}
 		@${ECHO_MSG} "===> customizing for ${i}"
-		${LN} -sf ${WRKSRC}/webalizer_lang.${i} \
-			  ${WRKSRC}/webalizer_lang.h
+		@cd ${WRKSRC}; \
+		${LN} -sf lang/webalizer_lang.${i} webalizer_lang.h
 .endif
 .endfor
 
@@ -60,7 +63,7 @@
 .endfor
 .endif
 	${MKDIR} ${PREFIX}/share/examples/webalizer
-.for i in msfree.gif sample.conf
+.for i in msfree.gif sample.conf webalizer.gif
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/examples/webalizer/${i}
 .endfor
 	@if [ ! -f ${PREFIX}/etc/webalizer.conf-dist ]; then \
diff webalizer/files/md5 webalizer-1.22.1/files/md5
--- webalizer/files/md5	Mon Aug 17 02:34:45 1998
+++ webalizer-1.22.1/files/md5	Tue Mar 23 07:28:09 1999
@@ -1 +1 @@
-MD5 (webalizer-1.20-07-src.tgz) = d81f5798b2992de6cf51c6c440b67b07
+MD5 (webalizer-1.22-01-src.tgz) = 37c66cb8fa62e2c9b4217e291008555b
diff webalizer/patches/patch-aa webalizer-1.22.1/patches/patch-aa
--- webalizer/patches/patch-aa	Sun Jun 28 14:42:08 1998
+++ webalizer-1.22.1/patches/patch-aa	Thu Mar  4 18:53:07 1999
@@ -1,18 +1,19 @@
---- Makefile.orig	Thu Jun  4 06:04:11 1998
-+++ Makefile	Sun Jun 28 14:36:10 1998
-@@ -15,11 +15,11 @@
- #CFLAGS= -b elf
- 
- # These for GNU gcc
--CC=gcc
--CFLAGS= -O2 -Wall -fsigned-char
-+CC?=cc
-+CFLAGS+=-fsigned-char
+--- Makefile.orig	Tue Mar  2 08:37:06 1999
++++ Makefile	Thu Mar  4 18:52:57 1999
+@@ -19,12 +19,12 @@
+ # These for Linux (most GCC based systems)
+ BINDIR = /usr/local/bin
+ MANDIR = /usr/local/man/man1
+-CC     = gcc
+-CFLAGS = -O2 -Wall -fsigned-char
+-LIBS   = -lgd -lm
++CC?=gcc
++CFLAGS+=-O2 -Wall -fsigned-char
++LIBS= -L$(PREFIX)/lib -lgd -lm
  
--GDLIB = /usr/local/include/gd
--LIBS= -lgd -lm
+ # where are the GD header files?
+-GDLIB  = /usr/local/include/gd
 +GDLIB = $(PREFIX)/include/gd
-+LIBS= -L$(PREFIX)/lib -lgd -lm
  
- all: webalizer
+ # Shouldn't have to touch below here!
  
diff webalizer/patches/patch-ab webalizer-1.22.1/patches/patch-ab
--- webalizer/patches/patch-ab	Thu Jul 30 15:06:44 1998
+++ webalizer-1.22.1/patches/patch-ab	Thu Mar  4 20:33:06 1999
@@ -1,14 +1,12 @@
---- webalizer.c.orig	Thu Jul 30 14:53:08 1998
-+++ webalizer.c	Thu Jul 30 14:54:57 1998
-@@ -240,10 +240,8 @@
-    add_nlist("index.",&index_alias);
- 
+--- webalizer.c.orig	Wed Mar  3 10:39:17 1999
++++ webalizer.c	Thu Mar  4 20:33:00 1999
+@@ -192,8 +192,8 @@
     /* check for default config file */
--   if (!access("webalizer.conf",F_OK))
--      get_config("webalizer.conf");
+    if (!access("webalizer.conf",F_OK))
+       get_config("webalizer.conf");
 -   else if (!access("/etc/webalizer.conf",F_OK))
 -      get_config("/etc/webalizer.conf");
-+   if (!access("!!PREFIX!!/etc/webalizer.conf",F_OK))
++   else if (!access("!!PREFIX!!/etc/webalizer.conf",F_OK))
 +      get_config("!!PREFIX!!/etc/webalizer.conf");
  
     /* get command line options */
diff webalizer/pkg/PLIST webalizer-1.22.1/pkg/PLIST
--- webalizer/pkg/PLIST	Sat Jan 30 11:12:12 1999
+++ webalizer-1.22.1/pkg/PLIST	Thu Mar  4 18:58:50 1999
@@ -10,4 +10,5 @@
 @dirrm share/doc/webalizer
 share/examples/webalizer/msfree.gif
 share/examples/webalizer/sample.conf
+share/examples/webalizer/webalizer.gif
 @dirrm share/examples/webalizer

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: steve 
State-Changed-When: Wed Mar 31 07:10:31 PST 1999 
State-Changed-Why:  
Superceded by ports/10875. 
>Unformatted:
