3 files changed, 50 insertions, 70 deletions

diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 3127c2731bff..4a482c388ca6 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -7,18 +7,20 @@
 
 PORTNAME=	webalizer
 PORTVERSION=	2.20.1
+PORTREVISION=	1
 CATEGORIES+=	www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/:main \
+MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/geodb/:geodb \
 		ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/:main \
 		http://flags.blogpotato.de/zip/:flags
 PKGNAMESUFFIX?=	${WEBALIZER_SUFFIX}${PKGNAMESUFFIX2}
 DISTNAME=	${PORTNAME}-2.20-01-src
-DISTFILES=	${DISTNAME}.tgz:main webalizer-geodb-20080701.tgz:main
-.if defined(WITH_GEOIP) || make(makesum) || defined(FETCH_ALL)
-DISTFILES+=	world.small.zip:flags special.small.zip:flags
+DISTFILES=	${DISTNAME}.tgz:main
+.if defined(WITH_GEODB) || defined(WITH_GEOIP)|| make(makesum) || defined(FETCH_ALL)
+DISTFILES+=	webalizer-flags.tgz:main
 .endif
 .if defined(WITH_GEODB) || make(makesum) || defined(FETCH_ALL)
-DISTFILES+=	webalizer-geodb-20080701.tgz:main
+DISTFILES+=	webalizer-geodb-20080701.tgz:geodb
 .endif
 
 MAINTAINER?=	dinoex@FreeBSD.org
@@ -29,10 +31,8 @@ LIB_DEPENDS=	gd.4:${PORTSDIR}/${GD_PORT}
 .endif
 .if defined(WITH_GEOIP)
 LIB_DEPENDS+=	GeoIP.5:${PORTSDIR}/net/GeoIP
-EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 .endif
 
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 DOCSDIR?=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR?=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
@@ -59,12 +59,25 @@ CONFLICTS+=	${PKGNAMEPREFIX}webalizer-2*
 CONFIGURE_ARGS+=	--enable-geoip \
 			--with-geoip-lib=${LOCALBASE}/lib \
 			--with-geoip-inc=${LOCALBASE}/include
-PLIST_SUB+=	WITH_GEOIP=""
 .else
 CONFLICTS+=	${PKGNAMEPREFIX}webalizer-geoip-2*
+.endif
+
+.if defined(WITH_GEODB) || defined(WITH_GEOIP)
+PLIST_SUB+=	WITH_GEOIP=""
+.else
 PLIST_SUB+=	WITH_GEOIP="@comment "
 .endif
 
+.if defined(WITH_BDB_VER) || defined(WITH_BDB) 
+USE_BDB=	yes
+INVALID_BDB_VER=	2 3 40
+LDFLAGS+=	-L${BDB_LIB_DIR}
+CFLAGS+=	-I${BDB_INCLUDE_DIR}
+.else
+CFLAGS+=	-DUSE_DB185
+.endif
+
 CONFIGURE_ARGS+=	--enable-dns \
 			--with-geodb=${PREFIX}/share/webalizer \
 			--sysconfdir=${PREFIX}/etc \
@@ -72,20 +85,20 @@ CONFIGURE_ARGS+=	--enable-dns \
 			--with-gd=${LOCALBASE}/include
 
 CONFIGURE_ENV+=	LDFLAGS="-L${PREFIX}/lib"
-CFLAGS+=	-DUSE_DB185 -Wall
+CFLAGS+=	-Wall
 MAN1=		${PKGNAMEPREFIX}webalizer.1 ${PKGNAMEPREFIX}wcmgr.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}
-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
+SUPP_LANG=	albanian arabic catalan chinese croatian czech danish dutch \
+		english estonian finnish french galician german greek \
+		hungarian icelandic indonesian italian japanese korean \
+		latvian lithuanian malay norwegian polish portuguese \
+		portuguese_brazil romanian romanian-iso-8859-2 russian \
+		serbian simplified_chinese slovak slovene spanish swedish \
+		thai turkish ukrainian
 
 .if defined(WEBALIZER_LANG)
 CONFIGURE_ARGS+=	--with-language=${WEBALIZER_LANG}
@@ -114,52 +127,20 @@ CFLAGS+=	-DUSE_FULL_CGI_REFS
 CFLAGS+=	-DUSE_CLICKABLE_REFERER
 .endif
 
-do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
-	@for f in ${EXTRACT_ONLY}; do \
-		case $$f in \
-		*.Z|*.gz|*.tgz) \
-			if ! (cd ${WRKDIR} && \
-				${GZCAT} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$f ${EXTRACT_AFTER_ARGS});\
-			then \
-				exit 1; \
-			fi \
-			;; \
-		*.bz2) \
-			if ! (cd ${WRKDIR} && \
-				${BZCAT} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$f ${EXTRACT_AFTER_ARGS});\
-			then \
-				exit 1; \
-			fi \
-			;; \
-		*.zip) \
-			if ! (cd ${WRKDIR} && \
-				${UNZIP_CMD} -qo ${_DISTDIR}/$$f -d ${WRKDIR});\
-			then \
-				exit 1; \
-			fi \
-			;; \
-		*) \
-			exit 1; \
-			;; \
-		esac; \
-	done
-.if !defined(EXTRACT_PRESERVE_OWNERSHIP)
-	@if [ `${ID} -u` = 0 ]; then \
-		${CHMOD} -R ug-s ${WRKDIR}; \
-		${CHOWN} -R 0:0 ${WRKDIR}; \
-	fi
-.endif
-
 pre-configure:
 	${REINPLACE_CMD} -e "s|/etc|${PREFIX}/etc|" \
 		${WRKSRC}/webalizer.1
 	${REINPLACE_CMD} \
 		-e "s|webalizer.conf|${PKGNAMEPREFIX}webalizer.conf|" \
 		${WRKSRC}/webalizer.c
+.if defined(WITH_BDB_VER) || defined(WITH_BDB) 
+	${REINPLACE_CMD} -e "s|-ldb|-l${BDB_LIB_NAME}|" \
+		${WRKSRC}/configure
+.else
 	${REINPLACE_CMD} -e "s|-ldb||" \
 		${WRKSRC}/configure
+.endif
+
 .if !defined(WEBALIZER_LANG)
 	@${ECHO_MSG} "You can customize the language by typing"
 	@${ECHO_MSG} "       make WEBALIZER_LANG=<lang>"
@@ -183,9 +164,7 @@ post-install:
 .endfor
 .if defined(WITH_GEODB) || defined(WITH_GEOIP)
 	${MKDIR} ${PREFIX}/share/geolizer
-.endif
-.if defined(WITH_GEOIP)
-	@${INSTALL_DATA} ${WRKDIR}/*.png ${PREFIX}/share/geolizer/
+	@${INSTALL_DATA} ${WRKDIR}/flags/* ${PREFIX}/share/geolizer/
 .endif
 .if defined(WITH_GEODB)
 	@${INSTALL_DATA} ${WRKDIR}/GeoDB.dat ${PREFIX}/share/geolizer/
diff --git a/www/webalizer/distinfo b/www/webalizer/distinfo
index b32643956ff3..3265250c8103 100644
--- a/www/webalizer/distinfo
+++ b/www/webalizer/distinfo
@@ -1,12 +1,9 @@
 MD5 (webalizer-2.20-01-src.tgz) = 9a5e39b4f0e229a279d58f93b2fac28b
 SHA256 (webalizer-2.20-01-src.tgz) = a45be28b6702b5b12b182567fd8fed4bcb98a216ba797d5fc2ba92721046a4f4
 SIZE (webalizer-2.20-01-src.tgz) = 538171
+MD5 (webalizer-flags.tgz) = 2605387b6076b8bdc0ec41b8655095c1
+SHA256 (webalizer-flags.tgz) = df9961fec7da2c16ed3faefb763f912c2db5ddce6a24e4f46647d7e64b8ab29a
+SIZE (webalizer-flags.tgz) = 146658
 MD5 (webalizer-geodb-20080701.tgz) = 696496638eec2fda07d674efe1fb226d
 SHA256 (webalizer-geodb-20080701.tgz) = 4d5308dae66b747592abb1ff677d6edc82dec3a5b5bc7cbd2e8b9e431da798c9
 SIZE (webalizer-geodb-20080701.tgz) = 288623
-MD5 (world.small.zip) = a9025c5d866dc02e7b8cef6a23dc14da
-SHA256 (world.small.zip) = 4f777bf3d0493b9bcefe27fdb1f4a8d9b69ec89b894918c7b5603d7aa482c35c
-SIZE (world.small.zip) = 202814
-MD5 (special.small.zip) = 10679b58bd596e3a77236479b792866d
-SHA256 (special.small.zip) = 1a8018ca22a7f6d85e27d0f84636481732ca316928cea62c7694c1be982a6e0b
-SIZE (special.small.zip) = 3495
diff --git a/www/webalizer/pkg-plist b/www/webalizer/pkg-plist
index a5e502bf76e8..86f02cb284de 100644
--- a/www/webalizer/pkg-plist
+++ b/www/webalizer/pkg-plist
@@ -4,6 +4,10 @@ bin/%%PKGNAMEPREFIX%%wcmgr
 @unexec rm -f %B/%%PKGNAMEPREFIX%%webazolver
 etc/%%PKGNAMEPREFIX%%webalizer.conf-dist
 %%WITH_GEODB%%share/geolizer/GeoDB.dat
+%%WITH_GEOIP%%share/geolizer/README
+%%WITH_GEOIP%%share/geolizer/a1.png
+%%WITH_GEOIP%%share/geolizer/a2.png
+%%WITH_GEOIP%%share/geolizer/ac.png
 %%WITH_GEOIP%%share/geolizer/ad.png
 %%WITH_GEOIP%%share/geolizer/ae.png
 %%WITH_GEOIP%%share/geolizer/af.png
@@ -30,6 +34,7 @@ etc/%%PKGNAMEPREFIX%%webalizer.conf-dist
 %%WITH_GEOIP%%share/geolizer/bh.png
 %%WITH_GEOIP%%share/geolizer/bi.png
 %%WITH_GEOIP%%share/geolizer/bj.png
+%%WITH_GEOIP%%share/geolizer/bl.png
 %%WITH_GEOIP%%share/geolizer/bm.png
 %%WITH_GEOIP%%share/geolizer/bn.png
 %%WITH_GEOIP%%share/geolizer/bo.png
@@ -53,7 +58,6 @@ etc/%%PKGNAMEPREFIX%%webalizer.conf-dist
 %%WITH_GEOIP%%share/geolizer/cn.png
 %%WITH_GEOIP%%share/geolizer/co.png
 %%WITH_GEOIP%%share/geolizer/cr.png
-%%WITH_GEOIP%%share/geolizer/cs.png
 %%WITH_GEOIP%%share/geolizer/cu.png
 %%WITH_GEOIP%%share/geolizer/cv.png
 %%WITH_GEOIP%%share/geolizer/cx.png
@@ -79,7 +83,6 @@ etc/%%PKGNAMEPREFIX%%webalizer.conf-dist
 %%WITH_GEOIP%%share/geolizer/fm.png
 %%WITH_GEOIP%%share/geolizer/fo.png
 %%WITH_GEOIP%%share/geolizer/fr.png
-%%WITH_GEOIP%%share/geolizer/fx.png
 %%WITH_GEOIP%%share/geolizer/ga.png
 %%WITH_GEOIP%%share/geolizer/gb.png
 %%WITH_GEOIP%%share/geolizer/gd.png
@@ -108,6 +111,7 @@ etc/%%PKGNAMEPREFIX%%webalizer.conf-dist
 %%WITH_GEOIP%%share/geolizer/id.png
 %%WITH_GEOIP%%share/geolizer/ie.png
 %%WITH_GEOIP%%share/geolizer/il.png
+%%WITH_GEOIP%%share/geolizer/im.png
 %%WITH_GEOIP%%share/geolizer/in.png
 %%WITH_GEOIP%%share/geolizer/io.png
 %%WITH_GEOIP%%share/geolizer/iq.png
@@ -144,6 +148,7 @@ etc/%%PKGNAMEPREFIX%%webalizer.conf-dist
 %%WITH_GEOIP%%share/geolizer/mc.png
 %%WITH_GEOIP%%share/geolizer/md.png
 %%WITH_GEOIP%%share/geolizer/me.png
+%%WITH_GEOIP%%share/geolizer/mf.png
 %%WITH_GEOIP%%share/geolizer/mg.png
 %%WITH_GEOIP%%share/geolizer/mh.png
 %%WITH_GEOIP%%share/geolizer/mk.png
@@ -163,7 +168,6 @@ etc/%%PKGNAMEPREFIX%%webalizer.conf-dist
 %%WITH_GEOIP%%share/geolizer/my.png
 %%WITH_GEOIP%%share/geolizer/mz.png
 %%WITH_GEOIP%%share/geolizer/na.png
-%%WITH_GEOIP%%share/geolizer/nato.png
 %%WITH_GEOIP%%share/geolizer/nc.png
 %%WITH_GEOIP%%share/geolizer/ne.png
 %%WITH_GEOIP%%share/geolizer/nf.png
@@ -175,7 +179,7 @@ etc/%%PKGNAMEPREFIX%%webalizer.conf-dist
 %%WITH_GEOIP%%share/geolizer/nr.png
 %%WITH_GEOIP%%share/geolizer/nu.png
 %%WITH_GEOIP%%share/geolizer/nz.png
-%%WITH_GEOIP%%share/geolizer/olympics.png
+%%WITH_GEOIP%%share/geolizer/o1.png
 %%WITH_GEOIP%%share/geolizer/om.png
 %%WITH_GEOIP%%share/geolizer/pa.png
 %%WITH_GEOIP%%share/geolizer/pe.png
@@ -195,7 +199,6 @@ etc/%%PKGNAMEPREFIX%%webalizer.conf-dist
 %%WITH_GEOIP%%share/geolizer/re.png
 %%WITH_GEOIP%%share/geolizer/ro.png
 %%WITH_GEOIP%%share/geolizer/rs.png
-%%WITH_GEOIP%%share/geolizer/rs.woa.png
 %%WITH_GEOIP%%share/geolizer/ru.png
 %%WITH_GEOIP%%share/geolizer/rw.png
 %%WITH_GEOIP%%share/geolizer/sa.png
@@ -214,6 +217,7 @@ etc/%%PKGNAMEPREFIX%%webalizer.conf-dist
 %%WITH_GEOIP%%share/geolizer/so.png
 %%WITH_GEOIP%%share/geolizer/sr.png
 %%WITH_GEOIP%%share/geolizer/st.png
+%%WITH_GEOIP%%share/geolizer/su.png
 %%WITH_GEOIP%%share/geolizer/sv.png
 %%WITH_GEOIP%%share/geolizer/sy.png
 %%WITH_GEOIP%%share/geolizer/sz.png
@@ -228,6 +232,7 @@ etc/%%PKGNAMEPREFIX%%webalizer.conf-dist
 %%WITH_GEOIP%%share/geolizer/tm.png
 %%WITH_GEOIP%%share/geolizer/tn.png
 %%WITH_GEOIP%%share/geolizer/to.png
+%%WITH_GEOIP%%share/geolizer/tp.png
 %%WITH_GEOIP%%share/geolizer/tr.png
 %%WITH_GEOIP%%share/geolizer/tt.png
 %%WITH_GEOIP%%share/geolizer/tv.png
@@ -235,8 +240,8 @@ etc/%%PKGNAMEPREFIX%%webalizer.conf-dist
 %%WITH_GEOIP%%share/geolizer/tz.png
 %%WITH_GEOIP%%share/geolizer/ua.png
 %%WITH_GEOIP%%share/geolizer/ug.png
+%%WITH_GEOIP%%share/geolizer/uk.png
 %%WITH_GEOIP%%share/geolizer/um.png
-%%WITH_GEOIP%%share/geolizer/un.png
 %%WITH_GEOIP%%share/geolizer/us.png
 %%WITH_GEOIP%%share/geolizer/uy.png
 %%WITH_GEOIP%%share/geolizer/uz.png
@@ -255,8 +260,7 @@ etc/%%PKGNAMEPREFIX%%webalizer.conf-dist
 %%WITH_GEOIP%%share/geolizer/za.png
 %%WITH_GEOIP%%share/geolizer/zm.png
 %%WITH_GEOIP%%share/geolizer/zw.png
-%%WITH_GEODB%%@dirrmtry share/geolizer
-%%WITH_GEOIP%%@dirrmtry share/geolizer
+%%WITH_GEOIP%%@dirrm share/geolizer
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/Copyright
 %%PORTDOCS%%%%DOCSDIR%%/DNS.README