Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 30 Mar 1999 20:40:33 +0200 (CEST)
From:      dirk.meyer@dinoex.sub.org
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/10884: port german/webalizer update
Message-ID:  <199903301840.UAA26570@net2.dinoex.sub.org>

next in thread | raw e-mail | index | archive | help

>Number:         10884
>Category:       ports
>Synopsis:       port german/webalizer update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 30 16:20:01 PST 1999
>Closed-Date:
>Last-Modified:
>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.
	Output is generated in German.

>How-To-Repeat:

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

>Fix:

	new version, new traslations
	patches/patch-webalizer_lang.german is no longer needed
	apply the patches to use the new version
	this fix superseedes ports/10743

diff de-webalizer/Makefile de-webalizer-1.22.3/Makefile
--- de-webalizer/Makefile	Sat Jan 30 11:11:13 1999
+++ de-webalizer-1.22.3/Makefile	Tue Mar 30 08:25:01 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.2 1999/01/26 02:20:57 steve Exp $
 
-DISTNAME=	webalizer-1.20-07-src
-PKGNAME=	de-webalizer-1.20
+DISTNAME=	webalizer-1.22-03-src
+PKGNAME=	de-webalizer-1.22.3
 CATEGORIES=	german www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
 		ftp://ftp.dinoex.sub.de/pub/approved/
@@ -20,12 +20,11 @@
 MAN1=		de-webalizer.1
 DOC1=		CHANGES COPYING Copyright INSTALL \
 		README country-codes.txt webalizer.LSM
-WRKSRC=		${WRKDIR}
+WRKSRC=		${WRKDIR}/webalizer-1.22-03
 
 post-configure:
-	@echo "config german"
 	@${ECHO_MSG} "===> customizing for german"
-	@cd ${WRKSRC}; ${LN} -sf webalizer_lang.german webalizer_lang.h
+	@cd ${WRKSRC}; ${LN} -sf lang/webalizer_lang.german webalizer_lang.h
 
 do-install:
 .for i in ${BIN1}
@@ -43,12 +42,12 @@
 .endfor
 .endif
 	${MKDIR} ${PREFIX}/share/examples/de-webalizer
-.for i in msfree.gif sample.conf
+.for i in msfree.gif sample.conf webalizer.gif
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/examples/de-webalizer/${i}
 .endfor
-	@if [ ! -f ${PREFIX}/etc/webalizer.conf-dist ]; then \
+	@if [ ! -f ${PREFIX}/etc/de-webalizer.conf-dist ]; then \
 		${INSTALL_DATA} ${WRKSRC}/sample.conf \
-			${PREFIX}/etc/webalizer.conf-dist ; \
+			${PREFIX}/etc/de-webalizer.conf-dist ; \
 	fi
 
 .include <bsd.port.mk>
diff de-webalizer/files/md5 de-webalizer-1.22.3/files/md5
--- de-webalizer/files/md5	Sat Jan 30 11:11:14 1999
+++ de-webalizer-1.22.3/files/md5	Tue Mar 30 08:15:18 1999
@@ -1 +1 @@
-MD5 (webalizer-1.20-07-src.tgz) = d81f5798b2992de6cf51c6c440b67b07
+MD5 (webalizer-1.22-03-src.tgz) = dd5d45a7d68b5786937766dd2876d58d
diff de-webalizer/patches/patch-Makefile de-webalizer-1.22.3/patches/patch-Makefile
--- de-webalizer/patches/patch-Makefile	Sat Jan 30 11:11:16 1999
+++ de-webalizer-1.22.3/patches/patch-Makefile	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 de-webalizer/patches/patch-prefix de-webalizer-1.22.3/patches/patch-prefix
--- de-webalizer/patches/patch-prefix	Tue Jan 26 03:21:11 1999
+++ de-webalizer-1.22.3/patches/patch-prefix	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 de-webalizer/patches/patch-webalizer_lang.german de-webalizer-1.22.3/patches/patch-webalizer_lang.german
--- de-webalizer/patches/patch-webalizer_lang.german	Tue Jan 26 03:21:11 1999
+++ de-webalizer-1.22.3/patches/patch-webalizer_lang.german	Thu Jan  1 01:00:00 1970
@@ -1,700 +0,0 @@
diff de-webalizer/pkg/PLIST de-webalizer-1.22.3/pkg/PLIST
--- de-webalizer/pkg/PLIST	Sat Jan 30 11:11:24 1999
+++ de-webalizer-1.22.3/pkg/PLIST	Sat Mar  6 08:55:29 1999
@@ -1,5 +1,5 @@
 bin/de-webalizer
-etc/webalizer.conf-dist
+etc/de-webalizer.conf-dist
 share/doc/de-webalizer/CHANGES
 share/doc/de-webalizer/COPYING
 share/doc/de-webalizer/Copyright
@@ -10,4 +10,5 @@
 @dirrm share/doc/de-webalizer
 share/examples/de-webalizer/msfree.gif
 share/examples/de-webalizer/sample.conf
+share/examples/de-webalizer/webalizer.gif
 @dirrm share/examples/de-webalizer
diff de-webalizer/scripts/pre-configure de-webalizer-1.22.3/scripts/pre-configure
--- de-webalizer/scripts/pre-configure	Thu Jan  1 01:00:00 1970
+++ de-webalizer-1.22.3/scripts/pre-configure	Thu Jul 30 15:06:44 1998
@@ -0,0 +1,10 @@
+#! /bin/sh
+
+#
+# $Id: pre-configure,v 1.1 1998/07/30 13:06:44 andreas Exp $
+#
+
+# only one central config file in $PREFIX/etc
+# -andreas
+
+perl -pi -e "s=!!PREFIX!!=$PREFIX=" ${WRKSRC}/webalizer.c

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199903301840.UAA26570>