Sat Apr 27 11:19:39 2013 UTC ()
Changes 7.1.1:
New features:
- Add windows 8 detection
- Add support of %time5 for iso date times.
- Fix problems with Perl 5.14


(adam)
diff -r1.50 -r1.51 pkgsrc/www/awstats/Makefile
diff -r1.19 -r1.20 pkgsrc/www/awstats/PLIST
diff -r1.31 -r1.32 pkgsrc/www/awstats/distinfo
diff -r1.11 -r1.12 pkgsrc/www/awstats/patches/patch-aa
diff -r1.6 -r1.7 pkgsrc/www/awstats/patches/patch-ab
diff -r1.1 -r1.2 pkgsrc/www/awstats/patches/patch-ad
diff -r1.1 -r0 pkgsrc/www/awstats/patches/patch-wwwroot_cgi-bin_awredir.pl
cvs diff -r1.50 -r1.51 pkgsrc/www/awstats/Makefile (expand / switch to unified diff)

--- pkgsrc/www/awstats/Makefile 2012/10/28 06:30:10 1.50
+++ pkgsrc/www/awstats/Makefile 2013/04/27 11:19:38 1.51
@@ -1,27 +1,24 @@ @@ -1,27 +1,24 @@
1# $NetBSD: Makefile,v 1.50 2012/10/28 06:30:10 asau Exp $ 1# $NetBSD: Makefile,v 1.51 2013/04/27 11:19:38 adam Exp $
2 2
3DISTNAME= awstats-7.1 3DISTNAME= awstats-7.1.1
4PKGREVISION= 1 
5CATEGORIES= www 4CATEGORIES= www
6MASTER_SITES= http://www.awstats.org/files/ 5MASTER_SITES= http://www.awstats.org/files/
7 6
8MAINTAINER= minskim@NetBSD.org 7MAINTAINER= minskim@NetBSD.org
9HOMEPAGE= http://www.awstats.org/ 8HOMEPAGE= http://www.awstats.org/
10COMMENT= Free real-time logfile analyzer to get advanced web statistics 9COMMENT= Free real-time logfile analyzer to get advanced web statistics
11LICENSE= gnu-gpl-v2 10LICENSE= gnu-gpl-v2
12 11
13DIST_SUBDIR= ${PKGNAME_NOREV} 
14 
15NO_BUILD= yes 12NO_BUILD= yes
16 13
17USE_TOOLS+= perl:run pax 14USE_TOOLS+= perl:run pax
18REPLACE_PERL+= tools/*.pl 15REPLACE_PERL+= tools/*.pl
19REPLACE_PERL+= wwwroot/cgi-bin/*.pl 16REPLACE_PERL+= wwwroot/cgi-bin/*.pl
20REPLACE_PERL+= wwwroot/cgi-bin/plugins/*.pm 17REPLACE_PERL+= wwwroot/cgi-bin/plugins/*.pm
21REPLACE_PERL+= wwwroot/classes/src/*.pl 18REPLACE_PERL+= wwwroot/classes/src/*.pl
22 19
23.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
24.include "options.mk" 21.include "options.mk"
25 22
26APACHE_USER?= www 23APACHE_USER?= www
27APACHE_GROUP?= www 24APACHE_GROUP?= www
cvs diff -r1.19 -r1.20 pkgsrc/www/awstats/PLIST (expand / switch to unified diff)

--- pkgsrc/www/awstats/PLIST 2012/07/20 14:11:04 1.19
+++ pkgsrc/www/awstats/PLIST 2013/04/27 11:19:38 1.20
@@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
1@comment $NetBSD: PLIST,v 1.19 2012/07/20 14:11:04 adam Exp $ 1@comment $NetBSD: PLIST,v 1.20 2013/04/27 11:19:38 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/geoip_generator.pl 6awstats/bin/geoip_generator.pl
7awstats/bin/logresolvemerge.pl 7awstats/bin/logresolvemerge.pl
8awstats/bin/maillogconvert.pl 8awstats/bin/maillogconvert.pl
9awstats/bin/urlaliasbuilder.pl 9awstats/bin/urlaliasbuilder.pl
 10awstats/cgi-bin/awdownloadcsv.pl
10awstats/cgi-bin/awredir.pl 11awstats/cgi-bin/awredir.pl
11awstats/cgi-bin/awstats.pl 12awstats/cgi-bin/awstats.pl
12awstats/cgi-bin/lang/awstats-al.txt 13awstats/cgi-bin/lang/awstats-al.txt
13awstats/cgi-bin/lang/awstats-ar.txt 14awstats/cgi-bin/lang/awstats-ar.txt
14awstats/cgi-bin/lang/awstats-ba.txt 15awstats/cgi-bin/lang/awstats-ba.txt
15awstats/cgi-bin/lang/awstats-be.txt 16awstats/cgi-bin/lang/awstats-be.txt
16awstats/cgi-bin/lang/awstats-bg.txt 17awstats/cgi-bin/lang/awstats-bg.txt
17awstats/cgi-bin/lang/awstats-br.txt 18awstats/cgi-bin/lang/awstats-br.txt
18awstats/cgi-bin/lang/awstats-bzg.txt 19awstats/cgi-bin/lang/awstats-bzg.txt
19awstats/cgi-bin/lang/awstats-ca.txt 20awstats/cgi-bin/lang/awstats-ca.txt
20awstats/cgi-bin/lang/awstats-cn.txt 21awstats/cgi-bin/lang/awstats-cn.txt
21awstats/cgi-bin/lang/awstats-cy.txt 22awstats/cgi-bin/lang/awstats-cy.txt
22awstats/cgi-bin/lang/awstats-cz.txt 23awstats/cgi-bin/lang/awstats-cz.txt
@@ -280,26 +281,27 @@ awstats/icon/flags/af.png @@ -280,26 +281,27 @@ awstats/icon/flags/af.png
280awstats/icon/flags/ag.png 281awstats/icon/flags/ag.png
281awstats/icon/flags/ai.png 282awstats/icon/flags/ai.png
282awstats/icon/flags/al.png 283awstats/icon/flags/al.png
283awstats/icon/flags/am.png 284awstats/icon/flags/am.png
284awstats/icon/flags/an.png 285awstats/icon/flags/an.png
285awstats/icon/flags/ao.png 286awstats/icon/flags/ao.png
286awstats/icon/flags/aq.png 287awstats/icon/flags/aq.png
287awstats/icon/flags/ar.png 288awstats/icon/flags/ar.png
288awstats/icon/flags/arpa.png 289awstats/icon/flags/arpa.png
289awstats/icon/flags/as.png 290awstats/icon/flags/as.png
290awstats/icon/flags/at.png 291awstats/icon/flags/at.png
291awstats/icon/flags/au.png 292awstats/icon/flags/au.png
292awstats/icon/flags/aw.png 293awstats/icon/flags/aw.png
 294awstats/icon/flags/ax.png
293awstats/icon/flags/az.png 295awstats/icon/flags/az.png
294awstats/icon/flags/ba.png 296awstats/icon/flags/ba.png
295awstats/icon/flags/bb.png 297awstats/icon/flags/bb.png
296awstats/icon/flags/bd.png 298awstats/icon/flags/bd.png
297awstats/icon/flags/be.png 299awstats/icon/flags/be.png
298awstats/icon/flags/bf.png 300awstats/icon/flags/bf.png
299awstats/icon/flags/bg.png 301awstats/icon/flags/bg.png
300awstats/icon/flags/bh.png 302awstats/icon/flags/bh.png
301awstats/icon/flags/bi.png 303awstats/icon/flags/bi.png
302awstats/icon/flags/biz.png 304awstats/icon/flags/biz.png
303awstats/icon/flags/bj.png 305awstats/icon/flags/bj.png
304awstats/icon/flags/bm.png 306awstats/icon/flags/bm.png
305awstats/icon/flags/bn.png 307awstats/icon/flags/bn.png
@@ -352,26 +354,27 @@ awstats/icon/flags/et.png @@ -352,26 +354,27 @@ awstats/icon/flags/et.png
352awstats/icon/flags/eu.png 354awstats/icon/flags/eu.png
353awstats/icon/flags/fi.png 355awstats/icon/flags/fi.png
354awstats/icon/flags/fj.png 356awstats/icon/flags/fj.png
355awstats/icon/flags/fk.png 357awstats/icon/flags/fk.png
356awstats/icon/flags/fm.png 358awstats/icon/flags/fm.png
357awstats/icon/flags/fo.png 359awstats/icon/flags/fo.png
358awstats/icon/flags/fr.png 360awstats/icon/flags/fr.png
359awstats/icon/flags/fx.png 361awstats/icon/flags/fx.png
360awstats/icon/flags/ga.png 362awstats/icon/flags/ga.png
361awstats/icon/flags/gb.png 363awstats/icon/flags/gb.png
362awstats/icon/flags/gd.png 364awstats/icon/flags/gd.png
363awstats/icon/flags/ge.png 365awstats/icon/flags/ge.png
364awstats/icon/flags/gf.png 366awstats/icon/flags/gf.png
 367awstats/icon/flags/gg.png
365awstats/icon/flags/gh.png 368awstats/icon/flags/gh.png
366awstats/icon/flags/gi.png 369awstats/icon/flags/gi.png
367awstats/icon/flags/gl.png 370awstats/icon/flags/gl.png
368awstats/icon/flags/glg.png 371awstats/icon/flags/glg.png
369awstats/icon/flags/gm.png 372awstats/icon/flags/gm.png
370awstats/icon/flags/gn.png 373awstats/icon/flags/gn.png
371awstats/icon/flags/gov.png 374awstats/icon/flags/gov.png
372awstats/icon/flags/gp.png 375awstats/icon/flags/gp.png
373awstats/icon/flags/gq.png 376awstats/icon/flags/gq.png
374awstats/icon/flags/gr.png 377awstats/icon/flags/gr.png
375awstats/icon/flags/gs.png 378awstats/icon/flags/gs.png
376awstats/icon/flags/gt.png 379awstats/icon/flags/gt.png
377awstats/icon/flags/gu.png 380awstats/icon/flags/gu.png
@@ -415,26 +418,27 @@ awstats/icon/flags/la.png @@ -415,26 +418,27 @@ awstats/icon/flags/la.png
415awstats/icon/flags/lb.png 418awstats/icon/flags/lb.png
416awstats/icon/flags/lc.png 419awstats/icon/flags/lc.png
417awstats/icon/flags/li.png 420awstats/icon/flags/li.png
418awstats/icon/flags/lk.png 421awstats/icon/flags/lk.png
419awstats/icon/flags/lr.png 422awstats/icon/flags/lr.png
420awstats/icon/flags/ls.png 423awstats/icon/flags/ls.png
421awstats/icon/flags/lt.png 424awstats/icon/flags/lt.png
422awstats/icon/flags/lu.png 425awstats/icon/flags/lu.png
423awstats/icon/flags/lv.png 426awstats/icon/flags/lv.png
424awstats/icon/flags/ly.png 427awstats/icon/flags/ly.png
425awstats/icon/flags/ma.png 428awstats/icon/flags/ma.png
426awstats/icon/flags/mc.png 429awstats/icon/flags/mc.png
427awstats/icon/flags/md.png 430awstats/icon/flags/md.png
 431awstats/icon/flags/me.png
428awstats/icon/flags/mg.png 432awstats/icon/flags/mg.png
429awstats/icon/flags/mil.png 433awstats/icon/flags/mil.png
430awstats/icon/flags/mk.png 434awstats/icon/flags/mk.png
431awstats/icon/flags/ml.png 435awstats/icon/flags/ml.png
432awstats/icon/flags/mm.png 436awstats/icon/flags/mm.png
433awstats/icon/flags/mn.png 437awstats/icon/flags/mn.png
434awstats/icon/flags/mo.png 438awstats/icon/flags/mo.png
435awstats/icon/flags/mp.png 439awstats/icon/flags/mp.png
436awstats/icon/flags/mq.png 440awstats/icon/flags/mq.png
437awstats/icon/flags/mr.png 441awstats/icon/flags/mr.png
438awstats/icon/flags/ms.png 442awstats/icon/flags/ms.png
439awstats/icon/flags/mt.png 443awstats/icon/flags/mt.png
440awstats/icon/flags/mu.png 444awstats/icon/flags/mu.png
@@ -479,26 +483,27 @@ awstats/icon/flags/qa.png @@ -479,26 +483,27 @@ awstats/icon/flags/qa.png
479awstats/icon/flags/re.png 483awstats/icon/flags/re.png
480awstats/icon/flags/ro.png 484awstats/icon/flags/ro.png
481awstats/icon/flags/rs.png 485awstats/icon/flags/rs.png
482awstats/icon/flags/ru.png 486awstats/icon/flags/ru.png
483awstats/icon/flags/rw.png 487awstats/icon/flags/rw.png
484awstats/icon/flags/sa.png 488awstats/icon/flags/sa.png
485awstats/icon/flags/sb.png 489awstats/icon/flags/sb.png
486awstats/icon/flags/sc.png 490awstats/icon/flags/sc.png
487awstats/icon/flags/sd.png 491awstats/icon/flags/sd.png
488awstats/icon/flags/se.png 492awstats/icon/flags/se.png
489awstats/icon/flags/sg.png 493awstats/icon/flags/sg.png
490awstats/icon/flags/si.png 494awstats/icon/flags/si.png
491awstats/icon/flags/sk.png 495awstats/icon/flags/sk.png
 496awstats/icon/flags/sl.png
492awstats/icon/flags/sm.png 497awstats/icon/flags/sm.png
493awstats/icon/flags/sn.png 498awstats/icon/flags/sn.png
494awstats/icon/flags/sr.png 499awstats/icon/flags/sr.png
495awstats/icon/flags/st.png 500awstats/icon/flags/st.png
496awstats/icon/flags/su.png 501awstats/icon/flags/su.png
497awstats/icon/flags/sv.png 502awstats/icon/flags/sv.png
498awstats/icon/flags/sy.png 503awstats/icon/flags/sy.png
499awstats/icon/flags/sz.png 504awstats/icon/flags/sz.png
500awstats/icon/flags/tc.png 505awstats/icon/flags/tc.png
501awstats/icon/flags/td.png 506awstats/icon/flags/td.png
502awstats/icon/flags/tf.png 507awstats/icon/flags/tf.png
503awstats/icon/flags/tg.png 508awstats/icon/flags/tg.png
504awstats/icon/flags/th.png 509awstats/icon/flags/th.png
@@ -617,26 +622,32 @@ awstats/icon/os/linuxcentos.png @@ -617,26 +622,32 @@ awstats/icon/os/linuxcentos.png
617awstats/icon/os/linuxdebian.png 622awstats/icon/os/linuxdebian.png
618awstats/icon/os/linuxfedora.png 623awstats/icon/os/linuxfedora.png
619awstats/icon/os/linuxgentoo.png 624awstats/icon/os/linuxgentoo.png
620awstats/icon/os/linuxmandr.png 625awstats/icon/os/linuxmandr.png
621awstats/icon/os/linuxpclinuxos.png 626awstats/icon/os/linuxpclinuxos.png
622awstats/icon/os/linuxredhat.png 627awstats/icon/os/linuxredhat.png
623awstats/icon/os/linuxsuse.png 628awstats/icon/os/linuxsuse.png
624awstats/icon/os/linuxubuntu.png 629awstats/icon/os/linuxubuntu.png
625awstats/icon/os/linuxvine.png 630awstats/icon/os/linuxvine.png
626awstats/icon/os/linuxzenwalk.png 631awstats/icon/os/linuxzenwalk.png
627awstats/icon/os/mac.png 632awstats/icon/os/mac.png
628awstats/icon/os/macintosh.png 633awstats/icon/os/macintosh.png
629awstats/icon/os/macosx.png 634awstats/icon/os/macosx.png
 635awstats/icon/os/macosx4.png
 636awstats/icon/os/macosx5.png
 637awstats/icon/os/macosx6.png
 638awstats/icon/os/macosx7.png
 639awstats/icon/os/macosx8.png
 640awstats/icon/os/macosx9.png
630awstats/icon/os/netbsd.png 641awstats/icon/os/netbsd.png
631awstats/icon/os/netware.png 642awstats/icon/os/netware.png
632awstats/icon/os/next.png 643awstats/icon/os/next.png
633awstats/icon/os/openbsd.png 644awstats/icon/os/openbsd.png
634awstats/icon/os/os2.png 645awstats/icon/os/os2.png
635awstats/icon/os/osf.png 646awstats/icon/os/osf.png
636awstats/icon/os/palmos.png 647awstats/icon/os/palmos.png
637awstats/icon/os/psp.png 648awstats/icon/os/psp.png
638awstats/icon/os/qnx.png 649awstats/icon/os/qnx.png
639awstats/icon/os/riscos.png 650awstats/icon/os/riscos.png
640awstats/icon/os/sco.png 651awstats/icon/os/sco.png
641awstats/icon/os/sunos.png 652awstats/icon/os/sunos.png
642awstats/icon/os/syllable.png 653awstats/icon/os/syllable.png
cvs diff -r1.31 -r1.32 pkgsrc/www/awstats/distinfo (expand / switch to unified diff)

--- pkgsrc/www/awstats/distinfo 2012/07/20 14:11:04 1.31
+++ pkgsrc/www/awstats/distinfo 2013/04/27 11:19:38 1.32
@@ -1,9 +1,8 @@ @@ -1,9 +1,8 @@
1$NetBSD: distinfo,v 1.31 2012/07/20 14:11:04 adam Exp $ 1$NetBSD: distinfo,v 1.32 2013/04/27 11:19:38 adam Exp $
2 2
3SHA1 (awstats-7.1/awstats-7.1.tar.gz) = edabc12bc44a701cd7bb0516002f9e016a5aaac0 3SHA1 (awstats-7.1.1.tar.gz) = 01acacae845e7b0a2cdc463c2b372111d0b48c7c
4RMD160 (awstats-7.1/awstats-7.1.tar.gz) = bff81df6b8e54a77aacca03a74b7c4e3711e8663 4RMD160 (awstats-7.1.1.tar.gz) = 81ae7375ba524c97319aa785d8e28bb74ec4ca86
5Size (awstats-7.1/awstats-7.1.tar.gz) = 1256030 bytes 5Size (awstats-7.1.1.tar.gz) = 1261038 bytes
6SHA1 (patch-aa) = fcbd1e95612891e31f996bbfc4ebb88ddb29eac7 6SHA1 (patch-aa) = dcd1f70c0196118c57daf22eb41663be675ae4ad
7SHA1 (patch-ab) = 9ae474058a1803c1132b36448c1a6987c58e8823 7SHA1 (patch-ab) = 5108717a44d993baea7a98e7c3e791e3be766c6c
8SHA1 (patch-ad) = 9c08fff3fcc3871a08c73c9509fbeb5baca06c09 8SHA1 (patch-ad) = 9d112a0a6f3805cdc261baa942187e8bd7664584
9SHA1 (patch-wwwroot_cgi-bin_awredir.pl) = 3e3a41ab4bfbe633f78af182f5d2692bd678595d 
cvs diff -r1.11 -r1.12 pkgsrc/www/awstats/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/www/awstats/patches/Attic/patch-aa 2012/02/13 22:34:38 1.11
+++ pkgsrc/www/awstats/patches/Attic/patch-aa 2013/04/27 11:19:38 1.12
@@ -1,34 +1,15 @@ @@ -1,34 +1,15 @@
1$NetBSD: patch-aa,v 1.11 2012/02/13 22:34:38 gls Exp $ 1$NetBSD: patch-aa,v 1.12 2013/04/27 11:19:38 adam Exp $
2 2
3Check for configdir. 3Check for configdir.
4Fix behavior with perl 5.14: http://sourceforge.net/tracker/index.php?func=detail&aid=3311848&group_id=13764&atid=113764 
5 4
6--- wwwroot/cgi-bin/awstats.pl.orig 2010-10-16 17:24:03.000000000 +0000 5--- wwwroot/cgi-bin/awstats.pl.orig 2013-03-08 20:16:52.000000000 +0000
7+++ wwwroot/cgi-bin/awstats.pl 6+++ wwwroot/cgi-bin/awstats.pl
8@@ -1354,7 +1354,7 @@ sub debug { 7@@ -1713,7 +1713,7 @@ sub Read_Config {
9 sub OptimizeArray { 
10 my $array = shift; 
11 my @arrayunreg = map { 
12- if (/\(\?[-\w]*:(.*)\)/) { $1 } 
13+ if (/\(\?[-^\w]*:(.*)\)/) { $1 } 
14 } @$array; 
15 my $notcasesensitive = shift; 
16 my $searchlist = 0; 
17@@ -1717,7 +1717,7 @@ sub Read_Config { 
18 "/etc/opt/awstats" 8 "/etc/opt/awstats"
19 );  9 );
20  10
21- if ($configdir) { 11- if ($configdir) {
22+ if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) { 12+ if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) {
23 # Check if configdir is outside default values. 13 # Check if configdir is outside default values.
24 my $outsidedefaultvalue=1; 14 my $outsidedefaultvalue=1;
25 foreach (@PossibleConfigDir) { 15 foreach (@PossibleConfigDir) {
26@@ -7809,7 +7809,7 @@ sub DecodeEncodedString { 
27 # Return: standardregex 
28 #------------------------------------------------------------------------------ 
29 sub UnCompileRegex { 
30- shift =~ /\(\?[-\w]*:(.*)\)/; 
31+ shift =~ /\(\?[-^\w]*:(.*)\)/; 
32 return $1; 
33 } 
34  
cvs diff -r1.6 -r1.7 pkgsrc/www/awstats/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/www/awstats/patches/Attic/patch-ab 2009/01/15 12:12:04 1.6
+++ pkgsrc/www/awstats/patches/Attic/patch-ab 2013/04/27 11:19:39 1.7
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ab,v 1.6 2009/01/15 12:12:04 adam Exp $ 1$NetBSD: patch-ab,v 1.7 2013/04/27 11:19:39 adam Exp $
 2
 3Fix paths.
2 4
3--- tools/awstats_configure.pl.orig 2008-04-06 15:45:24.000000000 +0200 5--- tools/awstats_configure.pl.orig 2008-04-06 15:45:24.000000000 +0200
4+++ tools/awstats_configure.pl 6+++ tools/awstats_configure.pl
5@@ -29,12 +29,12 @@ $AWSTATS_MODEL_CONFIG 7@@ -29,12 +29,12 @@ $AWSTATS_MODEL_CONFIG
6 $AWSTATS_DIRDATA_PATH 8 $AWSTATS_DIRDATA_PATH
7 /; 9 /;
8 $AWSTATS_PATH=''; 10 $AWSTATS_PATH='';
9-$AWSTATS_ICON_PATH='/usr/local/awstats/wwwroot/icon'; 11-$AWSTATS_ICON_PATH='/usr/local/awstats/wwwroot/icon';
10-$AWSTATS_CSS_PATH='/usr/local/awstats/wwwroot/css'; 12-$AWSTATS_CSS_PATH='/usr/local/awstats/wwwroot/css';
11-$AWSTATS_CLASSES_PATH='/usr/local/awstats/wwwroot/classes'; 13-$AWSTATS_CLASSES_PATH='/usr/local/awstats/wwwroot/classes';
12-$AWSTATS_CGI_PATH='/usr/local/awstats/wwwroot/cgi-bin'; 14-$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 15-$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 16-$AWSTATS_DIRDATA_PATH='/var/lib/awstats'; # Used only when configure ran on linux
cvs diff -r1.1 -r1.2 pkgsrc/www/awstats/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/www/awstats/patches/Attic/patch-ad 2010/02/02 11:20:29 1.1
+++ pkgsrc/www/awstats/patches/Attic/patch-ad 2013/04/27 11:19:39 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ad,v 1.1 2010/02/02 11:20:29 fhajny Exp $ 1$NetBSD: patch-ad,v 1.2 2013/04/27 11:19:39 adam Exp $
2 2
3Fix ampersand encoding that breaks XHTML output, ID 1824230. 3Fix ampersand encoding that breaks XHTML output, ID 1824230.
4 4
5--- wwwroot/cgi-bin/lib/search_engines.pm.orig 2008-11-15 14:58:02.000000000 +0000 5--- wwwroot/cgi-bin/lib/search_engines.pm.orig 2008-11-15 14:58:02.000000000 +0000
6+++ wwwroot/cgi-bin/lib/search_engines.pm 6+++ wwwroot/cgi-bin/lib/search_engines.pm
7@@ -904,7 +904,7 @@ 7@@ -914,7 +914,7 @@
8 'excite','<a href="http://www.excite.com/" title="Search Engine Home Page [new window]" target="_blank">Excite</a>', 8 'excite','<a href="http://www.excite.com/" title="Search Engine Home Page [new window]" target="_blank">Excite</a>',
9 # Minor international search engines 9 # Minor international search engines
10 'google4counter','<a href="http://www.4-counter.com/" title="Search Engine Home Page [new window]" target="_blank">4-counter (Google)</a>', 10 'google4counter','<a href="http://www.4-counter.com/" title="Search Engine Home Page [new window]" target="_blank">4-counter (Google)</a>',
11-'att','<a href="http://www.att.net/" title="Search Engine Home Page [new window]" target="_blank">AT&T search (powered by Google)</a>', 11-'att','<a href="http://www.att.net/" title="Search Engine Home Page [new window]" target="_blank">AT&T search (powered by Google)</a>',
12+'att','<a href="http://www.att.net/" title="Search Engine Home Page [new window]" target="_blank">AT&amp;T search (powered by Google)</a>', 12+'att','<a href="http://www.att.net/" title="Search Engine Home Page [new window]" target="_blank">AT&amp;T search (powered by Google)</a>',
13 'bungeebonesdotcom','<a href="http://BungeeBones.com/search.php/" title="Search Engine Home Page [new window]" target="_blank">BungeeBones</a>', 13 'bungeebonesdotcom','<a href="http://BungeeBones.com/search.php/" title="Search Engine Home Page [new window]" target="_blank">BungeeBones</a>',
14 'go','Go.com', 14 'go','Go.com',
15 'askde','<a href="http://de.ask.com/" title="Search Engine Home Page [new window]" target="_blank">Ask Deutschland</a>', 15 'askde','<a href="http://de.ask.com/" title="Search Engine Home Page [new window]" target="_blank">Ask Deutschland</a>',
File Deleted: pkgsrc/www/awstats/patches/Attic/patch-wwwroot_cgi-bin_awredir.pl