From 70d9ec57d9e4fce7bf7ce6229e8f18c111fa7067 Mon Sep 17 00:00:00 2001
From: Alex Dupre <ale@FreeBSD.org>
Date: Thu, 7 Nov 2013 15:31:39 +0000
Subject: [PATCH] Update to 1.9.4 release and stagify.

---
 mail/nocc/Makefile | 25 +++++++++----------------
 mail/nocc/distinfo |  4 ++--
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/mail/nocc/Makefile b/mail/nocc/Makefile
index 3353f5ac7400..5428253331f5 100644
--- a/mail/nocc/Makefile
+++ b/mail/nocc/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nocc
-PORTVERSION=	1.9.3
-PORTREVISION=	1
+PORTVERSION=	1.9.4
 CATEGORIES=	mail www
 MASTER_SITES=	SF/${PORTNAME}/NOCC/${PORTVERSION}
 
@@ -17,7 +16,6 @@ WANT_PHP_WEB=	yes
 
 SUB_FILES=	pkg-message
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
 
 NOCCCOMP=	.htaccess favicon.ico robots.txt \
 		action.php common.php contacts.php contacts_manager.php \
@@ -27,26 +25,21 @@ NOCCCOMP=	.htaccess favicon.ico robots.txt \
 
 PORTDOCS=	*
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 do-install:
-	@${MKDIR} ${WWWDIR}
+	@${MKDIR} ${STAGEDIR}${WWWDIR}
 .for i in ${NOCCCOMP}
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${WWWDIR}
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${WWWDIR}
 .endfor
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
+	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@group ${WWWGRP}" >> ${TMPPLIST}
 	@(cd ${WRKSRC}; ${FIND} ${NOCCCOMP} -not -type d) | ${SORT} | \
 		${SED} -ne 's,^,${WWWDIR_REL}/,p' >> ${TMPPLIST}
 	@(cd ${WRKSRC}; ${FIND} ${NOCCCOMP} -type d) | ${SORT} -r | \
 		${SED} -ne 's,^,@dirrm ${WWWDIR_REL}/,p' >> ${TMPPLIST}
 	@${ECHO_CMD} '@dirrm ${WWWDIR_REL}' >> ${TMPPLIST}
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD} "@owner" >> ${TMPPLIST}
+	@${ECHO_CMD} "@group" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/mail/nocc/distinfo b/mail/nocc/distinfo
index de38e7435492..91b2ceedb628 100644
--- a/mail/nocc/distinfo
+++ b/mail/nocc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nocc-1.9.3.tar.gz) = d1d34ecd69824c4963bcbde84711a5c9962afb59e17964834358a47f15f8c5aa
-SIZE (nocc-1.9.3.tar.gz) = 1054964
+SHA256 (nocc-1.9.4.tar.gz) = c4b297a524d5b2b852540b561ed819cddfcde2a94bcf140607c1b2f4789281e1
+SIZE (nocc-1.9.4.tar.gz) = 1063328