2 files changed, 82 insertions, 25 deletions

diff --git a/www/geolizer/Makefile b/www/geolizer/Makefile
index 5286f47bef56..ab0ab812dc8d 100644
--- a/www/geolizer/Makefile
+++ b/www/geolizer/Makefile
@@ -5,38 +5,79 @@
 # $FreeBSD$
 #
 
-CONFLICTS=	webalizer-2*
-
-MASTERDIR=      ${.CURDIR}/../webalizer
+PORTNAME=	geolizer
+PORTVERSION=	2.1.10
+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.20040216.tar.bz2:geo
+EXTRA_PATCHES=	${WRKDIR}/geolizer_2.01-10-patch/geolizer.patch
+PATCH_STRIP=	-p1
 
-PATCH_SITES+=	http://sysd.org/proj/
-PATCHFILES+=	geolizer_2.01-10-patch.20040216.tar.bz2
-PATCH_DIST_STRIP= -p1
-PATCHDIR=	${.CURDIR}/files
-MD5_FILE=	${.CURDIR}/distinfo
-DESCR=		${.CURDIR}/pkg-descr
-DOCSDIR=	${PREFIX}/share/doc/webalizer
-EXAMPLESDIR=	${PREFIX}/share/examples/webalizer
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A web server log file analysis program, using GeoIP library
 
-WEBALIZER_LANG=english
+LIB_DEPENDS=    gd.4:${PORTSDIR}/${GD_PORT} \
+		GeoIP.4:${PORTSDIR}/net/GeoIP
 
-CFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ARGS+= --enable-geoip \
-		--with-geoip-lib=${LOCALBASE} \
-		--with-geoip-inc=${LOCALBASE}
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+DOCSDIR?=	${PREFIX}/share/doc/${PKGNAMEPREFIX}webalizer
+EXAMPLESDIR?=	${PREFIX}/share/examples/${PKGNAMEPREFIX}webalizer
+GD_PORT?=	graphics/gd
 
-LIB_DEPENDS=    gd.4:${PORTSDIR}/graphics/gd \
-		GeoIP.4:${PORTSDIR}/net/GeoIP
+CONFLICTS=	webalizer-2*
 
-MAINTAINER=	ports@FreeBSD.org
+.include <bsd.port.pre.mk>
 
-.include "${MASTERDIR}/Makefile"
+CONFIGURE_ARGS+=	--enable-dns \
+			--with-etcdir=${LOCALBASE}/etc \
+			--with-gdlib=${LOCALBASE}/lib \
+			--with-gd=${LOCALBASE}/include \
+			--enable-geoip \
+			--with-geoip-lib=${LOCALBASE}/lib \
+			--with-geoip-inc=${LOCALBASE}/include \
+			--with-language=english
+CONFIGURE_ENV+=	LDFLAGS="-L${PREFIX}/lib"
+CFLAGS+=	-DLINKLIST_MAX_STRING=256
+MAN1=		${PKGNAMEPREFIX}webalizer.1
+DOC1=		CHANGES Copyright INSTALL \
+		README README.FIRST DNS.README country-codes.txt
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-src$//}
+PLIST_SUB+=	PKGNAMEPREFIX=${PKGNAMEPREFIX}
 
-# Overwrite section, can't be placed before
+pre-configure:
+	@${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
 
-PORTNAME=	geolizer
-PORTREVISION=	0
-DISTNAME=       webalizer-2.01-10-src
+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 ;
 
-COMMENT=	A web server log file analysis program, using GeoIP library
+post-install:
+.for i in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/webalizer.1 ${PREFIX}/man/man1/${i}
+.endfor
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for i in ${DOC1}
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/${i}
+.endfor
+	${MKDIR} ${EXAMPLESDIR}
+.for i in msfree.png sample.conf webalizer.png
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${EXAMPLESDIR}/${i}
+.endfor
+.endif
 
+.include <bsd.port.post.mk>
diff --git a/www/geolizer/pkg-plist b/www/geolizer/pkg-plist
new file mode 100644
index 000000000000..2f52e5af8c95
--- /dev/null
+++ b/www/geolizer/pkg-plist
@@ -0,0 +1,16 @@
+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%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%EXAMPLESDIR%%/msfree.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/sample.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/webalizer.png
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%