From b51b7eee975a9a839c5c155edb2503b0e8a87942 Mon Sep 17 00:00:00 2001
From: antoine <antoine@FreeBSD.org>
Date: Wed, 24 Sep 2014 18:41:36 +0000
Subject: - Allow staging as a regular user - Bump portrevision as a directory
 didn't have intended owner

---
 security/mailzu/Makefile  |  6 ++----
 security/mailzu/pkg-plist | 33 +--------------------------------
 2 files changed, 3 insertions(+), 36 deletions(-)

(limited to 'security')

diff --git a/security/mailzu/Makefile b/security/mailzu/Makefile
index d185bac19a1a..7726387d38a7 100644
--- a/security/mailzu/Makefile
+++ b/security/mailzu/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mailzu
 DISTVERSION=	0.8rc3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/MailZu%200.8RC3
 DISTNAME=	MailZu_${DISTVERSION:S/rc/RC/}
@@ -18,6 +18,7 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/amavisd:${PORTSDIR}/security/amavisd-new \
 		${PEARDIR}/Mail/mimeDecode.php:${PORTSDIR}/mail/pear-Mail_mimeDecode
 
 PEARDIR?=	${LOCALBASE}/share/pear
+PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 SUB_LIST+=	PKGNAME=${PKGNAME}
 SUB_FILES=	pkg-message
 NO_BUILD=	yes
@@ -43,13 +44,10 @@ PORTDOCS=	*
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
-	${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.php* ${WRKSRC}/*.js* ${WRKSRC}/*.css* ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "config contrib img lang lib templates" \
 		${STAGEDIR}${WWWDIR} "! -name *.orig")
 	(cd ${WRKSRC} && ${COPYTREE_BIN} scripts ${STAGEDIR}${WWWDIR})
-
-post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
diff --git a/security/mailzu/pkg-plist b/security/mailzu/pkg-plist
index 28916603dee0..f577e20e306f 100644
--- a/security/mailzu/pkg-plist
+++ b/security/mailzu/pkg-plist
@@ -171,35 +171,4 @@
 %%WWWDIR%%/templates/sendmail.template.php
 %%WWWDIR%%/templates/summary.template.php
 %%WWWDIR%%/templates/viewmail.template.php
-@dirrm %%WWWDIR%%/lib/pear/PEAR/Validator
-@dirrm %%WWWDIR%%/lib/pear/PEAR/Task/Windowseol
-@dirrm %%WWWDIR%%/lib/pear/PEAR/Task/Unixeol
-@dirrm %%WWWDIR%%/lib/pear/PEAR/Task/Replace
-@dirrm %%WWWDIR%%/lib/pear/PEAR/Task/Postinstallscript
-@dirrm %%WWWDIR%%/lib/pear/PEAR/Task
-@dirrm %%WWWDIR%%/lib/pear/PEAR/REST
-@dirrm %%WWWDIR%%/lib/pear/PEAR/PackageFile/v2
-@dirrm %%WWWDIR%%/lib/pear/PEAR/PackageFile/Parser
-@dirrm %%WWWDIR%%/lib/pear/PEAR/PackageFile/Generator
-@dirrm %%WWWDIR%%/lib/pear/PEAR/PackageFile
-@dirrm %%WWWDIR%%/lib/pear/PEAR/Installer/Role
-@dirrm %%WWWDIR%%/lib/pear/PEAR/Installer
-@dirrm %%WWWDIR%%/lib/pear/PEAR/Frontend
-@dirrm %%WWWDIR%%/lib/pear/PEAR/Downloader
-@dirrm %%WWWDIR%%/lib/pear/PEAR/Command
-@dirrm %%WWWDIR%%/lib/pear/PEAR/ChannelFile
-@dirrm %%WWWDIR%%/lib/pear/PEAR
-@dirrm %%WWWDIR%%/lib/pear/OS
-@dirrm %%WWWDIR%%/lib/pear/Net
-@dirrm %%WWWDIR%%/lib/pear/Mail
-@dirrm %%WWWDIR%%/lib/pear/DB
-@dirrm %%WWWDIR%%/lib/pear
-@dirrm %%WWWDIR%%/lib
-@dirrm %%WWWDIR%%/contrib/mysql
-@dirrm %%WWWDIR%%/contrib
-@dirrmtry %%WWWDIR%%/config
-@dirrm %%WWWDIR%%/img
-@dirrm %%WWWDIR%%/lang
-@dirrm %%WWWDIR%%/scripts
-@dirrm %%WWWDIR%%/templates
-@dirrmtry %%WWWDIR%%
+@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%
-- 
cgit