- add stage support

3 files changed, 26 insertions, 26 deletions

diff --git a/www/twiki/Makefile b/www/twiki/Makefile
index 50e3673a7341..e5863141ec4c 100644
--- a/www/twiki/Makefile
+++ b/www/twiki/Makefile
@@ -30,7 +30,6 @@ RUN_DEPENDS=	\
 USES=		perl5
 WRKSRC=	${WRKDIR}/twiki
 
-NO_STAGE=	yes
 post-extract:
 	@${RM} -rf ${WRKSRC}/lib/CPAN
 	@${CAT} ${.CURDIR}/../twiki-*/pkg-plist |\
@@ -41,10 +40,10 @@ post-extract:
 	@${FIND} ${WRKSRC} -type d -empty -delete
 
 post-patch:
-	@cd ${WRKSRC}/ &&\
-		${REINPLACE_CMD} -i "" -e "s|/home/httpd/twiki|${WWWDIR}|g" \
-		lib/TWiki.spec twiki_httpd_conf.txt
-	@${FIND} ${WRKSRC} -name \*.orig -delete
+	${SED} -i "" -e "s|/home/httpd/twiki|${WWWDIR}|g" \
+		${WRKSRC}/lib/TWiki.spec \
+		${WRKSRC}/twiki_httpd_conf.txt
+	${FIND} ${WRKSRC} -name \*.orig -delete
 
 .include "${.CURDIR}/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki/bsd.twiki.mk b/www/twiki/bsd.twiki.mk
index 533ec4d7b636..cddb7276526c 100644
--- a/www/twiki/bsd.twiki.mk
+++ b/www/twiki/bsd.twiki.mk
@@ -46,9 +46,10 @@ create-plist:	extract
 	@${ECHO_CMD} '@dirrmtry share/twiki' >> ${PLIST}
 
 do-install:
-	@${INSTALL} -d ${TWDIR}/
-	@cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${TWDIR}/
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	${MKDIR} ${STAGEDIR}${TWDIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${TWDIR})
+# not required with stage
+#	@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 make-twdep: extract
 	@echo "TWDEP=`grep -v ^# ${WRKSRC}/lib/TWiki/*/${PORTNAME}/DEPENDENCIES |\
diff --git a/www/twiki/pkg-plist b/www/twiki/pkg-plist
index 5553c34b9961..c134b26f870c 100644
--- a/www/twiki/pkg-plist
+++ b/www/twiki/pkg-plist
@@ -1006,6 +1006,8 @@
 %%TWDIR%%/lib/DEPENDENCIES
 %%TWDIR%%/lib/MANIFEST
 %%TWDIR%%/lib/Monitor.pm
+%%TWDIR%%/lib/TWiki.pm
+%%TWDIR%%/lib/TWiki.spec
 %%TWDIR%%/lib/TWiki/Access.pm
 %%TWDIR%%/lib/TWiki/AccessControlException.pm
 %%TWDIR%%/lib/TWiki/AggregateIterator.pm
@@ -1124,10 +1126,11 @@
 %%TWDIR%%/lib/TWiki/Contrib/JSCalendarContrib/Config.spec
 %%TWDIR%%/lib/TWiki/Contrib/TWikiNetSkin.pm
 %%TWDIR%%/lib/TWiki/Contrib/TopMenuSkin.pm
+%%TWDIR%%/lib/TWiki/Engine.pm
 %%TWDIR%%/lib/TWiki/Engine/CGI.pm
 %%TWDIR%%/lib/TWiki/Engine/CLI.pm
-%%TWDIR%%/lib/TWiki/Engine.pm
 %%TWDIR%%/lib/TWiki/EngineException.pm
+%%TWDIR%%/lib/TWiki/Form.pm
 %%TWDIR%%/lib/TWiki/Form/Checkbox.pm
 %%TWDIR%%/lib/TWiki/Form/Color.pm
 %%TWDIR%%/lib/TWiki/Form/FieldDefinition.pm
@@ -1137,11 +1140,10 @@
 %%TWDIR%%/lib/TWiki/Form/Select.pm
 %%TWDIR%%/lib/TWiki/Form/Text.pm
 %%TWDIR%%/lib/TWiki/Form/Textarea.pm
-%%TWDIR%%/lib/TWiki/Form.pm
 %%TWDIR%%/lib/TWiki/Func.pm
+%%TWDIR%%/lib/TWiki/I18N.pm
 %%TWDIR%%/lib/TWiki/I18N/Extract.pm
 %%TWDIR%%/lib/TWiki/I18N/Fallback.pm
-%%TWDIR%%/lib/TWiki/I18N.pm
 %%TWDIR%%/lib/TWiki/If/Node.pm
 %%TWDIR%%/lib/TWiki/If/OP_allows.pm
 %%TWDIR%%/lib/TWiki/If/OP_context.pm
@@ -1157,35 +1159,35 @@
 %%TWDIR%%/lib/TWiki/Infix/Parser.pm
 %%TWDIR%%/lib/TWiki/LineIterator.pm
 %%TWDIR%%/lib/TWiki/ListIterator.pm
+%%TWDIR%%/lib/TWiki/LoginManager.pm
 %%TWDIR%%/lib/TWiki/LoginManager/ApacheLogin.pm
 %%TWDIR%%/lib/TWiki/LoginManager/Session.pm
 %%TWDIR%%/lib/TWiki/LoginManager/TemplateLogin.pm
-%%TWDIR%%/lib/TWiki/LoginManager.pm
 %%TWDIR%%/lib/TWiki/Merge.pm
 %%TWDIR%%/lib/TWiki/Meta.pm
+%%TWDIR%%/lib/TWiki/Net.pm
 %%TWDIR%%/lib/TWiki/Net/HTTPResponse.pm
 %%TWDIR%%/lib/TWiki/Net/UserCredAgent.pm
-%%TWDIR%%/lib/TWiki/Net.pm
 %%TWDIR%%/lib/TWiki/OopsException.pm
 %%TWDIR%%/lib/TWiki/Plugin.pm
+%%TWDIR%%/lib/TWiki/Plugins.pm
+%%TWDIR%%/lib/TWiki/Plugins/BackupRestorePlugin.pm
 %%TWDIR%%/lib/TWiki/Plugins/BackupRestorePlugin/CaptureOutput.pm
 %%TWDIR%%/lib/TWiki/Plugins/BackupRestorePlugin/Config.spec
 %%TWDIR%%/lib/TWiki/Plugins/BackupRestorePlugin/Core.pm
 %%TWDIR%%/lib/TWiki/Plugins/BackupRestorePlugin/ProcDaemon.pm
-%%TWDIR%%/lib/TWiki/Plugins/BackupRestorePlugin.pm
 %%TWDIR%%/lib/TWiki/Plugins/ColorPickerPlugin.pm
-%%TWDIR%%/lib/TWiki/Plugins/HeadlinesPlugin/Core.pm
 %%TWDIR%%/lib/TWiki/Plugins/HeadlinesPlugin.pm
-%%TWDIR%%/lib/TWiki/Plugins/JQueryPlugin/Core.pm
+%%TWDIR%%/lib/TWiki/Plugins/HeadlinesPlugin/Core.pm
 %%TWDIR%%/lib/TWiki/Plugins/JQueryPlugin.pm
-%%TWDIR%%/lib/TWiki/Plugins/SetGetPlugin/Core.pm
+%%TWDIR%%/lib/TWiki/Plugins/JQueryPlugin/Core.pm
 %%TWDIR%%/lib/TWiki/Plugins/SetGetPlugin.pm
+%%TWDIR%%/lib/TWiki/Plugins/SetGetPlugin/Core.pm
 %%TWDIR%%/lib/TWiki/Plugins/TWikiNetSkinPlugin.pm
-%%TWDIR%%/lib/TWiki/Plugins.pm
 %%TWDIR%%/lib/TWiki/Plurals.pm
+%%TWDIR%%/lib/TWiki/Prefs.pm
 %%TWDIR%%/lib/TWiki/Prefs/Parser.pm
 %%TWDIR%%/lib/TWiki/Prefs/PrefsCache.pm
-%%TWDIR%%/lib/TWiki/Prefs.pm
 %%TWDIR%%/lib/TWiki/Query/BinaryOP.pm
 %%TWDIR%%/lib/TWiki/Query/HoistREs.pm
 %%TWDIR%%/lib/TWiki/Query/Node.pm
@@ -1210,20 +1212,21 @@
 %%TWDIR%%/lib/TWiki/Query/Parser.pm
 %%TWDIR%%/lib/TWiki/Query/UnaryOP.pm
 %%TWDIR%%/lib/TWiki/Render.pm
-%%TWDIR%%/lib/TWiki/Request/Upload.pm
 %%TWDIR%%/lib/TWiki/Request.pm
+%%TWDIR%%/lib/TWiki/Request/Upload.pm
 %%TWDIR%%/lib/TWiki/Response.pm
 %%TWDIR%%/lib/TWiki/Sandbox.pm
 %%TWDIR%%/lib/TWiki/Search.pm
+%%TWDIR%%/lib/TWiki/Store.pm
 %%TWDIR%%/lib/TWiki/Store/QueryAlgorithms/BruteForce.pm
 %%TWDIR%%/lib/TWiki/Store/RcsFile.pm
 %%TWDIR%%/lib/TWiki/Store/RcsLite.pm
 %%TWDIR%%/lib/TWiki/Store/RcsWrap.pm
 %%TWDIR%%/lib/TWiki/Store/SearchAlgorithms/Forking.pm
 %%TWDIR%%/lib/TWiki/Store/SearchAlgorithms/PurePerl.pm
-%%TWDIR%%/lib/TWiki/Store.pm
 %%TWDIR%%/lib/TWiki/Templates.pm
 %%TWDIR%%/lib/TWiki/Time.pm
+%%TWDIR%%/lib/TWiki/UI.pm
 %%TWDIR%%/lib/TWiki/UI/ChangeForm.pm
 %%TWDIR%%/lib/TWiki/UI/Changes.pm
 %%TWDIR%%/lib/TWiki/UI/Edit.pm
@@ -1238,15 +1241,12 @@
 %%TWDIR%%/lib/TWiki/UI/Statistics.pm
 %%TWDIR%%/lib/TWiki/UI/Upload.pm
 %%TWDIR%%/lib/TWiki/UI/View.pm
-%%TWDIR%%/lib/TWiki/UI.pm
 %%TWDIR%%/lib/TWiki/UserMapping.pm
+%%TWDIR%%/lib/TWiki/Users.pm
 %%TWDIR%%/lib/TWiki/Users/ApacheHtpasswdUser.pm
 %%TWDIR%%/lib/TWiki/Users/BaseUserMapping.pm
 %%TWDIR%%/lib/TWiki/Users/HtPasswdUser.pm
 %%TWDIR%%/lib/TWiki/Users/Password.pm
-%%TWDIR%%/lib/TWiki/Users.pm
-%%TWDIR%%/lib/TWiki.pm
-%%TWDIR%%/lib/TWiki.spec
 %%TWDIR%%/locale/TWiki.pot
 %%TWDIR%%/locale/bg.po
 %%TWDIR%%/locale/cs.po
@@ -1266,6 +1266,7 @@
 %%TWDIR%%/locale/uk.po
 %%TWDIR%%/locale/zh-cn.po
 %%TWDIR%%/locale/zh-tw.po
+%%TWDIR%%/pub-htaccess.txt
 %%TWDIR%%/pub/Main/TWikiGuest/twiki-guest.gif
 %%TWDIR%%/pub/Main/UserProfileHeader/default-user-profile.jpg
 %%TWDIR%%/pub/Main/UserProfileHeader/gradient-title.png
@@ -2250,7 +2251,6 @@
 %%TWDIR%%/pub/Trash/WebPreferences/logo.gif
 %%TWDIR%%/pub/_default/WebPreferences/favicon.ico
 %%TWDIR%%/pub/_default/WebPreferences/logo.gif
-%%TWDIR%%/pub-htaccess.txt
 %%TWDIR%%/readme.txt
 %%TWDIR%%/robots.txt
 %%TWDIR%%/root-htaccess.txt