1 files changed, 20 insertions, 57 deletions

diff --git a/www/awstats-devel/Makefile b/www/awstats-devel/Makefile
index eae378512dce..5aa6f4c0a0f2 100644
--- a/www/awstats-devel/Makefile
+++ b/www/awstats-devel/Makefile
@@ -5,19 +5,15 @@
 # $FreeBSD$
 #
 
-PORTNAME=	awstats
-PORTVERSION=	6.5
-PORTREVISION=	1
-PORTEPOCH=	1
+PORTNAME=	awstats-devel
+PORTVERSION=	6.6
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://awstats.sourceforge.net/files/
+DISTNAME=	awstats-${PORTVERSION}
 
-MAINTAINER=	webmaster@shopcusa.com
+MAINTAINER=	babak@farrokhi.net
 COMMENT=	Free real-time logfile analyzer to get advanced web statistics
 
-FORBIDDEN=	Command Injection Vulnerability
-
 RUN_DEPENDS=	${SITE_PERL}/Net/XWhois.pm:${PORTSDIR}/net/p5-Net-XWhois
 
 NO_BUILD=	yes
@@ -25,6 +21,13 @@ USE_PERL5_RUN=	yes
 USE_DOS2UNIX=	tools/logresolvemerge.pl
 
 SUB_FILES=	pkg-message
+AWSTATS?=	www/awstats
+PLIST_SUB=	AWSTATS=${AWSTATS}
+WWWOWN?=	www
+WWWGRP?=	www
+
+CONFLICTS=	awstats-6.*
+LATEST_LINK=	awstats-devel
 
 OPTIONS=	IPV6 "Enable IPV6 for use with IPv6 Plugin" Off
 
@@ -44,56 +47,16 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/tools/awstats_configure.pl
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/tools/awstats_updateall.pl
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/wwwroot/cgi-bin/awstats.pl
+	@${FIND} ${WRKSRC} -name '*.orig' -delete
+	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
 do-install:
-	@${MKDIR} ${PREFIX}/www/awstats
-	@${MKDIR} ${PREFIX}/www/awstats/cgi-bin
-	@${MKDIR} ${PREFIX}/www/awstats/cgi-bin/lang
-	@${MKDIR} ${PREFIX}/www/awstats/cgi-bin/lang/tooltips_f
-	@${MKDIR} ${PREFIX}/www/awstats/cgi-bin/lang/tooltips_m
-	@${MKDIR} ${PREFIX}/www/awstats/cgi-bin/lang/tooltips_w
-	@${MKDIR} ${PREFIX}/www/awstats/cgi-bin/lib
-	@${MKDIR} ${PREFIX}/www/awstats/cgi-bin/plugins
-	@${MKDIR} ${PREFIX}/www/awstats/cgi-bin/plugins/example
-	@${MKDIR} ${PREFIX}/www/awstats/classes
-	@${MKDIR} ${PREFIX}/www/awstats/css
-	@${MKDIR} ${PREFIX}/www/awstats/icons/browser
-	@${MKDIR} ${PREFIX}/www/awstats/icons/clock
-	@${MKDIR} ${PREFIX}/www/awstats/icons/cpu
-	@${MKDIR} ${PREFIX}/www/awstats/icons/flags
-	@${MKDIR} ${PREFIX}/www/awstats/icons/mime
-	@${MKDIR} ${PREFIX}/www/awstats/icons/os
-	@${MKDIR} ${PREFIX}/www/awstats/icons/other
-	@${MKDIR} ${PREFIX}/www/awstats/js
-	@${MKDIR} ${PREFIX}/www/awstats/tools
-	@${MKDIR} ${PREFIX}/www/awstats/tools/webmin
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/awstats_buildstaticpages.pl ${PREFIX}/www/awstats/tools
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/awstats_exportlib.pl ${PREFIX}/www/awstats/tools
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/awstats_updateall.pl ${PREFIX}/www/awstats/tools
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/awstats_configure.pl ${PREFIX}/www/awstats/tools
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/logresolvemerge.pl ${PREFIX}/www/awstats/tools
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/maillogconvert.pl ${PREFIX}/www/awstats/tools
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/urlaliasbuilder.pl ${PREFIX}/www/awstats/tools
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/webmin/awstats-1.6.wbm ${PREFIX}/www/awstats/tools/webmin
-	${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awredir.pl ${PREFIX}/www/awstats/cgi-bin
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/awstats.model.conf ${PREFIX}/www/awstats/cgi-bin
-	${INSTALL_SCRIPT} ${WRKSRC}/wwwroot/cgi-bin/awstats.pl ${PREFIX}/www/awstats/cgi-bin
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lang/tooltips_f/*.txt ${PREFIX}/www/awstats/cgi-bin/lang/tooltips_f
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lang/tooltips_m/*.txt ${PREFIX}/www/awstats/cgi-bin/lang/tooltips_m
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lang/tooltips_w/*.txt ${PREFIX}/www/awstats/cgi-bin/lang/tooltips_w
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lang/*.txt ${PREFIX}/www/awstats/cgi-bin/lang
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/lib/* ${PREFIX}/www/awstats/cgi-bin/lib
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/*.pm ${PREFIX}/www/awstats/cgi-bin/plugins
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/cgi-bin/plugins/example/* ${PREFIX}/www/awstats/cgi-bin/plugins/example
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/css/* ${PREFIX}/www/awstats/css
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/icon/browser/* ${PREFIX}/www/awstats/icons/browser
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/icon/clock/* ${PREFIX}/www/awstats/icons/clock
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/icon/cpu/* ${PREFIX}/www/awstats/icons/cpu
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/icon/flags/* ${PREFIX}/www/awstats/icons/flags
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/icon/mime/* ${PREFIX}/www/awstats/icons/mime
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/icon/os/* ${PREFIX}/www/awstats/icons/os
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/icon/other/* ${PREFIX}/www/awstats/icons/other
-	${INSTALL_DATA} ${WRKSRC}/wwwroot/js/* ${PREFIX}/www/awstats/js
+	@${MKDIR} ${PREFIX}/${AWSTATS}
+	@${MKDIR} ${PREFIX}/${AWSTATS}/tools
+	@${MV} ${WRKSRC}/wwwroot/icon ${WRKSRC}/wwwroot/icons
+	@${CP} -R ${WRKSRC}/wwwroot/* ${PREFIX}/${AWSTATS}
+	@${CP} -R ${WRKSRC}/tools/* ${PREFIX}/${AWSTATS}/tools
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${AWSTATS}
 	@${ECHO_CMD} ""
 	@${ECHO_CMD} "* Rename ${PREFIX}/www/awstats/cgi-bin/awstats.model.conf to awstats.site.conf to setup awstats"
 	@${ECHO_CMD} "* Documentation has been installed in ${PREFIX}/share/doc/awstats"