2 files changed, 47 insertions, 39 deletions

diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 4955e9ff740f..e5de6fad0f2d 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	webalizer
 PORTVERSION=	2.1.6
 PORTREVISION=	2
-CATEGORIES=	www
+CATEGORIES+=	www
 MASTER_SITES=	ftp://ftp.mrunix.net/pub/webalizer/ \
 		ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/
 DISTNAME=	${PORTNAME}-2.01-06-src
@@ -19,26 +19,29 @@ LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+
+.if defined(BATCH)
+# no cosmetique spaces allowed
+WEBALIZER_LANG?=english
+.endif
+
+.include <bsd.port.pre.mk>
+
 CONFIGURE_ARGS+=	--enable-dns \
 			--with-etcdir=${PREFIX}/etc \
 			--with-gdlib=${PREFIX}/lib \
 			--with-gd=${PREFIX}/include/gd
 CONFIGURE_ENV+=	LDFLAGS="-L${PREFIX}/lib"
-
-MAN1=		webalizer.1
+MAKE_ARGS+=	CFLAGS="${CFLAGS}"
+MAN1=		${PKGNAMEPREFIX}webalizer.1
 DOC1=		CHANGES COPYING Copyright INSTALL \
 		README README.FIRST DNS.README country-codes.txt
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-src$//}
+PLIST_SUB+=	PKGNAMEPREFIX=${PKGNAMEPREFIX}
 SUPP_LANG=	catalan chinese czech danish dutch english estonian \
 		finnish french german greek hungarian indonesian \
 		italian korean polish portuguese portuguese_brazil \
 		romanian russain slowak slovene spanish swedish turkish
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-src$//}
-MAKE_ARGS+=	CFLAGS="${CFLAGS}"
-
-.if defined(BATCH)
-# no cosmetique spaces allowed
-WEBALIZER_LANG=english
-.endif
 
 .if defined(WEBALIZER_LANG)
 CONFIGURE_ARGS+=	--with-language=${WEBALIZER_LANG}
@@ -46,6 +49,8 @@ CONFIGURE_ARGS+=	--with-language=${WEBALIZER_LANG}
 
 pre-configure:
 	@${PERL5} -pi -e "s=/etc=${PREFIX}/etc=" ${WRKSRC}/webalizer.1
+	@${PERL5} -pi -e "s=webalizer.conf=${PKGNAMEPREFIX}webalizer.conf=" \
+		${WRKSRC}/webalizer.c
 .if !defined(WEBALIZER_LANG)
 	@${ECHO_MSG} "You can customize the language by typing"
 	@${ECHO_MSG} "       make WEBALIZER_LANG=<lang>"
@@ -54,26 +59,28 @@ pre-configure:
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/webalizer ${PREFIX}/bin
-	${LN} -sf webalizer ${PREFIX}/bin/webazolver
+	${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}/${i} ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/webalizer.1 ${PREFIX}/man/man1/${i}
 .endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/webalizer
+	${MKDIR} ${PREFIX}/share/doc/${PKGNAMEPREFIX}webalizer
 .for i in ${DOC1}
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/webalizer/${i}
+	@${INSTALL_DATA} ${WRKSRC}/${i} \
+		${PREFIX}/share/doc/${PKGNAMEPREFIX}webalizer/${i}
 .endfor
-.endif
-	${MKDIR} ${PREFIX}/share/examples/webalizer
+	${MKDIR} ${PREFIX}/share/examples/${PKGNAMEPREFIX}webalizer
 .for i in msfree.png sample.conf webalizer.png
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/examples/webalizer/${i}
+	@${INSTALL_DATA} ${WRKSRC}/${i} \
+		${PREFIX}/share/examples/${PKGNAMEPREFIX}webalizer/${i}
 .endfor
-	@if [ ! -f ${PREFIX}/etc/webalizer.conf-dist ]; then \
-		${INSTALL_DATA} ${WRKSRC}/sample.conf \
-			${PREFIX}/etc/webalizer.conf-dist ; \
-	fi
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/webalizer/pkg-plist b/www/webalizer/pkg-plist
index 6bfb83f063a9..6d88e5d7094e 100644
--- a/www/webalizer/pkg-plist
+++ b/www/webalizer/pkg-plist
@@ -1,16 +1,17 @@
-bin/webalizer
-@unexec rm -f %B/webazolver
-etc/webalizer.conf-dist
-%%PORTDOCS%%share/doc/webalizer/CHANGES
-%%PORTDOCS%%share/doc/webalizer/COPYING
-%%PORTDOCS%%share/doc/webalizer/Copyright
-%%PORTDOCS%%share/doc/webalizer/INSTALL
-%%PORTDOCS%%share/doc/webalizer/DNS.README
-%%PORTDOCS%%share/doc/webalizer/README
-%%PORTDOCS%%share/doc/webalizer/README.FIRST
-%%PORTDOCS%%share/doc/webalizer/country-codes.txt
-%%PORTDOCS%%@dirrm share/doc/webalizer
-%%PORTDOCS%%share/examples/webalizer/msfree.png
-%%PORTDOCS%%share/examples/webalizer/sample.conf
-%%PORTDOCS%%share/examples/webalizer/webalizer.png
-%%PORTDOCS%%@dirrm share/examples/webalizer
+bin/%%PKGNAMEPREFIX%%webalizer
+@exec ln -f %%PKGNAMEPREFIX%%webalizer %B/%%PKGNAMEPREFIX%%webazolver
+@unexec rm -f %B/%%PKGNAMEPREFIX%%webazolver
+etc/%%PKGNAMEPREFIX%%webalizer.conf-dist
+%%PORTDOCS%%share/doc/%%PKGNAMEPREFIX%%webalizer/CHANGES
+%%PORTDOCS%%share/doc/%%PKGNAMEPREFIX%%webalizer/COPYING
+%%PORTDOCS%%share/doc/%%PKGNAMEPREFIX%%webalizer/Copyright
+%%PORTDOCS%%share/doc/%%PKGNAMEPREFIX%%webalizer/DNS.README
+%%PORTDOCS%%share/doc/%%PKGNAMEPREFIX%%webalizer/INSTALL
+%%PORTDOCS%%share/doc/%%PKGNAMEPREFIX%%webalizer/README
+%%PORTDOCS%%share/doc/%%PKGNAMEPREFIX%%webalizer/README.FIRST
+%%PORTDOCS%%share/doc/%%PKGNAMEPREFIX%%webalizer/country-codes.txt
+%%PORTDOCS%%@dirrm share/doc/%%PKGNAMEPREFIX%%webalizer
+%%PORTDOCS%%share/examples/%%PKGNAMEPREFIX%%webalizer/msfree.png
+%%PORTDOCS%%share/examples/%%PKGNAMEPREFIX%%webalizer/sample.conf
+%%PORTDOCS%%share/examples/%%PKGNAMEPREFIX%%webalizer/webalizer.png
+%%PORTDOCS%%@dirrm share/examples/%%PKGNAMEPREFIX%%webalizer