Thu Jan 15 12:12:04 2009 UTC ()
Changes 6.9:
* With postfix that support DSN (Delivery Status Notifications) we exclude
  some lines to avoid counting mails twice in maillogconvert.pl script.
* Logresolvemerge.pl support FreeRADIUS logs or anything else using
  (the fixed length!) ctime format timestamp.
* Add option stoponfirsteof in logresolvemerge tool.
* Add patch to support host_proxy tag in LogFormat (for Apache LogFormat
  containing %{X-Forwarded-For}i)
* Renamed Add to favourites on "Hit on favicon".
* Increase robots, search engines database (Added Google Chrome browser,
  better Vista, WII, detection, ...)
* Update languages files.
* Added a lot of patch from sourceforge.
* Bug fixes.


(adam)
diff -r1.39 -r1.40 pkgsrc/www/awstats/Makefile
diff -r1.13 -r1.14 pkgsrc/www/awstats/PLIST
diff -r1.22 -r1.23 pkgsrc/www/awstats/distinfo
diff -r1.1 -r1.2 pkgsrc/www/awstats/options.mk
diff -r1.8 -r1.9 pkgsrc/www/awstats/patches/patch-aa
diff -r1.5 -r1.6 pkgsrc/www/awstats/patches/patch-ab
cvs diff -r1.39 -r1.40 pkgsrc/www/awstats/Makefile (expand / switch to unified diff)

--- pkgsrc/www/awstats/Makefile 2008/09/11 10:37:11 1.39
+++ pkgsrc/www/awstats/Makefile 2009/01/15 12:12:04 1.40
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1# $NetBSD: Makefile,v 1.39 2008/09/11 10:37:11 adam Exp $ 1# $NetBSD: Makefile,v 1.40 2009/01/15 12:12:04 adam Exp $
2 2
3DISTNAME= awstats-6.8 3DISTNAME= awstats-6.9
4CATEGORIES= www 4CATEGORIES= www
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=awstats/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=awstats/}
6 6
7MAINTAINER= minskim@NetBSD.org 7MAINTAINER= minskim@NetBSD.org
8HOMEPAGE= http://awstats.sourceforge.net/ 8HOMEPAGE= http://awstats.sourceforge.net/
9COMMENT= Free real-time logfile analyzer to get advanced web statistics 9COMMENT= Free real-time logfile analyzer to get advanced web statistics
10 10
11PKG_DESTDIR_SUPPORT= user-destdir 11PKG_DESTDIR_SUPPORT= user-destdir
12 12
13NO_BUILD= yes 13NO_BUILD= yes
14 14
15USE_TOOLS+= perl:run pax 15USE_TOOLS+= perl:run pax
16REPLACE_PERL+= tools/*.pl 16REPLACE_PERL+= tools/*.pl
17REPLACE_PERL+= wwwroot/cgi-bin/*.pl 17REPLACE_PERL+= wwwroot/cgi-bin/*.pl
18REPLACE_PERL+= wwwroot/cgi-bin/plugins/*.pm 18REPLACE_PERL+= wwwroot/cgi-bin/plugins/*.pm
19REPLACE_PERL+= wwwroot/classes/src/*.pl 19REPLACE_PERL+= wwwroot/classes/src/*.pl
20 20
21.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
22.include "options.mk" 22.include "options.mk"
23 23
24APACHE_USER?= www 24APACHE_USER?= www
25APACHE_GROUP?= www 25APACHE_GROUP?= www
26 26
27PKG_GROUPS_VARS+= APACHE_GROUP 27PKG_GROUPS_VARS+= APACHE_GROUP
28PKG_USERS_VARS+= APACHE_USER 28PKG_USERS_VARS= APACHE_USER
29BUILD_DEFS+= VARBASE 29BUILD_DEFS+= VARBASE
30 30
31# OWN_DIRS= ${VARBASE}/awstats 31# OWN_DIRS= ${VARBASE}/awstats
32OWN_DIRS_PERMS+= ${VARBASE}/awstats ${APACHE_USER} ${APACHE_GROUP} 0700 32OWN_DIRS_PERMS+= ${VARBASE}/awstats ${APACHE_USER} ${APACHE_GROUP} 0700
33PKG_SYSCONFSUBDIR= awstats 33PKG_SYSCONFSUBDIR= awstats
34 34
35SUBST_CLASSES+= conf 35SUBST_CLASSES+= conf
36SUBST_STAGE.conf= pre-configure 36SUBST_STAGE.conf= pre-configure
37SUBST_FILES.conf= tools/awstats_configure.pl \ 37SUBST_FILES.conf= tools/awstats_configure.pl \
38 tools/awstats_buildstaticpages.pl \ 38 tools/awstats_buildstaticpages.pl \
39 tools/awstats_updateall.pl \ 39 tools/awstats_updateall.pl \
40 wwwroot/cgi-bin/awstats.model.conf \ 40 wwwroot/cgi-bin/awstats.model.conf \
41 wwwroot/cgi-bin/awstats.pl 41 wwwroot/cgi-bin/awstats.pl
cvs diff -r1.13 -r1.14 pkgsrc/www/awstats/PLIST (expand / switch to unified diff)

--- pkgsrc/www/awstats/PLIST 2008/09/11 10:37:11 1.13
+++ pkgsrc/www/awstats/PLIST 2009/01/15 12:12:04 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.13 2008/09/11 10:37:11 adam Exp $ 1@comment $NetBSD: PLIST,v 1.14 2009/01/15 12:12:04 adam Exp $
2awstats/bin/awstats_buildstaticpages.pl 2awstats/bin/awstats_buildstaticpages.pl
3awstats/bin/awstats_configure.pl 3awstats/bin/awstats_configure.pl
4awstats/bin/awstats_exportlib.pl 4awstats/bin/awstats_exportlib.pl
5awstats/bin/awstats_updateall.pl 5awstats/bin/awstats_updateall.pl
6awstats/bin/logresolvemerge.pl 6awstats/bin/logresolvemerge.pl
7awstats/bin/maillogconvert.pl 7awstats/bin/maillogconvert.pl
8awstats/bin/urlaliasbuilder.pl 8awstats/bin/urlaliasbuilder.pl
9awstats/cgi-bin/awredir.pl 9awstats/cgi-bin/awredir.pl
10awstats/cgi-bin/awstats.pl 10awstats/cgi-bin/awstats.pl
11awstats/cgi-bin/lang/awstats-al.txt 11awstats/cgi-bin/lang/awstats-al.txt
12awstats/cgi-bin/lang/awstats-ar.txt 12awstats/cgi-bin/lang/awstats-ar.txt
13awstats/cgi-bin/lang/awstats-ba.txt 13awstats/cgi-bin/lang/awstats-ba.txt
14awstats/cgi-bin/lang/awstats-be.txt 14awstats/cgi-bin/lang/awstats-be.txt
@@ -102,26 +102,27 @@ awstats/cgi-bin/lib/blacklist.txt @@ -102,26 +102,27 @@ awstats/cgi-bin/lib/blacklist.txt
102awstats/cgi-bin/lib/browsers.pm 102awstats/cgi-bin/lib/browsers.pm
103awstats/cgi-bin/lib/browsers_phone.pm 103awstats/cgi-bin/lib/browsers_phone.pm
104awstats/cgi-bin/lib/domains.pm 104awstats/cgi-bin/lib/domains.pm
105awstats/cgi-bin/lib/mime.pm 105awstats/cgi-bin/lib/mime.pm
106awstats/cgi-bin/lib/operating_systems.pm 106awstats/cgi-bin/lib/operating_systems.pm
107awstats/cgi-bin/lib/referer_spam.pm 107awstats/cgi-bin/lib/referer_spam.pm
108awstats/cgi-bin/lib/robots.pm 108awstats/cgi-bin/lib/robots.pm
109awstats/cgi-bin/lib/search_engines.pm 109awstats/cgi-bin/lib/search_engines.pm
110awstats/cgi-bin/lib/status_http.pm 110awstats/cgi-bin/lib/status_http.pm
111awstats/cgi-bin/lib/status_smtp.pm 111awstats/cgi-bin/lib/status_smtp.pm
112awstats/cgi-bin/lib/worms.pm 112awstats/cgi-bin/lib/worms.pm
113awstats/cgi-bin/plugins/clusterinfo.pm 113awstats/cgi-bin/plugins/clusterinfo.pm
114awstats/cgi-bin/plugins/decodeutfkeys.pm 114awstats/cgi-bin/plugins/decodeutfkeys.pm
 115awstats/cgi-bin/plugins/export_to_csv.pm
115awstats/cgi-bin/plugins/geoip.pm 116awstats/cgi-bin/plugins/geoip.pm
116awstats/cgi-bin/plugins/geoip_city_maxmind.pm 117awstats/cgi-bin/plugins/geoip_city_maxmind.pm
117awstats/cgi-bin/plugins/geoip_isp_maxmind.pm 118awstats/cgi-bin/plugins/geoip_isp_maxmind.pm
118awstats/cgi-bin/plugins/geoip_org_maxmind.pm 119awstats/cgi-bin/plugins/geoip_org_maxmind.pm
119awstats/cgi-bin/plugins/geoip_region_maxmind.pm 120awstats/cgi-bin/plugins/geoip_region_maxmind.pm
120awstats/cgi-bin/plugins/geoipfree.pm 121awstats/cgi-bin/plugins/geoipfree.pm
121awstats/cgi-bin/plugins/graphapplet.pm 122awstats/cgi-bin/plugins/graphapplet.pm
122awstats/cgi-bin/plugins/hashfiles.pm 123awstats/cgi-bin/plugins/hashfiles.pm
123awstats/cgi-bin/plugins/hostinfo.pm 124awstats/cgi-bin/plugins/hostinfo.pm
124awstats/cgi-bin/plugins/ipv6.pm 125awstats/cgi-bin/plugins/ipv6.pm
125awstats/cgi-bin/plugins/rawlog.pm 126awstats/cgi-bin/plugins/rawlog.pm
126awstats/cgi-bin/plugins/timehires.pm 127awstats/cgi-bin/plugins/timehires.pm
127awstats/cgi-bin/plugins/timezone.pm 128awstats/cgi-bin/plugins/timezone.pm
@@ -136,26 +137,27 @@ awstats/css/awstats_default.css @@ -136,26 +137,27 @@ awstats/css/awstats_default.css
136awstats/icon/browser/abilon.png 137awstats/icon/browser/abilon.png
137awstats/icon/browser/adobe.png 138awstats/icon/browser/adobe.png
138awstats/icon/browser/akregator.png 139awstats/icon/browser/akregator.png
139awstats/icon/browser/alcatel.png 140awstats/icon/browser/alcatel.png
140awstats/icon/browser/amaya.png 141awstats/icon/browser/amaya.png
141awstats/icon/browser/amigavoyager.png 142awstats/icon/browser/amigavoyager.png
142awstats/icon/browser/analogx.png 143awstats/icon/browser/analogx.png
143awstats/icon/browser/apt.png 144awstats/icon/browser/apt.png
144awstats/icon/browser/avant.png 145awstats/icon/browser/avant.png
145awstats/icon/browser/aweb.png 146awstats/icon/browser/aweb.png
146awstats/icon/browser/bpftp.png 147awstats/icon/browser/bpftp.png
147awstats/icon/browser/bytel.png 148awstats/icon/browser/bytel.png
148awstats/icon/browser/chimera.png 149awstats/icon/browser/chimera.png
 150awstats/icon/browser/chrome.png
149awstats/icon/browser/cyberdog.png 151awstats/icon/browser/cyberdog.png
150awstats/icon/browser/da.png 152awstats/icon/browser/da.png
151awstats/icon/browser/dillo.png 153awstats/icon/browser/dillo.png
152awstats/icon/browser/doris.png 154awstats/icon/browser/doris.png
153awstats/icon/browser/dreamcast.png 155awstats/icon/browser/dreamcast.png
154awstats/icon/browser/ecatch.png 156awstats/icon/browser/ecatch.png
155awstats/icon/browser/encompass.png 157awstats/icon/browser/encompass.png
156awstats/icon/browser/epiphany.png 158awstats/icon/browser/epiphany.png
157awstats/icon/browser/ericsson.png 159awstats/icon/browser/ericsson.png
158awstats/icon/browser/feeddemon.png 160awstats/icon/browser/feeddemon.png
159awstats/icon/browser/feedreader.png 161awstats/icon/browser/feedreader.png
160awstats/icon/browser/firefox.png 162awstats/icon/browser/firefox.png
161awstats/icon/browser/flashget.png 163awstats/icon/browser/flashget.png
@@ -449,26 +451,27 @@ awstats/icon/flags/org.png @@ -449,26 +451,27 @@ awstats/icon/flags/org.png
449awstats/icon/flags/pa.png 451awstats/icon/flags/pa.png
450awstats/icon/flags/pe.png 452awstats/icon/flags/pe.png
451awstats/icon/flags/pf.png 453awstats/icon/flags/pf.png
452awstats/icon/flags/pg.png 454awstats/icon/flags/pg.png
453awstats/icon/flags/ph.png 455awstats/icon/flags/ph.png
454awstats/icon/flags/pk.png 456awstats/icon/flags/pk.png
455awstats/icon/flags/pl.png 457awstats/icon/flags/pl.png
456awstats/icon/flags/pr.png 458awstats/icon/flags/pr.png
457awstats/icon/flags/pro.png 459awstats/icon/flags/pro.png
458awstats/icon/flags/ps.png 460awstats/icon/flags/ps.png
459awstats/icon/flags/pt.png 461awstats/icon/flags/pt.png
460awstats/icon/flags/py.png 462awstats/icon/flags/py.png
461awstats/icon/flags/qa.png 463awstats/icon/flags/qa.png
 464awstats/icon/flags/re.png
462awstats/icon/flags/ro.png 465awstats/icon/flags/ro.png
463awstats/icon/flags/ru.png 466awstats/icon/flags/ru.png
464awstats/icon/flags/rw.png 467awstats/icon/flags/rw.png
465awstats/icon/flags/sa.png 468awstats/icon/flags/sa.png
466awstats/icon/flags/sb.png 469awstats/icon/flags/sb.png
467awstats/icon/flags/sc.png 470awstats/icon/flags/sc.png
468awstats/icon/flags/sd.png 471awstats/icon/flags/sd.png
469awstats/icon/flags/se.png 472awstats/icon/flags/se.png
470awstats/icon/flags/sg.png 473awstats/icon/flags/sg.png
471awstats/icon/flags/si.png 474awstats/icon/flags/si.png
472awstats/icon/flags/sk.png 475awstats/icon/flags/sk.png
473awstats/icon/flags/sm.png 476awstats/icon/flags/sm.png
474awstats/icon/flags/sn.png 477awstats/icon/flags/sn.png
@@ -510,26 +513,27 @@ awstats/icon/flags/vu.png @@ -510,26 +513,27 @@ awstats/icon/flags/vu.png
510awstats/icon/flags/wf.png 513awstats/icon/flags/wf.png
511awstats/icon/flags/wlk.png 514awstats/icon/flags/wlk.png
512awstats/icon/flags/ws.png 515awstats/icon/flags/ws.png
513awstats/icon/flags/ye.png 516awstats/icon/flags/ye.png
514awstats/icon/flags/yt.png 517awstats/icon/flags/yt.png
515awstats/icon/flags/yu.png 518awstats/icon/flags/yu.png
516awstats/icon/flags/za.png 519awstats/icon/flags/za.png
517awstats/icon/flags/ze.png 520awstats/icon/flags/ze.png
518awstats/icon/flags/zm.png 521awstats/icon/flags/zm.png
519awstats/icon/flags/zw.png 522awstats/icon/flags/zw.png
520awstats/icon/mime/ai.png 523awstats/icon/mime/ai.png
521awstats/icon/mime/archive.png 524awstats/icon/mime/archive.png
522awstats/icon/mime/audio.png 525awstats/icon/mime/audio.png
 526awstats/icon/mime/css.png
523awstats/icon/mime/doc.png 527awstats/icon/mime/doc.png
524awstats/icon/mime/flash.png 528awstats/icon/mime/flash.png
525awstats/icon/mime/glasses.png 529awstats/icon/mime/glasses.png
526awstats/icon/mime/html.png 530awstats/icon/mime/html.png
527awstats/icon/mime/image.png 531awstats/icon/mime/image.png
528awstats/icon/mime/jscript.png 532awstats/icon/mime/jscript.png
529awstats/icon/mime/lit.png 533awstats/icon/mime/lit.png
530awstats/icon/mime/notavailable.png 534awstats/icon/mime/notavailable.png
531awstats/icon/mime/other.png 535awstats/icon/mime/other.png
532awstats/icon/mime/pdf.png 536awstats/icon/mime/pdf.png
533awstats/icon/mime/php.png 537awstats/icon/mime/php.png
534awstats/icon/mime/phshop.png 538awstats/icon/mime/phshop.png
535awstats/icon/mime/pl.png 539awstats/icon/mime/pl.png
@@ -563,26 +567,27 @@ awstats/icon/os/dos.png @@ -563,26 +567,27 @@ awstats/icon/os/dos.png
563awstats/icon/os/dreamcast.png 567awstats/icon/os/dreamcast.png
564awstats/icon/os/freebsd.png 568awstats/icon/os/freebsd.png
565awstats/icon/os/gnu.png 569awstats/icon/os/gnu.png
566awstats/icon/os/hpux.png 570awstats/icon/os/hpux.png
567awstats/icon/os/ibm.png 571awstats/icon/os/ibm.png
568awstats/icon/os/imode.png 572awstats/icon/os/imode.png
569awstats/icon/os/irix.png 573awstats/icon/os/irix.png
570awstats/icon/os/java.png 574awstats/icon/os/java.png
571awstats/icon/os/kfreebsd.png 575awstats/icon/os/kfreebsd.png
572awstats/icon/os/linux.png 576awstats/icon/os/linux.png
573awstats/icon/os/linuxcentos.png 577awstats/icon/os/linuxcentos.png
574awstats/icon/os/linuxdebian.png 578awstats/icon/os/linuxdebian.png
575awstats/icon/os/linuxfedora.png 579awstats/icon/os/linuxfedora.png
 580awstats/icon/os/linuxgentoo.png
576awstats/icon/os/linuxmandr.png 581awstats/icon/os/linuxmandr.png
577awstats/icon/os/linuxredhat.png 582awstats/icon/os/linuxredhat.png
578awstats/icon/os/linuxsuse.png 583awstats/icon/os/linuxsuse.png
579awstats/icon/os/linuxubuntu.png 584awstats/icon/os/linuxubuntu.png
580awstats/icon/os/mac.png 585awstats/icon/os/mac.png
581awstats/icon/os/macintosh.png 586awstats/icon/os/macintosh.png
582awstats/icon/os/macosx.png 587awstats/icon/os/macosx.png
583awstats/icon/os/netbsd.png 588awstats/icon/os/netbsd.png
584awstats/icon/os/netware.png 589awstats/icon/os/netware.png
585awstats/icon/os/next.png 590awstats/icon/os/next.png
586awstats/icon/os/openbsd.png 591awstats/icon/os/openbsd.png
587awstats/icon/os/os2.png 592awstats/icon/os/os2.png
588awstats/icon/os/osf.png 593awstats/icon/os/osf.png
@@ -596,26 +601,27 @@ awstats/icon/os/unix.png @@ -596,26 +601,27 @@ awstats/icon/os/unix.png
596awstats/icon/os/unknown.png 601awstats/icon/os/unknown.png
597awstats/icon/os/vms.png 602awstats/icon/os/vms.png
598awstats/icon/os/webtv.png 603awstats/icon/os/webtv.png
599awstats/icon/os/win.png 604awstats/icon/os/win.png
600awstats/icon/os/win16.png 605awstats/icon/os/win16.png
601awstats/icon/os/win2000.png 606awstats/icon/os/win2000.png
602awstats/icon/os/win2003.png 607awstats/icon/os/win2003.png
603awstats/icon/os/win95.png 608awstats/icon/os/win95.png
604awstats/icon/os/win98.png 609awstats/icon/os/win98.png
605awstats/icon/os/wince.png 610awstats/icon/os/wince.png
606awstats/icon/os/winlong.png 611awstats/icon/os/winlong.png
607awstats/icon/os/winme.png 612awstats/icon/os/winme.png
608awstats/icon/os/winnt.png 613awstats/icon/os/winnt.png
 614awstats/icon/os/winunknown.png
609awstats/icon/os/winxbox.png 615awstats/icon/os/winxbox.png
610awstats/icon/os/winxp.png 616awstats/icon/os/winxp.png
611awstats/icon/other/awstats_logo1.png 617awstats/icon/other/awstats_logo1.png
612awstats/icon/other/awstats_logo5.png 618awstats/icon/other/awstats_logo5.png
613awstats/icon/other/awstats_logo6.png 619awstats/icon/other/awstats_logo6.png
614awstats/icon/other/backleft.png 620awstats/icon/other/backleft.png
615awstats/icon/other/button.gif 621awstats/icon/other/button.gif
616awstats/icon/other/he.png 622awstats/icon/other/he.png
617awstats/icon/other/hh.png 623awstats/icon/other/hh.png
618awstats/icon/other/hk.png 624awstats/icon/other/hk.png
619awstats/icon/other/hp.png 625awstats/icon/other/hp.png
620awstats/icon/other/ht.png 626awstats/icon/other/ht.png
621awstats/icon/other/hx.png 627awstats/icon/other/hx.png
cvs diff -r1.22 -r1.23 pkgsrc/www/awstats/distinfo (expand / switch to unified diff)

--- pkgsrc/www/awstats/distinfo 2008/09/11 10:37:11 1.22
+++ pkgsrc/www/awstats/distinfo 2009/01/15 12:12:04 1.23
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
1$NetBSD: distinfo,v 1.22 2008/09/11 10:37:11 adam Exp $ 1$NetBSD: distinfo,v 1.23 2009/01/15 12:12:04 adam Exp $
2 2
3SHA1 (awstats-6.8.tar.gz) = cd0ab93ca28e5a194401232931d8f4521af10ae9 3SHA1 (awstats-6.9.tar.gz) = 5ad8485eab04147b20adf5e8a7bdd5b6d3e2468b
4RMD160 (awstats-6.8.tar.gz) = b03f382b19bc057598fb231d58afefdfb91c07bb 4RMD160 (awstats-6.9.tar.gz) = 339af2df9c44713d632b4d1ae3d733132f7b0bab
5Size (awstats-6.8.tar.gz) = 1101851 bytes 5Size (awstats-6.9.tar.gz) = 1125906 bytes
6SHA1 (patch-aa) = 78b3a3100d687f07e0bed7b677abc52b767b8598 6SHA1 (patch-aa) = 1897d739b38b9c830f9af2211aa9fcb5e15a6795
7SHA1 (patch-ab) = df8961949160d172ab40569a414b52eb4a8b1f06 7SHA1 (patch-ab) = 9ae474058a1803c1132b36448c1a6987c58e8823
8SHA1 (patch-ac) = 2c4f26e5cdd3550f20450c3484bc1d91000bdd63 
cvs diff -r1.1 -r1.2 pkgsrc/www/awstats/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/www/awstats/Attic/options.mk 2008/01/03 12:37:06 1.1
+++ pkgsrc/www/awstats/Attic/options.mk 2009/01/15 12:12:04 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.1 2008/01/03 12:37:06 adrianp Exp $ 1# $NetBSD: options.mk,v 1.2 2009/01/15 12:12:04 adam Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.awstats 3PKG_OPTIONS_VAR= PKG_OPTIONS.awstats
4 4
5PKG_SUPPORTED_OPTIONS= awstats-geoipfree 5PKG_SUPPORTED_OPTIONS= geoip
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9### 9###
10### Use the Geo IP Free module 10### Use the Geo IP Free module
11### 11###
12.if !empty(PKG_OPTIONS:Mawstats-geoipfree) 12.if !empty(PKG_OPTIONS:Mgeoip)
13DEPENDS+= p5-Geo-IPfree-[0-9]*:../../net/p5-Geo-IPfree 13DEPENDS+= p5-Geo-IPfree-[0-9]*:../../net/p5-Geo-IPfree
14.endif 14.endif
cvs diff -r1.8 -r1.9 pkgsrc/www/awstats/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/www/awstats/patches/Attic/patch-aa 2008/04/07 07:21:00 1.8
+++ pkgsrc/www/awstats/patches/Attic/patch-aa 2009/01/15 12:12:04 1.9
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-aa,v 1.8 2008/04/07 07:21:00 adam Exp $ 1$NetBSD: patch-aa,v 1.9 2009/01/15 12:12:04 adam Exp $
2 2
3--- wwwroot/cgi-bin/awstats.pl.orig 2007-07-07 13:00:06.000000000 +0200 3--- wwwroot/cgi-bin/awstats.pl.orig 2008-11-30 16:42:46.000000000 +0100
4+++ wwwroot/cgi-bin/awstats.pl 4+++ wwwroot/cgi-bin/awstats.pl
5@@ -1141,7 +1141,7 @@ sub Read_Config { 5@@ -1627,7 +1627,7 @@ sub Read_Config {
6 my $configdir=shift; 6 my $configdir = shift;
7 my @PossibleConfigDir=(); 7 my @PossibleConfigDir = ();
8  8
9- if ($configdir) 9- if ($configdir) {
10+ if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) 10+ if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) {
11 { 11
12 # If from CGI, overwriting of configdir is only possible if AWSTATS_ENABLE_CONFIG_DIR defined 12 # If from CGI, overwriting of configdir is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
13 #if ($ENV{'GATEWAY_INTERFACE'} && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) 13 #if ($ENV{'GATEWAY_INTERFACE'} && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
cvs diff -r1.5 -r1.6 pkgsrc/www/awstats/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/www/awstats/patches/Attic/patch-ab 2008/04/07 07:21:00 1.5
+++ pkgsrc/www/awstats/patches/Attic/patch-ab 2009/01/15 12:12:04 1.6
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ab,v 1.5 2008/04/07 07:21:00 adam Exp $ 1$NetBSD: patch-ab,v 1.6 2009/01/15 12:12:04 adam Exp $
2 2
3--- tools/awstats_configure.pl.orig 2007-04-02 20:30:52.000000000 +0200 3--- tools/awstats_configure.pl.orig 2008-04-06 15:45:24.000000000 +0200
4+++ tools/awstats_configure.pl 4+++ tools/awstats_configure.pl
5@@ -29,12 +29,12 @@ $AWSTATS_MODEL_CONFIG 5@@ -29,12 +29,12 @@ $AWSTATS_MODEL_CONFIG
6 $AWSTATS_DIRDATA_PATH 6 $AWSTATS_DIRDATA_PATH
7 /; 7 /;
8 $AWSTATS_PATH=''; 8 $AWSTATS_PATH='';
9-$AWSTATS_ICON_PATH='/usr/local/awstats/wwwroot/icon'; 9-$AWSTATS_ICON_PATH='/usr/local/awstats/wwwroot/icon';
10-$AWSTATS_CSS_PATH='/usr/local/awstats/wwwroot/css'; 10-$AWSTATS_CSS_PATH='/usr/local/awstats/wwwroot/css';
11-$AWSTATS_CLASSES_PATH='/usr/local/awstats/wwwroot/classes'; 11-$AWSTATS_CLASSES_PATH='/usr/local/awstats/wwwroot/classes';
12-$AWSTATS_CGI_PATH='/usr/local/awstats/wwwroot/cgi-bin'; 12-$AWSTATS_CGI_PATH='/usr/local/awstats/wwwroot/cgi-bin';
13-$AWSTATS_MODEL_CONFIG='/etc/awstats/awstats.model.conf'; # Used only when configure ran on linux 13-$AWSTATS_MODEL_CONFIG='/etc/awstats/awstats.model.conf'; # Used only when configure ran on linux
14-$AWSTATS_DIRDATA_PATH='/var/lib/awstats'; # Used only when configure ran on linux 14-$AWSTATS_DIRDATA_PATH='/var/lib/awstats'; # Used only when configure ran on linux
15+$AWSTATS_ICON_PATH='@PREFIX@/awstats/icon'; 15+$AWSTATS_ICON_PATH='@PREFIX@/awstats/icon';
16+$AWSTATS_CSS_PATH='@PREFIX@/awstats/css'; 16+$AWSTATS_CSS_PATH='@PREFIX@/awstats/css';
@@ -90,47 +90,47 @@ $NetBSD: patch-ab,v 1.5 2008/04/07 07:21 @@ -90,47 +90,47 @@ $NetBSD: patch-ab,v 1.5 2008/04/07 07:21
90+ $AWSTATS_CLASSES_PATH="$AWSTATS_PATH/classes"; 90+ $AWSTATS_CLASSES_PATH="$AWSTATS_PATH/classes";
91+ $AWSTATS_CGI_PATH="$AWSTATS_PATH/cgi-bin"; 91+ $AWSTATS_CGI_PATH="$AWSTATS_PATH/cgi-bin";
92 } 92 }
93 } 93 }
94 elsif ($OS eq 'windows') { 94 elsif ($OS eq 'windows') {
95@@ -421,6 +422,7 @@ if (! scalar keys %ApacheConfPath) { 95@@ -421,6 +422,7 @@ if (! scalar keys %ApacheConfPath) {
96 print "\n".($bidon?"Now, enter":"Enter")." full config file path of your Web server.\n"; 96 print "\n".($bidon?"Now, enter":"Enter")." full config file path of your Web server.\n";
97 print "Example: /etc/httpd/httpd.conf\n"; 97 print "Example: /etc/httpd/httpd.conf\n";
98 print "Example: /usr/local/apache2/conf/httpd.conf\n"; 98 print "Example: /usr/local/apache2/conf/httpd.conf\n";
99+ print "Example: @PREFIX@/etc/httpd/httpd.conf\n"; 99+ print "Example: @PREFIX@/etc/httpd/httpd.conf\n";
100 print "Example: c:\\Program files\\apache group\\apache\\conf\\httpd.conf\n"; 100 print "Example: c:\\Program files\\apache group\\apache\\conf\\httpd.conf\n";
101 $bidon=''; 101 $bidon='';
102 while ($bidon ne 'none' && ! -f "$bidon") { 102 while ($bidon ne 'none' && ! -f "$bidon") {
103@@ -545,8 +547,8 @@ EOF 103@@ -546,8 +548,8 @@ EOF
104 # ----------------------------- 104 # -----------------------------
105 my $modelfile=''; 105 my $modelfile='';
106 if ($OS eq 'linux') {  106 if ($OS eq 'linux') {
107- if (-f "$AWSTATS_PATH/wwwroot/cgi-bin/awstats.model.conf") { 107- if (-f "$AWSTATS_PATH/wwwroot/cgi-bin/awstats.model.conf") {
108- $modelfile="$AWSTATS_PATH/wwwroot/cgi-bin/awstats.model.conf"; 108- $modelfile="$AWSTATS_PATH/wwwroot/cgi-bin/awstats.model.conf";
109+ if (-f "@PKG_SYSCONFDIR@/awstats.model.conf") { 109+ if (-f "@PKG_SYSCONFDIR@/awstats.model.conf") {
110+ $modelfile="@PKG_SYSCONFDIR@/awstats.model.conf"; 110+ $modelfile="@PKG_SYSCONFDIR@/awstats.model.conf";
111 } 111 }
112 else { 112 else {
113 $modelfile="$AWSTATS_MODEL_CONFIG"; 113 $modelfile="$AWSTATS_MODEL_CONFIG";
114@@ -554,7 +556,7 @@ if ($OS eq 'linux') {  114@@ -555,7 +557,7 @@ if ($OS eq 'linux') {
115 } 115 }
116 } 116 }
117 elsif ($OS eq "macosx") {  117 elsif ($OS eq "macosx") {
118- $modelfile="$AWSTATS_PATH/wwwroot/cgi-bin/awstats.model.conf"; 118- $modelfile="$AWSTATS_PATH/wwwroot/cgi-bin/awstats.model.conf";
119+ $modelfile="@PKG_SYSCONFDIR@/awstats.model.conf"; 119+ $modelfile="@PKG_SYSCONFDIR@/awstats.model.conf";
120 } 120 }
121 elsif ($OS eq 'windows') { $modelfile="$AWSTATS_PATH\\wwwroot\\cgi-bin\\awstats.model.conf"; } 121 elsif ($OS eq 'windows') { $modelfile="$AWSTATS_PATH\\wwwroot\\cgi-bin\\awstats.model.conf"; }
122 else { $modelfile="$AWSTATS_PATH\\wwwroot\\cgi-bin\\awstats.model.conf"; } 122 else { $modelfile="$AWSTATS_PATH\\wwwroot\\cgi-bin\\awstats.model.conf"; }
123@@ -607,11 +609,11 @@ if ($bidon =~ /^y/i) { 123@@ -608,11 +610,11 @@ if ($bidon =~ /^y/i) {
124 if ($OS eq 'linux') { 124 if ($OS eq 'linux') {
125 print "\n-----> Define config file path\n"; 125 print "\n-----> Define config file path\n";
126 print "In which directory do you plan to store your config file(s) ?\n"; 126 print "In which directory do you plan to store your config file(s) ?\n";
127- print "Default: /etc/awstats\n"; 127- print "Default: /etc/awstats\n";
128+ print "Default: @PKG_SYSCONFDIR@\n"; 128+ print "Default: @PKG_SYSCONFDIR@\n";
129 my $bidon=''; 129 my $bidon='';
130 print "Directory path to store config file(s) (Enter for default):\n> "; 130 print "Directory path to store config file(s) (Enter for default):\n> ";
131 $bidon=<STDIN>; chomp $bidon; 131 $bidon=<STDIN>; chomp $bidon;
132- if (! $bidon) { $bidon = "/etc/awstats"; } 132- if (! $bidon) { $bidon = "/etc/awstats"; }
133+ if (! $bidon) { $bidon = "@PKG_SYSCONFDIR@"; } 133+ if (! $bidon) { $bidon = "@PKG_SYSCONFDIR@"; }
134 my $configdir=$bidon; 134 my $configdir=$bidon;
135 if (! -d $configdir) { 135 if (! -d $configdir) {
136 # Create the directory for config files 136 # Create the directory for config files