From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jan 3 21:40:02 2009 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 99BD9106566C for ; Sat, 3 Jan 2009 21:40:02 +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 6F7278FC16 for ; Sat, 3 Jan 2009 21:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n03Le10k035551 for ; Sat, 3 Jan 2009 21:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n03Le1JJ035550; Sat, 3 Jan 2009 21:40:01 GMT (envelope-from gnats) Resent-Date: Sat, 3 Jan 2009 21:40:01 GMT Resent-Message-Id: <200901032140.n03Le1JJ035550@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, Naram Qashat Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B0221065670 for ; Sat, 3 Jan 2009 21:36:55 +0000 (UTC) (envelope-from cyberbotx@kirby.cyberbotx.com) Received: from QMTA08.westchester.pa.mail.comcast.net (qmta08.westchester.pa.mail.comcast.net [76.96.62.80]) by mx1.freebsd.org (Postfix) with ESMTP id 2674E8FC1B for ; Sat, 3 Jan 2009 21:36:54 +0000 (UTC) (envelope-from cyberbotx@kirby.cyberbotx.com) Received: from OMTA02.westchester.pa.mail.comcast.net ([76.96.62.19]) by QMTA08.westchester.pa.mail.comcast.net with comcast id z91N1a0080QuhwU589cvwj; Sat, 03 Jan 2009 21:36:55 +0000 Received: from kirby.cyberbotx.com ([68.43.195.82]) by OMTA02.westchester.pa.mail.comcast.net with comcast id z9cs1a00B1n8LeU3N9cs5d; Sat, 03 Jan 2009 21:36:54 +0000 Received: from kirby.cyberbotx.com (localhost [127.0.0.1]) by kirby.cyberbotx.com (Postfix) with ESMTP id 9682D1149B; Sat, 3 Jan 2009 16:36:46 -0500 (EST) Received: (from root@localhost) by kirby.cyberbotx.com (8.14.2/8.14.2/Submit) id n03Laj06009677; Sat, 3 Jan 2009 16:36:45 -0500 (EST) (envelope-from cyberbotx) Message-Id: <200901032136.n03Laj06009677@kirby.cyberbotx.com> Date: Sat, 3 Jan 2009 16:36:45 -0500 (EST) From: Naram Qashat To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: samm@os2.kiev.ua Subject: ports/130143: [PATCH] www/awstats: update to 6.9 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: Sat, 03 Jan 2009 21:40:03 -0000 >Number: 130143 >Category: ports >Synopsis: [PATCH] www/awstats: update to 6.9 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Jan 03 21:40:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Naram Qashat >Release: FreeBSD 7.0-STABLE i386 >Organization: >Environment: System: FreeBSD kirby.cyberbotx.com 7.0-STABLE FreeBSD 7.0-STABLE #3: Fri Aug 22 17:52:25 EDT 2008 >Description: - Update to 6.9 Port maintainer (samm@os2.kiev.ua) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- awstats-6.9,1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/www/awstats/Makefile /kirby/shared/ports/awstats/Makefile --- /usr/ports/www/awstats/Makefile 2008-07-25 11:08:36.000000000 -0400 +++ /kirby/shared/ports/awstats/Makefile 2009-01-03 16:35:56.000000000 -0500 @@ -6,8 +6,7 @@ # PORTNAME= awstats -PORTVERSION= 6.8 -PORTREVISION= 1 +PORTVERSION= 6.9 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= SF @@ -75,6 +74,7 @@ @${MKDIR} ${PREFIX}/www/awstats/js @${MKDIR} ${PREFIX}/www/awstats/tools @${MKDIR} ${PREFIX}/www/awstats/tools/webmin + @${MKDIR} ${PREFIX}/www/awstats/tools/xslt ${INSTALL_SCRIPT} ${WRKSRC}/tools/awstats_buildstaticpages.pl ${PREFIX}/www/awstats/tools ${INSTALL_SCRIPT} ${WRKSRC}/tools/awstats_exportlib.pl ${PREFIX}/www/awstats/tools ${INSTALL_SCRIPT} ${WRKSRC}/tools/awstats_updateall.pl ${PREFIX}/www/awstats/tools @@ -82,7 +82,8 @@ ${INSTALL_SCRIPT} ${WRKSRC}/tools/logresolvemerge.pl ${PREFIX}/www/awstats/tools ${INSTALL_SCRIPT} ${WRKSRC}/tools/maillogconvert.pl ${PREFIX}/www/awstats/tools ${INSTALL_SCRIPT} ${WRKSRC}/tools/urlaliasbuilder.pl ${PREFIX}/www/awstats/tools - ${INSTALL_SCRIPT} ${WRKSRC}/tools/webmin/awstats-1.8.wbm ${PREFIX}/www/awstats/tools/webmin + ${INSTALL_DATA} ${WRKSRC}/tools/webmin/awstats-1.8.wbm ${PREFIX}/www/awstats/tools/webmin + ${INSTALL_DATA} ${WRKSRC}/tools/xslt/* ${PREFIX}/www/awstats/tools/xslt ${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awredir.pl ${PREFIX}/www/awstats/cgi-bin ${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/awstats.model.conf ${PREFIX}/www/awstats/cgi-bin ${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awstats.pl ${PREFIX}/www/awstats/cgi-bin @@ -103,16 +104,17 @@ ${INSTALL_DATA} ${WRKSRC}/wwwroot/icon/os/* ${PREFIX}/www/awstats/icons/os ${INSTALL_DATA} ${WRKSRC}/wwwroot/icon/other/* ${PREFIX}/www/awstats/icons/other ${INSTALL_DATA} ${WRKSRC}/wwwroot/js/* ${PREFIX}/www/awstats/js - @${ECHO_CMD} "" - @${ECHO_CMD} "* Rename ${PREFIX}/www/awstats/cgi-bin/awstats.model.conf to awstats.site.conf to setup awstats" - @${ECHO_CMD} "* Documentation has been installed in ${PREFIX}/share/doc/awstats" - @${ECHO_CMD} "" - .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR}/images ${INSTALL_DATA} ${WRKSRC}/docs/images/* ${DOCSDIR}/images ${INSTALL_DATA} ${WRKSRC}/docs/*.* ${DOCSDIR} .endif + @${ECHO_CMD} "" + @${ECHO_CMD} "* Rename ${PREFIX}/www/awstats/cgi-bin/awstats.model.conf to awstats.site.conf to setup awstats" +.if !defined(NOPORTDOCS) + @${ECHO_CMD} "* Documentation has been installed in ${PREFIX}/share/doc/awstats" +.endif + @${ECHO_CMD} "" .if !defined(BATCH) post-install: diff -ruN --exclude=CVS /usr/ports/www/awstats/distinfo /kirby/shared/ports/awstats/distinfo --- /usr/ports/www/awstats/distinfo 2008-07-24 06:03:20.000000000 -0400 +++ /kirby/shared/ports/awstats/distinfo 2009-01-03 16:24:48.000000000 -0500 @@ -1,3 +1,3 @@ -MD5 (awstats-6.8.tar.gz) = 1a35d5a2ca29b31dabd650f3e5f173e9 -SHA256 (awstats-6.8.tar.gz) = a888d0fd680016f71950f584b70c607ae3e28f192a0b8a6d758ed2a7928b6a99 -SIZE (awstats-6.8.tar.gz) = 1101851 +MD5 (awstats-6.9.tar.gz) = fc19dbb8449eccf3300efb30ca3376cb +SHA256 (awstats-6.9.tar.gz) = c5e288d05c71c5692c59625aa4bcf4c9b41ee0c46cb9b83e7dcac6510bb8b04f +SIZE (awstats-6.9.tar.gz) = 1125906 diff -ruN --exclude=CVS /usr/ports/www/awstats/files/patch-wwwroot-cgi-bin-awstats.pl /kirby/shared/ports/awstats/files/patch-wwwroot-cgi-bin-awstats.pl --- /usr/ports/www/awstats/files/patch-wwwroot-cgi-bin-awstats.pl 2006-01-29 19:34:32.000000000 -0500 +++ /kirby/shared/ports/awstats/files/patch-wwwroot-cgi-bin-awstats.pl 2009-01-03 16:32:54.000000000 -0500 @@ -1,11 +1,11 @@ ---- wwwroot/cgi-bin/awstats.pl.orig Sun Jan 15 22:28:43 2006 -+++ wwwroot/cgi-bin/awstats.pl Sun Jan 15 22:30:17 2006 -@@ -1911,7 +1911,7 @@ - # Windows and standard package: "$DIR/plugins" (plugins in same dir than awstats.pl) - # Redhat : "/usr/local/awstats/wwwroot/cgi-bin/plugins" - # Debian package : "/usr/share/awstats/plugins" -- my @PossiblePluginsDir=("$DIR/plugins","/usr/local/awstats/wwwroot/cgi-bin/plugins","/usr/share/awstats/plugins"); -+ my @PossiblePluginsDir=("$DIR/plugins","%%PREFIX%%/www/awstats/cgi-bin/plugins","/usr/share/awstats/plugins"); - my %DirAddedInINC=(); - - #Removed for security reason +--- wwwroot/cgi-bin/awstats.pl.orig 2008-11-30 10:42:46.000000000 -0500 ++++ wwwroot/cgi-bin/awstats.pl 2009-01-03 16:32:27.000000000 -0500 +@@ -2925,7 +2925,7 @@ + # Debian package : "/usr/share/awstats/plugins" + my @PossiblePluginsDir = ( + "$DIR/plugins", +- "/usr/local/awstats/wwwroot/cgi-bin/plugins", ++ "%%PREFIX%%/www/awstats/cgi-bin/plugins", + "/usr/share/awstats/plugins" + ); + my %DirAddedInINC = (); diff -ruN --exclude=CVS /usr/ports/www/awstats/pkg-plist /kirby/shared/ports/awstats/pkg-plist --- /usr/ports/www/awstats/pkg-plist 2008-07-24 06:03:20.000000000 -0400 +++ /kirby/shared/ports/awstats/pkg-plist 2009-01-03 16:35:17.000000000 -0500 @@ -156,6 +156,7 @@ www/awstats/cgi-bin/plugins/clusterinfo.pm www/awstats/cgi-bin/plugins/decodeutfkeys.pm www/awstats/cgi-bin/plugins/example/example.pm +www/awstats/cgi-bin/plugins/export_to_csv.pm www/awstats/cgi-bin/plugins/geoip.pm www/awstats/cgi-bin/plugins/geoip_city_maxmind.pm www/awstats/cgi-bin/plugins/geoip_isp_maxmind.pm @@ -185,6 +186,7 @@ www/awstats/icons/browser/bpftp.png www/awstats/icons/browser/bytel.png www/awstats/icons/browser/chimera.png +www/awstats/icons/browser/chrome.png www/awstats/icons/browser/cyberdog.png www/awstats/icons/browser/da.png www/awstats/icons/browser/dillo.png @@ -501,6 +503,7 @@ www/awstats/icons/flags/pt.png www/awstats/icons/flags/py.png www/awstats/icons/flags/qa.png +www/awstats/icons/flags/re.png www/awstats/icons/flags/ro.png www/awstats/icons/flags/ru.png www/awstats/icons/flags/rw.png @@ -562,6 +565,7 @@ www/awstats/icons/mime/ai.png www/awstats/icons/mime/archive.png www/awstats/icons/mime/audio.png +www/awstats/icons/mime/css.png www/awstats/icons/mime/doc.png www/awstats/icons/mime/flash.png www/awstats/icons/mime/html.png @@ -614,6 +618,7 @@ www/awstats/icons/os/linuxcentos.png www/awstats/icons/os/linuxdebian.png www/awstats/icons/os/linuxfedora.png +www/awstats/icons/os/linuxgentoo.png www/awstats/icons/os/linuxmandr.png www/awstats/icons/os/linuxredhat.png www/awstats/icons/os/linuxsuse.png @@ -646,6 +651,7 @@ www/awstats/icons/os/winlong.png www/awstats/icons/os/winme.png www/awstats/icons/os/winnt.png +www/awstats/icons/os/winunknown.png www/awstats/icons/os/winxp.png www/awstats/icons/os/commodore.png www/awstats/icons/os/psp.png @@ -684,6 +690,13 @@ www/awstats/tools/maillogconvert.pl www/awstats/tools/urlaliasbuilder.pl www/awstats/tools/webmin/awstats-1.8.wbm +www/awstats/tools/xslt/README.txt +www/awstats/tools/xslt/awstats.datademo1.xml +www/awstats/tools/xslt/awstats.datademo1.xslt +www/awstats/tools/xslt/awstats.datademo2.xml +www/awstats/tools/xslt/awstats.datademo2.xslt +www/awstats/tools/xslt/awstats.xsd +@dirrm www/awstats/tools/xslt @dirrm www/awstats/tools/webmin @dirrm www/awstats/tools @dirrm www/awstats/js --- awstats-6.9,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: