Stage. Add DATADIR to plist, so PORTREVISION bump.

3 files changed, 18 insertions, 26 deletions

diff --git a/mail/ovs/Makefile b/mail/ovs/Makefile
index 4a1c94a3b00c..28562e795226 100644
--- a/mail/ovs/Makefile
+++ b/mail/ovs/Makefile
@@ -3,14 +3,15 @@
 
 PORTNAME=	ovs
 PORTVERSION=	1.05
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.oav.net/openvisp/stats/ \
 		http://mirror.amdmi3.ru/distfiles/
 
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	RRDtool frontend for mail statistics
 
-RUN_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool	\
+RUN_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool \
 		p5-File-Tail>=0:${PORTSDIR}/devel/p5-File-Tail
 
 NO_BUILD=	yes
@@ -24,14 +25,11 @@ OVS_GROUP?=	${WWWGRP}
 
 USE_RC_SUBR=	${PORTNAME}
 SUB_LIST+=	OVS_USER=${OVS_USER} OVS_GROUP=${OVS_GROUP}
-PLIST_SUB=	CGIDIR=${CGIDIR:S,${PREFIX}/,,} WWWROOT=${WWWROOT:S,${PREFIX}/,,}
+PLIST_SUB=	CGIDIR=${CGIDIR:S,${PREFIX}/,,} WWWROOT=${WWWROOT:S,${PREFIX}/,,} \
+		OVS_USER=${OVS_USER} OVS_GROUP=${OVS_GROUP}
 
-DOCS=		README CHANGES COPYING CHANGES.old README.old
-.if !defined(NOPORTDOCS)
-PORTDOCS=	${DOCS}
-.endif
+PORTDOCS=	README CHANGES COPYING CHANGES.old README.old
 
-NO_STAGE=	yes
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "You may set following options:"
@@ -46,23 +44,15 @@ post-patch:
 	@${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/ovs.cgi
 
 do-install:
-	@${MKDIR} ${CGIDIR}
-	@${MKDIR} ${WWWROOT}/ovs
-	@${MKDIR} ${DATADIR}
-	@${CHOWN} -R ${OVS_USER}:${OVS_GROUP} ${DATADIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/ovs.pl ${PREFIX}/sbin
-	@${INSTALL_SCRIPT} ${WRKSRC}/ovs.cgi ${CGIDIR}
-	@${INSTALL_SCRIPT} ${WRKSRC}/ovs.css ${WWWROOT}/ovs
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	for f in ${DOCS}; do \
-	  ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \
+	@${MKDIR} ${STAGEDIR}${CGIDIR}
+	@${MKDIR} ${STAGEDIR}${WWWROOT}/ovs
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/ovs.pl ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/ovs.cgi ${STAGEDIR}${CGIDIR}
+	${INSTALL_DATA} ${WRKSRC}/ovs.css ${STAGEDIR}${WWWROOT}/ovs
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	for f in ${PORTDOCS}; do \
+	  ${INSTALL_DATA} ${WRKSRC}/$$f ${STAGEDIR}${DOCSDIR}; \
 	done
-.endif
-
-post-install:
-	@${ECHO_MSG} ""
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG} ""
 
 .include <bsd.port.mk>
diff --git a/mail/ovs/pkg-message b/mail/ovs/pkg-message
index 3a737753b899..296d26233808 100644
--- a/mail/ovs/pkg-message
+++ b/mail/ovs/pkg-message
@@ -8,4 +8,3 @@ Make sure this script should be invoked with privilege to read
 /var/log/maillog. For example, you may change the permission of
 maillog to be 644. Another way is to make maillog owned by
 the mail group, and put ovs_user in that group. 
-
diff --git a/mail/ovs/pkg-plist b/mail/ovs/pkg-plist
index 257cbd82e38a..ed0f5ab5f189 100644
--- a/mail/ovs/pkg-plist
+++ b/mail/ovs/pkg-plist
@@ -4,3 +4,6 @@ sbin/ovs.pl
 @dirrmtry www/cgi-bin
 @dirrmtry www/data/ovs
 @dirrmtry www/data
+@owner %%OVS_USER%%
+@group %%OVS_GROUP%%
+@dirrmtry %%DATADIR%%