From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jan 16 14:00:07 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C6A516A420 for ; Wed, 16 Jan 2008 14:00:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id EA14F13C4F0 for ; Wed, 16 Jan 2008 14:00:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m0GE061q053000 for ; Wed, 16 Jan 2008 14:00:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m0GE06jq052998; Wed, 16 Jan 2008 14:00:06 GMT (envelope-from gnats) Resent-Date: Wed, 16 Jan 2008 14:00:06 GMT Resent-Message-Id: <200801161400.m0GE06jq052998@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, TAKATSU Tomonari Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7649816A419 for ; Wed, 16 Jan 2008 13:58:47 +0000 (UTC) (envelope-from tts7500@www2.inetd.co.jp) Received: from www2.inetd.co.jp (www2.inetd.co.jp [211.13.206.150]) by mx1.freebsd.org (Postfix) with ESMTP id ECF9313C465 for ; Wed, 16 Jan 2008 13:58:46 +0000 (UTC) (envelope-from tts7500@www2.inetd.co.jp) Received: from www2.inetd.co.jp (www2.inetd.co.jp [211.13.206.150]) by www2.inetd.co.jp (8.13.8/3.7W08010815) with ESMTP id m0GDwbRW067749; Wed, 16 Jan 2008 22:58:37 +0900 (JST) Received: (from tts7500@localhost) by www2.inetd.co.jp (8.13.8/8.12.8/Submit) id m0GDwaRB067744; Wed, 16 Jan 2008 22:58:36 +0900 (JST) (envelope-from tts7500) Message-Id: <200801161358.m0GDwaRB067744@www2.inetd.co.jp> Date: Wed, 16 Jan 2008 22:58:36 +0900 (JST) From: TAKATSU Tomonari To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: dinoex@FreeBSD.org Subject: ports/119715: [PATCH] www/webalizer: fix japanese/webalizer build error X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2008 14:00:07 -0000 >Number: 119715 >Category: ports >Synopsis: [PATCH] www/webalizer: fix japanese/webalizer build error >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jan 16 14:00:06 UTC 2008 >Closed-Date: >Last-Modified: >Originator: TAKATSU Tomonari >Release: FreeBSD 7.0-RC1 i386 >Organization: none(personal) >Environment: System: FreeBSD photon.rtfm.jp 7.0-RC1 FreeBSD 7.0-RC1 #0: Wed Jan 16 19:12:16 JST 2008 >Description: - fix confliction between patch-sample.conf and ja-webalizer.conf-dist.patch * rename patch-sample.conf to sample.conf.patch * merge the content of sample.conf.patch to ja-webalizer.conf-dist.patch - make portlint happy Port maintainer (dinoex@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: diff -urN webalizer.orig/Makefile webalizer/Makefile --- webalizer.orig/Makefile 2008-01-14 18:24:05.000000000 +0900 +++ webalizer/Makefile 2008-01-16 22:40:48.000000000 +0900 @@ -25,7 +25,7 @@ COMMENT= A web server log file analysis program .if !defined(LIB_DEPENDS) -LIB_DEPENDS= gd.4:${PORTSDIR}/${GD_PORT} +LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd .endif .if defined(WITH_GEOIP) LIB_DEPENDS+= GeoIP.5:${PORTSDIR}/net/GeoIP @@ -36,11 +36,9 @@ GNU_CONFIGURE= yes DOCSDIR?= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} EXAMPLESDIR?= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} -GD_PORT?= graphics/gd CONFLICTS= geolizer-2* - .if defined(WITH_GEOIP) WEBALIZER_SUFFIX= -geoip CONFLICTS+= ${PKGNAMEPREFIX}webalizer-2* @@ -59,10 +57,8 @@ PLIST_SUB+= WITH_GEOIP="@comment " .endif -.if defined(BATCH) # no cosmetique spaces allowed WEBALIZER_LANG?=english -.endif .include @@ -87,13 +83,13 @@ simplified_chinese slovak slovene spanish swedish \ turkish ukrainian -.if defined(WEBALIZER_LANG) CONFIGURE_ARGS+= --with-language=${WEBALIZER_LANG} # The patch file is written by URASHIMA Akira # see http://tyche.pu-toyama.ac.jp/~a-urasim/webalizer/ .if ${WEBALIZER_LANG} == japanese EXTRA_PATCHES+= ${FILESDIR}/ja-webalizer.conf-dist.patch -.endif +.else +EXTRA_PATCHES+= ${FILESDIR}/sample.conf.patch .endif .if defined(WITH_WEBALIZER_CONV) @@ -117,25 +113,25 @@ do-extract: @${RM} -rf ${WRKDIR} @${MKDIR} ${WRKDIR} - @for file in ${EXTRACT_ONLY}; do \ - case $$file in \ + @for f in ${EXTRACT_ONLY}; do \ + case $$f in \ *.Z|*.gz) \ if ! (cd ${WRKDIR} && \ - ${GZCAT} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\ + ${GZCAT} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$f ${EXTRACT_AFTER_ARGS});\ then \ exit 1; \ fi \ ;; \ *.bz2) \ if ! (cd ${WRKDIR} && \ - ${BZCAT} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\ + ${BZCAT} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$f ${EXTRACT_AFTER_ARGS});\ then \ exit 1; \ fi \ ;; \ *.zip) \ if ! (cd ${WRKDIR} && \ - ${UNZIP_CMD} -qo ${_DISTDIR}/$$file -d ${WRKDIR});\ + ${UNZIP_CMD} -qo ${_DISTDIR}/$$f -d ${WRKDIR});\ then \ exit 1; \ fi \ @@ -143,7 +139,7 @@ *) \ exit 1; \ ;; \ - esac; \ + esac; \ done .if !defined(EXTRACT_PRESERVE_OWNERSHIP) @if [ `${ID} -u` = 0 ]; then \ @@ -163,12 +159,10 @@ -e 's|USE_GEOIP=""|USE_GEOIP="yes"|' \ ${WRKSRC}/configure .endif -.if !defined(WEBALIZER_LANG) @${ECHO_MSG} "You can customize the language by typing" @${ECHO_MSG} " make WEBALIZER_LANG=" @${ECHO_MSG} "where is one of:" @${ECHO_MSG} ${SUPP_LANG} -.endif do-install: ${INSTALL_PROGRAM} ${WRKSRC}/webalizer \ diff -urN webalizer.orig/files/ja-webalizer.conf-dist.patch webalizer/files/ja-webalizer.conf-dist.patch --- webalizer.orig/files/ja-webalizer.conf-dist.patch 2004-10-17 15:10:27.000000000 +0900 +++ webalizer/files/ja-webalizer.conf-dist.patch 2008-01-16 22:01:24.000000000 +0900 @@ -1,5 +1,5 @@ ---- sample.conf.orig Fri Sep 29 12:51:42 2000 -+++ sample.conf Thu Oct 14 11:48:21 2004 +--- sample.conf.orig 2000-09-29 12:51:42.000000000 +0900 ++++ sample.conf 2008-01-16 21:58:12.000000000 +0900 @@ -107,9 +107,12 @@ PageType htm* @@ -13,15 +13,16 @@ # UseHTTPS should be used if the analysis is being run on a # secure server, and links to urls should use 'https://' instead -@@ -153,6 +156,7 @@ +@@ -153,6 +156,8 @@ # is 80 characters, so use multiple lines if needed. #HTMLHead +HTMLHead ++HTMLHead # HTMLBody defined the HTML code to be inserted, starting with the # tag. If not specified, the default is shown below. If -@@ -393,6 +397,9 @@ +@@ -393,6 +398,9 @@ HideURL *.png HideURL *.PNG HideURL *.ra @@ -31,7 +32,7 @@ # Hiding agents is kind of futile #HideAgent RealPlayer -@@ -412,6 +419,11 @@ +@@ -412,6 +420,11 @@ #GroupReferrer excite.com/ Excite #GroupReferrer infoseek.com/ InfoSeek #GroupReferrer webcrawler.com/ WebCrawler @@ -43,11 +44,10 @@ #GroupUser root Admin users #GroupUser admin Admin users -@@ -530,6 +542,21 @@ - SearchEngine mamma.com query= +@@ -531,6 +544,21 @@ SearchEngine alltheweb.com query= SearchEngine northernlight.com qr= -+ + +SearchEngine yahoo.co.jp p= +SearchEngine google.co.jp q= +SearchEngine infoseek.co.jp qt= @@ -62,6 +62,7 @@ +SearchEngine jp.aol.com query= +#SearchEngine .google. q= +#SearchEngine bulkfeeds.net q= - ++ # The Dump* keywords allow the dumping of Sites, URL's, Referrers # User Agents, Usernames and Search strings to seperate tab delimited + # text files, suitable for import into most database or spreadsheet diff -urN webalizer.orig/files/patch-sample.conf webalizer/files/patch-sample.conf --- webalizer.orig/files/patch-sample.conf 2008-01-14 18:24:06.000000000 +0900 +++ webalizer/files/patch-sample.conf 1970-01-01 09:00:00.000000000 +0900 @@ -1,10 +0,0 @@ ---- sample.conf.orig 2000-09-29 05:51:42.000000000 +0200 -+++ sample.conf 2007-11-10 15:34:15.000000000 +0100 -@@ -153,6 +153,7 @@ - # is 80 characters, so use multiple lines if needed. - - #HTMLHead -+HTMLHead - - # HTMLBody defined the HTML code to be inserted, starting with the - # tag. If not specified, the default is shown below. If diff -urN webalizer.orig/files/sample.conf.patch webalizer/files/sample.conf.patch --- webalizer.orig/files/sample.conf.patch 1970-01-01 09:00:00.000000000 +0900 +++ webalizer/files/sample.conf.patch 2008-01-14 18:24:06.000000000 +0900 @@ -0,0 +1,10 @@ +--- sample.conf.orig 2000-09-29 05:51:42.000000000 +0200 ++++ sample.conf 2007-11-10 15:34:15.000000000 +0100 +@@ -153,6 +153,7 @@ + # is 80 characters, so use multiple lines if needed. + + #HTMLHead ++HTMLHead + + # HTMLBody defined the HTML code to be inserted, starting with the + # tag. If not specified, the default is shown below. If >Release-Note: >Audit-Trail: >Unformatted: