1 files changed, 35 insertions, 56 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/