diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2008-01-14 09:24:06 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2008-01-14 09:24:06 +0000 |
| commit | 752e1ef36d31df3f475ef0a73698590c256c6672 (patch) | |
| tree | 6fbd32e7e97b7a5489740dbf005ef9e7e43f191f | |
| parent | - force installation of cups.desktop (diff) | |
- new option WITH_WEBALIZER_LOWERCASE_SEARCH
lowercase search strings like in unpathced webalizer
default is to not lowercase search strings to honor intenational charsets.
Submitted by: Frank Altpeter
- adding default HTMLHead to sample.conf
HTMLHead <META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">
Reported by: Lapo Luchini
Notes
Notes:
svn path=/head/; revision=205630
| -rw-r--r-- | www/webalizer/Makefile | 6 | ||||
| -rw-r--r-- | www/webalizer/files/patch-ac | 15 | ||||
| -rw-r--r-- | www/webalizer/files/patch-sample.conf | 10 |
3 files changed, 24 insertions, 7 deletions
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile index e8a7fcc5e09a..343246ab97f1 100644 --- a/www/webalizer/Makefile +++ b/www/webalizer/Makefile @@ -7,7 +7,7 @@ PORTNAME= webalizer PORTVERSION= 2.1.10 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES+= www MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/:main \ ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/:main \ @@ -110,6 +110,10 @@ CFLAGS+= -I${LOCALBASE}/include EXTRA_PATCHES+= ${FILESDIR}/webalizer-fullrefs.patch .endif +.if defined(WITH_WEBALIZER_LOWERCASE_SEARCH) +CFLAGS+= -DWEBALIZER_LOWERCASE_SEARCH +.endif + do-extract: @${RM} -rf ${WRKDIR} @${MKDIR} ${WRKDIR} diff --git a/www/webalizer/files/patch-ac b/www/webalizer/files/patch-ac index 2723bff29eb1..b7c3ab64a7fd 100644 --- a/www/webalizer/files/patch-ac +++ b/www/webalizer/files/patch-ac @@ -1,5 +1,5 @@ ---- webalizer.c.orig Wed Oct 24 10:24:51 2001 -+++ webalizer.c Tue Feb 12 05:29:59 2002 +--- webalizer.c.orig 2007-11-10 15:13:44.000000000 +0100 ++++ webalizer.c 2007-11-10 15:17:44.000000000 +0100 @@ -231,7 +231,7 @@ int main(int argc, char *argv[]) { @@ -27,7 +27,7 @@ { *cp1='\0'; if (log_rec.url[0]=='\0') -@@ -1466,19 +1466,19 @@ +@@ -1471,19 +1471,19 @@ while ( (fgets(buffer,BUFSIZE,fp)) != NULL) { /* skip comments and blank lines */ @@ -51,16 +51,19 @@ /* check if blank keyword/value */ if ( (keyword[0]=='\0') || (value[0]=='\0') ) continue; -@@ -1820,7 +1820,7 @@ +@@ -1826,7 +1826,11 @@ if (*cp1=='+') *cp1=' '; /* change + to space */ if (sp_flg && *cp1==' ') { cp1++; continue; } /* compress spaces */ if (*cp1==' ') sp_flg=1; else sp_flg=0; /* (flag spaces here) */ -- *cp2++=tolower(*cp1); /* normal character */ ++#ifdef WEBALIZER_LOWERCASE_SEARCH + *cp2++=tolower(*cp1); /* normal character */ ++#else + *cp2++= *cp1; /* normal character */ ++#endif cp1++; } } -@@ -1855,7 +1855,7 @@ +@@ -1862,7 +1866,7 @@ int i=group_domains+1; cp = str+strlen(str)-1; diff --git a/www/webalizer/files/patch-sample.conf b/www/webalizer/files/patch-sample.conf new file mode 100644 index 000000000000..ee52b3c9275c --- /dev/null +++ b/www/webalizer/files/patch-sample.conf @@ -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 <META NAME="author" CONTENT="The Webalizer"> ++HTMLHead <META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW"> + + # HTMLBody defined the HTML code to be inserted, starting with the + # <BODY> tag. If not specified, the default is shown below. If |