- Stage support

PR:		190435

2 files changed, 6 insertions, 11 deletions

diff --git a/www/sit/Makefile b/www/sit/Makefile
index 6ed5bd29b3d0..7fa1593fe22a 100644
--- a/www/sit/Makefile
+++ b/www/sit/Makefile
@@ -25,7 +25,6 @@ OPTIONS_DEFAULT=	IMAP MBSTRING
 IMAP_DESC=	Email Support
 MBSTRING_DESC=	Inbound email feature
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIMAP}
@@ -41,17 +40,11 @@ USE_PHP+=	ldap
 .endif
 
 do-install:
-	${MKDIR} ${WWWDIR}
+	${MKDIR} ${STAGEDIR}${WWWDIR}
 	cd ${WRKSRC}; ${FIND} . \
-		| ${CPIO} -pdm -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
-	${CHMOD} -R ${BINMODE} ${WWWDIR}
-	${FIND} ${WWWDIR} ! -type d | ${XARGS} ${CHMOD} ${NOBINMODE}
-
+		| ${CPIO} -pdm -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
+	${CHMOD} -R ${BINMODE} ${STAGEDIR}${WWWDIR}
+	${FIND} ${STAGEDIR}${WWWDIR} ! -type d | ${XARGS} ${CHMOD} ${NOBINMODE}
 	@${CAT} ${PKGMESSAGE}
 
-post-install:
-	@if [ -f ${WWWDIR}/config.inc.php ]; then \
-		${CP} -p ${WWWDIR}/config.inc.php ${WWWDIR}/config.inc.php.bak ; \
-	fi
-
 .include <bsd.port.mk>
diff --git a/www/sit/pkg-plist b/www/sit/pkg-plist
index 78b45a725b71..139a55a1ccae 100644
--- a/www/sit/pkg-plist
+++ b/www/sit/pkg-plist
@@ -34,7 +34,9 @@
 %%WWWDIR%%/calendar/week_planner.js.php
 %%WWWDIR%%/calendar/year.inc.php
 %%WWWDIR%%/chart.php
+@unexec if cmp -s %D/%%WWWDIR%%/config.inc.php %D/%%WWWDIR%%/config.inc-dist.php; then rm -f %D/%%WWWDIR%%/config.inc.php; fi
 %%WWWDIR%%/config.inc-dist.php
+@exec cp -n %D/%F %B/config.inc.php
 %%WWWDIR%%/config.php
 %%WWWDIR%%/contact_add.php
 %%WWWDIR%%/contact_delete.php