- USE_APACHE=yes is deprecated

- Use WWWOWN and WWWGRP
- Use WWWDIR in Makefile and pkg-plist
- Fix pkg-plist, use @dirrmtry
- MKDIR => mkdir -p so need for -p

PR:             ports/134448
Approved by:    maintainer timeout (2 weeks)
Submitted by:   me

2 files changed, 25 insertions, 30 deletions

diff --git a/www/wget4web/Makefile b/www/wget4web/Makefile
index a5089a37818e..35bfbb1a9ae3 100644
--- a/www/wget4web/Makefile
+++ b/www/wget4web/Makefile
@@ -6,30 +6,25 @@
 
 PORTNAME=	wget4web
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www ftp
 MASTER_SITES=	http://irodov.nm.ru/wget4web/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	sam@brj.pp.ru
 COMMENT=	WWW interface for console wget
 
-USE_APACHE=	yes
 RUN_DEPENDS=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
 
+USE_APACHE=	1.3
+
 WRKSRC=		${WRKDIR}/${PORTNAME}
-# These are tunable
-WEBOWN?=	www
-WEBGRP?=	www
+NO_BUILD=	yes
+
 LOGSDIR?=	/var/log/wget4web
 TASKDIR?=	/var/spool/wget4web
 FILESDIR?=	/var/spool/wget4web/files
-APACHEDIR?=	${PREFIX}/www/data
-
-INSTALLDIR=	${APACHEDIR}/wget4web
-NO_BUILD=	yes
 
-PLIST_SUB=	INSTALLDIR=${INSTALLDIR:S,^${PREFIX}/,,} \
+PLIST_SUB=	INSTALLDIR=${WWWDIR} \
 		LOGSDIR=${LOGSDIR} TASKDIR=${TASKDIR} FILESDIR=${FILESDIR}
 
 post-patch:
@@ -39,10 +34,10 @@ post-patch:
 		${WRKSRC}/data/info.cgi
 
 do-install:
-	@${MKDIR} ${INSTALLDIR}; \
-	cd ${WRKSRC}; ${FIND} . -name "*.cgi" -o -name "*.lib" \
-		| ${CPIO} -pdm -R ${WEBOWN}:${WEBGRP} ${INSTALLDIR}; \
-	${MKDIR} -p ${LOGSDIR} ${TASKDIR} ${FILESDIR}; \
-	${CHOWN} ${WEBOWN}:${WEBGRP} ${LOGSDIR} ${TASKDIR} ${FILESDIR}
+	@${MKDIR} ${WWWDIR}/
+	@cd ${WRKSRC}; ${FIND} . -name "*.cgi" -o -name "*.lib" \
+		| ${CPIO} -pdm -R ${WEBOWN}:${WEBGRP} ${WWWDIR}/
+	${MKDIR} ${LOGSDIR}/ ${TASKDIR}/ ${FILESDIR}/
+	${CHOWN} ${WWWOWN}:${WWWGRP} ${LOGSDIR}/ ${TASKDIR}/ ${FILESDIR}/
 
 .include <bsd.port.mk>
diff --git a/www/wget4web/pkg-plist b/www/wget4web/pkg-plist
index 286d0692e68a..eeca8e1792b7 100644
--- a/www/wget4web/pkg-plist
+++ b/www/wget4web/pkg-plist
@@ -1,14 +1,14 @@
-%%INSTALLDIR%%/add.cgi
-%%INSTALLDIR%%/admin.lib
-%%INSTALLDIR%%/admincenter.cgi
-%%INSTALLDIR%%/admindel.cgi
-%%INSTALLDIR%%/adminfiles.cgi
-%%INSTALLDIR%%/data/info.cgi
-%%INSTALLDIR%%/data/users.cgi
-%%INSTALLDIR%%/progress.cgi
-%%INSTALLDIR%%/showlog.cgi
-@dirrm %%INSTALLDIR%%/data
-@dirrm %%INSTALLDIR%%
-@unexec rmdir %%LOGSDIR%% 2> /dev/null | true
-@unexec rmdir %%FILESDIR%% 2> /dev/null | true
-@unexec rmdir %%TASKDIR%% 2> /dev/null | true
+%%WWWDIR%%/add.cgi
+%%WWWDIR%%/admin.lib
+%%WWWDIR%%/admincenter.cgi
+%%WWWDIR%%/admindel.cgi
+%%WWWDIR%%/adminfiles.cgi
+%%WWWDIR%%/data/info.cgi
+%%WWWDIR%%/data/users.cgi
+%%WWWDIR%%/progress.cgi
+%%WWWDIR%%/showlog.cgi
+@dirrm %%WWWDIR%%/data
+@dirrm %%WWWDIR%%
+@dirrmtry %%LOGSDIR%%
+@dirrmtry %%FILESDIR%%
+@dirrmtry %%TASKDIR%%