summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/geolizer/Makefile106
-rw-r--r--www/geolizer/distinfo4
-rw-r--r--www/geolizer/files/patch-aa17
-rw-r--r--www/geolizer/files/patch-ab65
-rw-r--r--www/geolizer/files/patch-ac71
-rw-r--r--www/geolizer/files/patch-ad34
-rw-r--r--www/geolizer/files/patch-linklist24
-rw-r--r--www/geolizer/files/patch-lowercase-url-bug32
-rw-r--r--www/geolizer/pkg-descr7
-rw-r--r--www/geolizer/pkg-plist19
10 files changed, 7 insertions, 372 deletions
diff --git a/www/geolizer/Makefile b/www/geolizer/Makefile
index 75945459220f..386f83c3cfa6 100644
--- a/www/geolizer/Makefile
+++ b/www/geolizer/Makefile
@@ -5,107 +5,15 @@
# $FreeBSD$
#
-PORTNAME= geolizer
-PORTVERSION= 2.1.10
-PORTREVISION= 2
-CATEGORIES+= www
-MASTER_SITES= ftp://ftp.mrunix.net/pub/webalizer/:main \
- ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/:main \
- http://sysd.org/proj/:geo
-DISTNAME= webalizer-2.01-10-src
-DISTFILES= ${DISTNAME}.tar.bz2:main \
- geolizer_2.01-10-patch.20050520.tar.bz2:geo
-EXTRA_PATCHES= ${WRKDIR}/geolizer_2.01-10-patch/geolizer.patch
-PATCH_STRIP= -p1
+CATEGORIES= www
-MAINTAINER= ache@FreeBSD.org
-COMMENT= A web server log file analysis program, using GeoIP library
+MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
- gd.4:${PORTSDIR}/${GD_PORT} \
- GeoIP.4:${PORTSDIR}/net/GeoIP
+MASTERDIR?= ${.CURDIR}/../webalizer
+WITH_GEOIP= yes
-USE_BZIP2= yes
-GNU_CONFIGURE= yes
-DOCSDIR?= ${PREFIX}/share/doc/${PKGNAMEPREFIX}webalizer
-EXAMPLESDIR?= ${PREFIX}/share/examples/${PKGNAMEPREFIX}webalizer
-GD_PORT?= graphics/gd
-
-SUPP_LANG= catalan chinese croatian czech danish dutch english \
- estonian finnish french galician german greek hungarian \
- icelandic indonesian italian japanese korean latvian \
- malay norwegian polish portuguese portuguese_brazil \
- romanian romanian-iso-8859-2 russian serbian \
- simplified_chinese slovak slovene spanish swedish \
- turkish ukrainian
-
-CONFLICTS= webalizer-2*
-
-.include <bsd.port.pre.mk>
-
-CONFIGURE_ARGS+= --enable-dns \
- --with-etcdir=${PREFIX}/etc \
- --with-gdlib=${LOCALBASE}/lib \
- --with-gd=${LOCALBASE}/include \
- --enable-geoip \
- --with-geoip-lib=${LOCALBASE}/lib \
- --with-geoip-inc=${LOCALBASE}/include \
- --with-png=${LOCALBASE}/lib \
- --with-png-inc=${LOCALBASE}/include
-
-.if defined(GEOLIZER_LANG)
-CONFIGURE_ARGS+= --with-language=${GEOLIZER_LANG}
-.else
-CONFIGURE_ARGS+= --with-language=english
-.endif
-
-CFLAGS+= -DLINKLIST_MAX_STRING=256
-MAN1= ${PKGNAMEPREFIX}webalizer.1
-DOC1= CHANGES Copyright INSTALL \
- README README.FIRST DNS.README country-codes.txt
-DOC2= INSTALL GeoIP.README
-WRKSRC= ${WRKDIR}/${DISTNAME:S/-src$//}
-PLIST_SUB+= PKGNAMEPREFIX=${PKGNAMEPREFIX}
-
-pre-configure:
-.if !defined(GEOLIZER_LANG)
- @${ECHO_MSG} "You can customize the language by typing"
- @${ECHO_MSG} " make GEOLIZER_LANG=<lang>"
- @${ECHO_MSG} "where <lang> is one of:"
- @${ECHO_MSG} ${SUPP_LANG}
-.endif
- @${MV} ${WRKSRC}/webalizer.1 ${WRKSRC}/webalizer.1.sed
- ${SED} -e "s=/etc=${PREFIX}/etc=" \
- ${WRKSRC}/webalizer.1.sed > ${WRKSRC}/webalizer.1
- @${MV} ${WRKSRC}/webalizer.c ${WRKSRC}/webalizer.c.sed
- ${SED} -e "s=webalizer.conf=${PKGNAMEPREFIX}webalizer.conf=" \
- ${WRKSRC}/webalizer.c.sed > ${WRKSRC}/webalizer.c
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/webalizer \
- ${PREFIX}/bin/${PKGNAMEPREFIX}webalizer
- ${LN} -sf ${PKGNAMEPREFIX}webalizer \
- ${PREFIX}/bin/${PKGNAMEPREFIX}webazolver
- ${INSTALL_DATA} ${WRKSRC}/sample.conf \
- ${PREFIX}/etc/${PKGNAMEPREFIX}webalizer.conf-dist ;
-
-post-install:
-.for i in ${MAN1}
- ${INSTALL_MAN} ${WRKSRC}/webalizer.1 ${PREFIX}/man/man1/${i}
-.endfor
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}/geolizer
-.for i in ${DOC1}
- @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/${i}
-.endfor
-.for i in ${DOC2}
- @${INSTALL_DATA} ${WRKDIR}/geolizer_2.01-10-patch/${i} \
- ${DOCSDIR}/geolizer/${i}
-.endfor
- ${MKDIR} ${EXAMPLESDIR}
-.for i in msfree.png sample.conf webalizer.png
- @${INSTALL_DATA} ${WRKSRC}/${i} ${EXAMPLESDIR}/${i}
-.endfor
+.if exists(${.CURDIR}/Makefile.local)
+.include "${.CURDIR}/Makefile.local"
.endif
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/www/geolizer/distinfo b/www/geolizer/distinfo
deleted file mode 100644
index d1aa8defdb2e..000000000000
--- a/www/geolizer/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 (webalizer-2.01-10-src.tar.bz2) = 26d0a3c142423678daed2d6f579525d8
-SIZE (webalizer-2.01-10-src.tar.bz2) = 252664
-MD5 (geolizer_2.01-10-patch.20050520.tar.bz2) = 570bf2717be8981678dc9b4af2d321fb
-SIZE (geolizer_2.01-10-patch.20050520.tar.bz2) = 35836
diff --git a/www/geolizer/files/patch-aa b/www/geolizer/files/patch-aa
deleted file mode 100644
index 37e6eb36db24..000000000000
--- a/www/geolizer/files/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
---- linklist.c.bak Fri Sep 29 07:51:02 2000
-+++ linklist.c Sat Oct 14 17:22:16 2000
-@@ -197,12 +197,12 @@
- strncpy(temp_buf,str,79);
- temp_buf[79]=0;
-
-- while (!isspace((int)*name)&&*name!=0) name++;
-+ while (!isspace((unsigned char)*name)&&*name!=0) name++;
- if (*name==0) name=temp_buf;
- else
- {
- *name++=0;
-- while (isspace((int)*name)&&*name!=0) name++;
-+ while (isspace((unsigned char)*name)&&*name!=0) name++;
- if (*name==0) name=temp_buf;
- }
-
diff --git a/www/geolizer/files/patch-ab b/www/geolizer/files/patch-ab
deleted file mode 100644
index f8f53e94cdc3..000000000000
--- a/www/geolizer/files/patch-ab
+++ /dev/null
@@ -1,65 +0,0 @@
---- preserve.c.bak Fri Sep 29 07:51:32 2000
-+++ preserve.c Sat Oct 14 17:34:03 2000
-@@ -492,7 +492,7 @@
- tmp_buf[strlen(tmp_buf)-1]=0;
-
- if ((fgets(buffer,BUFSIZE,fp)) == NULL) return 10; /* error exit */
-- if (!isdigit((int)buffer[0])) return 10; /* error exit */
-+ if (!isdigit((unsigned char)buffer[0])) return 10; /* error exit */
-
- /* load temporary node data */
- sscanf(buffer,"%d %lu %lu %lf %lu %lu",
-@@ -523,7 +523,7 @@
- tmp_buf[strlen(buffer)-1]=0;
-
- if ((fgets(buffer,BUFSIZE,fp)) == NULL) return 8; /* error exit */
-- if (!isdigit((int)buffer[0])) return 8; /* error exit */
-+ if (!isdigit((unsigned char)buffer[0])) return 8; /* error exit */
-
- /* load temporary node data */
- sscanf(buffer,"%d %lu %lu %lf %lu %lu",
-@@ -563,7 +563,7 @@
- tmp_buf[strlen(buffer)-1]=0;
-
- if ((fgets(buffer,BUFSIZE,fp)) == NULL) return 9; /* error exit */
-- if (!isdigit((int)buffer[0])) return 9; /* error exit */
-+ if (!isdigit((unsigned char)buffer[0])) return 9; /* error exit */
-
- /* load temporary node data */
- sscanf(buffer,"%d %lu %lu %lf %lu %lu",
-@@ -602,7 +602,7 @@
- tmp_buf[strlen(buffer)-1]=0;
-
- if ((fgets(buffer,BUFSIZE,fp)) == NULL) return 11; /* error exit */
-- if (!isdigit((int)buffer[0])) return 11; /* error exit */
-+ if (!isdigit((unsigned char)buffer[0])) return 11; /* error exit */
-
- /* load temporary node data */
- sscanf(buffer,"%d %lu",&t_rnode.flag,&t_rnode.count);
-@@ -627,7 +627,7 @@
- tmp_buf[strlen(buffer)-1]=0;
-
- if ((fgets(buffer,BUFSIZE,fp)) == NULL) return 12; /* error exit */
-- if (!isdigit((int)buffer[0])) return 12; /* error exit */
-+ if (!isdigit((unsigned char)buffer[0])) return 12; /* error exit */
-
- /* load temporary node data */
- sscanf(buffer,"%d %lu",&t_anode.flag,&t_anode.count);
-@@ -652,7 +652,7 @@
- tmp_buf[strlen(buffer)-1]=0;
-
- if ((fgets(buffer,BUFSIZE,fp)) == NULL) return 13; /* error exit */
-- if (!isdigit((int)buffer[0])) return 13; /* error exit */
-+ if (!isdigit((unsigned char)buffer[0])) return 13; /* error exit */
-
- /* load temporary node data */
- sscanf(buffer,"%lu",&t_snode.count);
-@@ -677,7 +677,7 @@
- tmp_buf[strlen(buffer)-1]=0;
-
- if ((fgets(buffer,BUFSIZE,fp)) == NULL) return 14; /* error exit */
-- if (!isdigit((int)buffer[0])) return 14; /* error exit */
-+ if (!isdigit((unsigned char)buffer[0])) return 14; /* error exit */
-
- /* load temporary node data */
- sscanf(buffer,"%d %lu %lu %lf %lu %lu",
diff --git a/www/geolizer/files/patch-ac b/www/geolizer/files/patch-ac
deleted file mode 100644
index 2723bff29eb1..000000000000
--- a/www/geolizer/files/patch-ac
+++ /dev/null
@@ -1,71 +0,0 @@
---- webalizer.c.orig Wed Oct 24 10:24:51 2001
-+++ webalizer.c Tue Feb 12 05:29:59 2002
-@@ -231,7 +231,7 @@
- int main(int argc, char *argv[])
- {
- int i; /* generic counter */
-- char *cp1, *cp2, *cp3, *str; /* generic char pointers */
-+ unsigned char *cp1, *cp2, *cp3, *str; /* generic char pointers */
- NLISTPTR lptr; /* generic list pointer */
-
- extern char *optarg; /* used for command line */
-@@ -569,7 +569,7 @@
-
- /* convert month name to lowercase */
- for (i=4;i<7;i++)
-- log_rec.datetime[i]=tolower(log_rec.datetime[i]);
-+ log_rec.datetime[i]=tolower((unsigned char)log_rec.datetime[i]);
-
- /* get year/month/day/hour/min/sec values */
- for (i=0;i<12;i++)
-@@ -713,7 +713,7 @@
- {
- if ((cp1=strstr(log_rec.url,lptr->string))!=NULL)
- {
-- if ((cp1==log_rec.url)||(*(cp1-1)=='/'))
-+ if ((cp1==(unsigned char *)log_rec.url)||(*(cp1-1)=='/'))
- {
- *cp1='\0';
- if (log_rec.url[0]=='\0')
-@@ -1466,19 +1466,19 @@
- while ( (fgets(buffer,BUFSIZE,fp)) != NULL)
- {
- /* skip comments and blank lines */
-- if ( (buffer[0]=='#') || isspace((int)buffer[0]) ) continue;
-+ if ( (buffer[0]=='#') || isspace((unsigned char)buffer[0]) ) continue;
-
- /* Get keyword */
- cp1=buffer;cp2=keyword;
-- while ( isalnum((int)*cp1) ) *cp2++ = *cp1++;
-+ while ( isalnum((unsigned char)*cp1) ) *cp2++ = *cp1++;
- *cp2='\0';
-
- /* Get value */
- cp2=value;
-- while ( (*cp1!='\n')&&(*cp1!='\0')&&(isspace((int)*cp1)) ) cp1++;
-+ while ( (*cp1!='\n')&&(*cp1!='\0')&&(isspace((unsigned char)*cp1)) ) cp1++;
- while ( (*cp1!='\n')&&(*cp1!='\0') ) *cp2++ = *cp1++;
- *cp2--='\0';
-- while ( (isspace((int)*cp2)) && (cp2 != value) ) *cp2--='\0';
-+ while ( (isspace((unsigned char)*cp2)) && (cp2 != value) ) *cp2--='\0';
-
- /* check if blank keyword/value */
- if ( (keyword[0]=='\0') || (value[0]=='\0') ) continue;
-@@ -1820,7 +1820,7 @@
- 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 */
-+ *cp2++= *cp1; /* normal character */
- cp1++;
- }
- }
-@@ -1855,7 +1855,7 @@
- int i=group_domains+1;
-
- cp = str+strlen(str)-1;
-- if (isdigit((int)*cp)) return NULL; /* ignore IP addresses */
-+ if (isdigit((unsigned char)*cp)) return NULL; /* ignore IP addresses */
-
- while (cp!=str)
- {
diff --git a/www/geolizer/files/patch-ad b/www/geolizer/files/patch-ad
deleted file mode 100644
index 4938e4d50425..000000000000
--- a/www/geolizer/files/patch-ad
+++ /dev/null
@@ -1,34 +0,0 @@
---- output.c.orig Fri Jul 23 23:13:47 2004
-+++ output.c Sat Jul 24 00:26:37 2004
-@@ -1543,10 +1543,17 @@
- rptr=*pointer++;
- if (rptr->flag == OBJ_REG)
- {
-- fprintf(out_fp,"%-8lu %6.02f%% %s\n",
-- rptr->count,
-- (t_hit==0)?0:((float)rptr->count/t_hit)*100.0,
-- rptr->string);
-+ if (strstr(rptr->string,"://")!=NULL)
-+ fprintf(out_fp,"%-8lu %6.02f%% <A HREF=\"%s\">%s</A>\n",
-+ rptr->count,
-+ (t_hit==0)?0:((float)rptr->count/t_hit)*100.0,
-+ rptr->string,
-+ rptr->string);
-+ else
-+ fprintf(out_fp,"%-8lu %6.02f%% %s\n",
-+ rptr->count,
-+ (t_hit==0)?0:((float)rptr->count/t_hit)*100.0,
-+ rptr->string);
- r_reg--;
- }
- }
-@@ -2033,7 +2040,7 @@
- while ( (*domain!='.')&&(domain!=hptr->string)) domain--;
- if (domain==hptr->string)
- country=NULL;
-- else if (isdigit((int)*++domain))
-+ else if (isdigit((unsigned char)*++domain))
- {
- #ifdef USE_GEOIP
- if (use_geoip)
-
diff --git a/www/geolizer/files/patch-linklist b/www/geolizer/files/patch-linklist
deleted file mode 100644
index 7e2ca025bae9..000000000000
--- a/www/geolizer/files/patch-linklist
+++ /dev/null
@@ -1,24 +0,0 @@
---- linklist.h.orig Fri Sep 29 05:50:30 2000
-+++ linklist.h Sat Jun 23 11:15:57 2001
-@@ -1,12 +1,18 @@
- #ifndef _LINKLIST_H
- #define _LINKLIST_H
-
--struct nlist { char string[80]; /* list struct for HIDE items */
-+#ifndef LINKLIST_MAX_STRING
-+#define LINKLIST_MAX_STRING 80
-+#endif
-+
-+struct nlist { /* list struct for HIDE items */
-+ char string[LINKLIST_MAX_STRING];
- struct nlist *next; };
- typedef struct nlist *NLISTPTR;
-
--struct glist { char string[80]; /* list struct for GROUP items */
-- char name[80];
-+struct glist { /* list struct for GROUP items */
-+ char string[LINKLIST_MAX_STRING];
-+ char name[LINKLIST_MAX_STRING];
- struct glist *next; };
- typedef struct glist *GLISTPTR;
-
diff --git a/www/geolizer/files/patch-lowercase-url-bug b/www/geolizer/files/patch-lowercase-url-bug
deleted file mode 100644
index 29d7ac8710ef..000000000000
--- a/www/geolizer/files/patch-lowercase-url-bug
+++ /dev/null
@@ -1,32 +0,0 @@
---- webalizer.c 2002-04-16 18:11:31.000000000 -0400
-+++ webalizer.c.new 2003-07-07 12:35:45.000000000 -0400
-@@ -688,6 +688,14 @@
- /* un-escape URL */
- unescape(log_rec.url);
-
-+ /* strip query portion of cgi scripts */
-+ cp1 = log_rec.url;
-+ while (*cp1 != '\0')
-+ if (!isurlchar(*cp1)) { *cp1 = '\0'; break; }
-+ else cp1++;
-+ if (log_rec.url[0]=='\0')
-+ { log_rec.url[0]='/'; log_rec.url[1]='\0'; }
-+
- /* check for service (ie: http://) and lowercase if found */
- if ( (cp2=strstr(log_rec.url,"://")) != NULL)
- {
-@@ -699,14 +707,6 @@
- }
- }
-
-- /* strip query portion of cgi scripts */
-- cp1 = log_rec.url;
-- while (*cp1 != '\0')
-- if (!isurlchar(*cp1)) { *cp1 = '\0'; break; }
-- else cp1++;
-- if (log_rec.url[0]=='\0')
-- { log_rec.url[0]='/'; log_rec.url[1]='\0'; }
--
- /* strip off index.html (or any aliases) */
- lptr=index_alias;
- while (lptr!=NULL)
diff --git a/www/geolizer/pkg-descr b/www/geolizer/pkg-descr
deleted file mode 100644
index d24c25e196fe..000000000000
--- a/www/geolizer/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Patch for Webalizer to generate faster and more reliable geographic
-statistics than using default DNS suffix method. It uses GeoIP library to
-do that. In fact, if you disable DNS reversal on your HTTP server, it will
-work faster and your stats get more accuracy when processed by patched
-Webalizer.
-
-WWW: http://sysd.org/proj/log.php#glzr
diff --git a/www/geolizer/pkg-plist b/www/geolizer/pkg-plist
deleted file mode 100644
index b4f971b36136..000000000000
--- a/www/geolizer/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-bin/%%PKGNAMEPREFIX%%webalizer
-@exec ln -f %B/%%PKGNAMEPREFIX%%webalizer %B/%%PKGNAMEPREFIX%%webazolver
-@unexec rm -f %B/%%PKGNAMEPREFIX%%webazolver
-etc/%%PKGNAMEPREFIX%%webalizer.conf-dist
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/Copyright
-%%PORTDOCS%%%%DOCSDIR%%/DNS.README
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.FIRST
-%%PORTDOCS%%%%DOCSDIR%%/country-codes.txt
-%%PORTDOCS%%%%DOCSDIR%%/geolizer/GeoIP.README
-%%PORTDOCS%%%%DOCSDIR%%/geolizer/INSTALL
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/geolizer
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%%%EXAMPLESDIR%%/msfree.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/sample.conf
-%%PORTDOCS%%%%EXAMPLESDIR%%/webalizer.png
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 09:45:48 +0000