Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 5 Jun 2014 01:50:14 +0000 (UTC)
From:      Martin Wilke <miwi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r356573 - head/www/sit
Message-ID:  <201406050150.s551oESB045110@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: miwi
Date: Thu Jun  5 01:50:14 2014
New Revision: 356573
URL: http://svnweb.freebsd.org/changeset/ports/356573
QAT: https://qat.redports.org/buildarchive/r356573/

Log:
  - Stage support
  
  PR:		190435

Modified:
  head/www/sit/Makefile
  head/www/sit/pkg-plist

Modified: head/www/sit/Makefile
==============================================================================
--- head/www/sit/Makefile	Thu Jun  5 01:48:18 2014	(r356572)
+++ head/www/sit/Makefile	Thu Jun  5 01:50:14 2014	(r356573)
@@ -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>

Modified: head/www/sit/pkg-plist
==============================================================================
--- head/www/sit/pkg-plist	Thu Jun  5 01:48:18 2014	(r356572)
+++ head/www/sit/pkg-plist	Thu Jun  5 01:50:14 2014	(r356573)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406050150.s551oESB045110>