STAGE support, general cleanups, use @sample where appropriate.

PORTREVISION bumps where plist or pkg-message changed.

2 files changed, 19 insertions, 33 deletions

diff --git a/deskutils/plans/Makefile b/deskutils/plans/Makefile
index 11e67b59a785..f2fb23231720 100644
--- a/deskutils/plans/Makefile
+++ b/deskutils/plans/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	plans
 PORTVERSION=	8.2.1
+PORTREVISION=	1
 CATEGORIES=	deskutils www
 MASTER_SITES=	http://www.planscalendar.com/release/:plans \
 		http://www.planscalendar.com/addons/:addons \
@@ -24,26 +25,29 @@ EXTRACT_ONLY=	${PORTNAME}_${DISTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	A Good Web Calendar
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	p5-CGI-Session>=0:${PORTSDIR}/www/p5-CGI-Session
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-LICENSE=	GPLv2
-
 NO_BUILD=	yes
 USES=		perl5 zip
 USE_PERL5=	run
 
+SHAREOWN=	${WWWOWN}
+SHAREGRP=	${WWWGRP}
+SHAREMODE=	644
+
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
 post-extract:
 	@${CP} ${_DISTDIR}/powerani.gif ${WRKSRC}/theme/graphics/freebsd.gif
 	@${CP} ${_DISTDIR}/*.pl ${WRKSRC}/
 	@${RM} -rf ${WRKSRC}/theme/us_english.pl
 	@for i in ${WRKSRC}/data/*xml ${WRKSRC}/*config.pl;\
-		do ${MV} $$i $$i.default; done
+		do ${MV} $$i $$i.sample; done
 	@${SED} -e 's/iso-8859-1/utf-8/' ${WRKSRC}/us_english.pl >\
 		${WRKSRC}/us_english_utf8.pl
 	@${TOUCH} ${WRKSRC}/theme/ical/.keep_me
@@ -52,14 +56,10 @@ post-patch:
 	@${RM} -f ${WRKSRC}/theme/plans.template.orig
 
 do-install:
-	@${INSTALL} -d ${WWWDIR}/
-	@${CP} -nR ${WRKSRC}/ ${WWWDIR}/
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}/
-	@${FIND} ${WWWDIR} -type f -exec ${CHMOD} 644 {} \;
-	@${FIND} ${WWWDIR} -name '*.cgi' -exec ${CHMOD} 755 {} \;
-	@${FIND} ${WWWDIR} -name '*.xml' -exec ${CHMOD} 664 {} \;
-	@for i in ${WWWDIR}/data/*default ${WWWDIR}/*default; do\
-		${CP} -np $$i $${i%.default} || ${TRUE} ; done
+	@${MKDIR} ${STAGEDIR}${WWWDIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
+	@${FIND} ${STAGEDIR}${WWWDIR} -name '*.cgi' -exec ${CHMOD} 755 {} \;
+	@${FIND} ${STAGEDIR}${WWWDIR} -name '*.xml.sample' -exec ${CHMOD} 664 {} \;
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/deskutils/plans/pkg-plist b/deskutils/plans/pkg-plist
index ec302dd6c58b..b64f52feced5 100644
--- a/deskutils/plans/pkg-plist
+++ b/deskutils/plans/pkg-plist
@@ -1,17 +1,3 @@
-@exec   if [ ! -f %D/%%WWWDIR%%/data/calendars.xml ] ; then cp -p %D/%F %B/calendars.xml; fi
-@exec   if [ ! -f %D/%%WWWDIR%%/data/email_reminders.xml ] ; then cp -p %D/%F %B/email_reminders.xml; fi
-@exec   if [ ! -f %D/%%WWWDIR%%/data/events.xml ] ; then cp -p %D/%F %B/events.xml; fi
-@exec   if [ ! -f %D/%%WWWDIR%%/data/new_calendars.xml ] ; then cp -p %D/%F %B/new_calendars.xml; fi
-@exec   if [ ! -f %D/%%WWWDIR%%/data/pending_actions.xml ] ; then cp -p %D/%F %B/pending_actions.xml; fi
-@exec   if [ ! -f %D/%%WWWDIR%%/data/users.xml ] ; then cp -p %D/%F %B/users.xml; fi
-@exec   if [ ! -f %D/%%WWWDIR%%/plans_config.pl ] ; then cp -p %D/%F %B/plans_config.pl; fi
-@unexec if cmp -s %D/%%WWWDIR%%/data/calendars.xml.default %D/%%WWWDIR%%/data/calendars.xml; then rm -f %D/%%WWWDIR%%/data/calendars.xml; fi
-@unexec if cmp -s %D/%%WWWDIR%%/data/email_reminders.xml.default %D/%%WWWDIR%%/data/email_reminders.xml; then rm -f %D/%%WWWDIR%%/data/email_reminders.xml; fi
-@unexec if cmp -s %D/%%WWWDIR%%/data/events.xml.default %D/%%WWWDIR%%/data/events.xml; then rm -f %D/%%WWWDIR%%/data/events.xml; fi
-@unexec if cmp -s %D/%%WWWDIR%%/data/new_calendars.xml.default %D/%%WWWDIR%%/data/new_calendars.xml; then rm -f %D/%%WWWDIR%%/data/new_calendars.xml; fi
-@unexec if cmp -s %D/%%WWWDIR%%/data/pending_actions.xml.default %D/%%WWWDIR%%/data/pending_actions.xml; then rm -f %D/%%WWWDIR%%/data/pending_actions.xml; fi
-@unexec if cmp -s %D/%%WWWDIR%%/data/users.xml.default %D/%%WWWDIR%%/data/users.xml; then rm -f %D/%%WWWDIR%%/data/users.xml; fi
-@unexec if cmp -s %D/%%WWWDIR%%/plans_config.pl.default %D/%%WWWDIR%%/plans_config.pl; then rm -f %D/%%WWWDIR%%/plans_config.pl; fi
 %%WWWDIR%%/Error.pm
 %%WWWDIR%%/JSON/PP.pm
 %%WWWDIR%%/JSON/PP/Boolean.pm
@@ -21,12 +7,12 @@
 %%WWWDIR%%/Time/Normalize.pm
 %%WWWDIR%%/cz_czech.pl
 %%WWWDIR%%/danish.pl
-%%WWWDIR%%/data/calendars.xml.default
-%%WWWDIR%%/data/email_reminders.xml.default
-%%WWWDIR%%/data/events.xml.default
-%%WWWDIR%%/data/new_calendars.xml.default
-%%WWWDIR%%/data/pending_actions.xml.default
-%%WWWDIR%%/data/users.xml.default
+@sample %%WWWDIR%%/data/calendars.xml.sample
+@sample %%WWWDIR%%/data/email_reminders.xml.sample
+@sample %%WWWDIR%%/data/events.xml.sample
+@sample %%WWWDIR%%/data/new_calendars.xml.sample
+@sample %%WWWDIR%%/data/pending_actions.xml.sample
+@sample %%WWWDIR%%/data/users.xml.sample
 %%WWWDIR%%/de_german.pl
 %%WWWDIR%%/email_reminders.cgi
 %%WWWDIR%%/fr_french.pl
@@ -36,7 +22,7 @@
 %%WWWDIR%%/nl_dutch.pl
 %%WWWDIR%%/plans.cgi
 %%WWWDIR%%/plans_check.cgi
-%%WWWDIR%%/plans_config.pl.default
+@sample %%WWWDIR%%/plans_config.pl.sample
 %%WWWDIR%%/plans_lib.pl
 %%WWWDIR%%/plans_unit_test.pl
 %%WWWDIR%%/sp_spanish.pl