- add stage support

67 files changed, 66 insertions, 98 deletions

diff --git a/www/twiki-BehaviourContrib/Makefile b/www/twiki-BehaviourContrib/Makefile
index f6d6efc20695..5422ec6d1ab8 100644
--- a/www/twiki-BehaviourContrib/Makefile
+++ b/www/twiki-BehaviourContrib/Makefile
@@ -5,6 +5,5 @@ SVNREV=		16417
 
 COMMENT=	JavaScript event library
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-BehaviourContrib/pkg-plist b/www/twiki-BehaviourContrib/pkg-plist
index 08aaace3f9f3..9f844241c3ce 100644
--- a/www/twiki-BehaviourContrib/pkg-plist
+++ b/www/twiki-BehaviourContrib/pkg-plist
@@ -1,8 +1,8 @@
 %%TWDIR%%/data/TWiki/BehaviourContrib.txt
+%%TWDIR%%/lib/TWiki/Contrib/BehaviourContrib.pm
 %%TWDIR%%/lib/TWiki/Contrib/BehaviourContrib/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Contrib/BehaviourContrib/MANIFEST
 %%TWDIR%%/lib/TWiki/Contrib/BehaviourContrib/build.pl
-%%TWDIR%%/lib/TWiki/Contrib/BehaviourContrib.pm
 %%TWDIR%%/pub/TWiki/BehaviourContrib/behaviour.compressed.js
 %%TWDIR%%/pub/TWiki/BehaviourContrib/behaviour.compressed_src.js
 %%TWDIR%%/pub/TWiki/BehaviourContrib/behaviour.js
diff --git a/www/twiki-BlogAddOn/Makefile b/www/twiki-BlogAddOn/Makefile
index 5265afe0119a..4de4e5940e29 100644
--- a/www/twiki-BlogAddOn/Makefile
+++ b/www/twiki-BlogAddOn/Makefile
@@ -5,6 +5,5 @@ SVNREV=		16623
 
 COMMENT=	Simple blogging application
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-BlogAddOn/pkg-plist b/www/twiki-BlogAddOn/pkg-plist
index a8ab0da35753..3ac8c97c9ea1 100644
--- a/www/twiki-BlogAddOn/pkg-plist
+++ b/www/twiki-BlogAddOn/pkg-plist
@@ -9,11 +9,11 @@
 %%TWDIR%%/data/_BlogAddOn/BlogPostForm.txt
 %%TWDIR%%/data/_BlogAddOn/BlogPostTemplate.txt
 %%TWDIR%%/data/_BlogAddOn/BlogPostViewTemplate.txt
+%%TWDIR%%/lib/TWiki/Contrib/BlogAddOn.pm
 %%TWDIR%%/lib/TWiki/Contrib/BlogAddOn/Config.spec
 %%TWDIR%%/lib/TWiki/Contrib/BlogAddOn/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Contrib/BlogAddOn/MANIFEST
 %%TWDIR%%/lib/TWiki/Contrib/BlogAddOn/build.pl
-%%TWDIR%%/lib/TWiki/Contrib/BlogAddOn.pm
 %%TWDIR%%/pub/TWiki/BlogAddOn/example.png
 %%TWDIR%%/pub/TWiki/BlogAddOn/screenshot_list.png
 %%TWDIR%%/pub/TWiki/BlogAddOn/screenshot_post.png
diff --git a/www/twiki-BugzillaLinkPlugin/Makefile b/www/twiki-BugzillaLinkPlugin/Makefile
index 2034cf3c4728..ffe8a85697cd 100644
--- a/www/twiki-BugzillaLinkPlugin/Makefile
+++ b/www/twiki-BugzillaLinkPlugin/Makefile
@@ -8,6 +8,5 @@ MASTER_SITES=	http://protey.ru/freebsd/distfiles/ \
 
 COMMENT=	Link to Bugzilla bugs using shorthand references
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-BugzillaLinkPlugin/pkg-plist b/www/twiki-BugzillaLinkPlugin/pkg-plist
index 1a1bdb486d0e..f93efd3510f7 100644
--- a/www/twiki-BugzillaLinkPlugin/pkg-plist
+++ b/www/twiki-BugzillaLinkPlugin/pkg-plist
@@ -1,8 +1,8 @@
 %%TWDIR%%/data/TWiki/BugzillaLinkPlugin.txt
+%%TWDIR%%/lib/TWiki/Plugins/BugzillaLinkPlugin.pm
 %%TWDIR%%/lib/TWiki/Plugins/BugzillaLinkPlugin/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Plugins/BugzillaLinkPlugin/MANIFEST
 %%TWDIR%%/lib/TWiki/Plugins/BugzillaLinkPlugin/build.pl
-%%TWDIR%%/lib/TWiki/Plugins/BugzillaLinkPlugin.pm
 %%TWDIR%%/pub/TWiki/BugzillaLinkPlugin/bug.gif
 %%TWDIR%%/pub/TWiki/BugzillaLinkPlugin/bug_small.gif
 %%TWDIR%%/pub/TWiki/BugzillaLinkPlugin/bug_small.png
diff --git a/www/twiki-ClassicSkin/Makefile b/www/twiki-ClassicSkin/Makefile
index 2e73b32f7b61..22fcb2fdae0f 100644
--- a/www/twiki-ClassicSkin/Makefile
+++ b/www/twiki-ClassicSkin/Makefile
@@ -5,6 +5,5 @@ SVNREV=		17365
 
 COMMENT=	The Classic TWiki skin
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-ClassicSkin/pkg-plist b/www/twiki-ClassicSkin/pkg-plist
index a89caef8db43..356171b6a79f 100644
--- a/www/twiki-ClassicSkin/pkg-plist
+++ b/www/twiki-ClassicSkin/pkg-plist
@@ -1,9 +1,9 @@
 %%TWDIR%%/data/Main/ClassicSkinUserViewTemplate.txt
 %%TWDIR%%/data/TWiki/ClassicSkin.txt
+%%TWDIR%%/lib/TWiki/Contrib/ClassicSkin.pm
 %%TWDIR%%/lib/TWiki/Contrib/ClassicSkin/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Contrib/ClassicSkin/MANIFEST
 %%TWDIR%%/lib/TWiki/Contrib/ClassicSkin/build.pl
-%%TWDIR%%/lib/TWiki/Contrib/ClassicSkin.pm
 %%TWDIR%%/pub/TWiki/ClassicSkin/fullscreen.gif
 %%TWDIR%%/pub/TWiki/ClassicSkin/screenshot.gif
 %%TWDIR%%/templates/addform.classic.tmpl
diff --git a/www/twiki-CommentPlugin/Makefile b/www/twiki-CommentPlugin/Makefile
index 861fa3a612db..867f631a2576 100644
--- a/www/twiki-CommentPlugin/Makefile
+++ b/www/twiki-CommentPlugin/Makefile
@@ -5,6 +5,5 @@ SVNREV=		17567
 
 COMMENT=	Post comments easily
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-CommentPlugin/pkg-plist b/www/twiki-CommentPlugin/pkg-plist
index e82e61860cc9..f1bc3a4b3b44 100644
--- a/www/twiki-CommentPlugin/pkg-plist
+++ b/www/twiki-CommentPlugin/pkg-plist
@@ -4,12 +4,12 @@
 %%TWDIR%%/data/TWiki/CommentPluginExamples.txt
 %%TWDIR%%/data/TWiki/CommentPluginTemplate.txt
 %%TWDIR%%/data/TWiki/VarCOMMENT.txt
+%%TWDIR%%/lib/TWiki/Plugins/CommentPlugin.pm
 %%TWDIR%%/lib/TWiki/Plugins/CommentPlugin/Comment.pm
 %%TWDIR%%/lib/TWiki/Plugins/CommentPlugin/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Plugins/CommentPlugin/MANIFEST
 %%TWDIR%%/lib/TWiki/Plugins/CommentPlugin/PREINSTALL
 %%TWDIR%%/lib/TWiki/Plugins/CommentPlugin/build.pl
-%%TWDIR%%/lib/TWiki/Plugins/CommentPlugin.pm
 %%TWDIR%%/pub/TWiki/CommentPlugin/wikiringlogo20x20.png
 %%TWDIR%%/templates/comments.tmpl
 %%TWDIR%%/test/unit/CommentPlugin/CommentPluginSuite.pm
diff --git a/www/twiki-EditTablePlugin/Makefile b/www/twiki-EditTablePlugin/Makefile
index 5d38a21eb2bd..35e906762734 100644
--- a/www/twiki-EditTablePlugin/Makefile
+++ b/www/twiki-EditTablePlugin/Makefile
@@ -5,6 +5,5 @@ SVNREV=		17542
 
 COMMENT=	Edit tables in-place
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-EditTablePlugin/pkg-plist b/www/twiki-EditTablePlugin/pkg-plist
index 9770af0b1086..21b26074081f 100644
--- a/www/twiki-EditTablePlugin/pkg-plist
+++ b/www/twiki-EditTablePlugin/pkg-plist
@@ -1,10 +1,10 @@
 %%TWDIR%%/data/TWiki/EditTablePlugin.txt
 %%TWDIR%%/data/TWiki/VarEDITTABLE.txt
+%%TWDIR%%/lib/TWiki/Plugins/EditTablePlugin.pm
 %%TWDIR%%/lib/TWiki/Plugins/EditTablePlugin/Core.pm
 %%TWDIR%%/lib/TWiki/Plugins/EditTablePlugin/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Plugins/EditTablePlugin/MANIFEST
 %%TWDIR%%/lib/TWiki/Plugins/EditTablePlugin/build.pl
-%%TWDIR%%/lib/TWiki/Plugins/EditTablePlugin.pm
 %%TWDIR%%/pub/TWiki/EditTablePlugin/EditTablePluginCalendarExample.gif
 %%TWDIR%%/pub/TWiki/EditTablePlugin/ScreenshotEditCell1.gif
 %%TWDIR%%/pub/TWiki/EditTablePlugin/ScreenshotEditCell2.gif
diff --git a/www/twiki-EmptyPlugin/Makefile b/www/twiki-EmptyPlugin/Makefile
index d8381b1d9bd6..aa7d5caccb92 100644
--- a/www/twiki-EmptyPlugin/Makefile
+++ b/www/twiki-EmptyPlugin/Makefile
@@ -5,6 +5,5 @@ SVNREV=		16417
 
 COMMENT=	Empty plugin template
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-EmptyPlugin/pkg-plist b/www/twiki-EmptyPlugin/pkg-plist
index 5e429a689c27..59bb1cfe5142 100644
--- a/www/twiki-EmptyPlugin/pkg-plist
+++ b/www/twiki-EmptyPlugin/pkg-plist
@@ -1,9 +1,9 @@
 %%TWDIR%%/data/Sandbox/PluginTestEmptyPlugin.txt
 %%TWDIR%%/data/TWiki/EmptyPlugin.txt
+%%TWDIR%%/lib/TWiki/Plugins/EmptyPlugin.pm
 %%TWDIR%%/lib/TWiki/Plugins/EmptyPlugin/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Plugins/EmptyPlugin/MANIFEST
 %%TWDIR%%/lib/TWiki/Plugins/EmptyPlugin/build.pl
-%%TWDIR%%/lib/TWiki/Plugins/EmptyPlugin.pm
 %%TWDIR%%/test/unit/EmptyPlugin/EmptyPluginSuite.pm
 %%TWDIR%%/test/unit/EmptyPlugin/EmptyPluginTests.pm
 @dirrm %%TWDIR%%/data/Sandbox
diff --git a/www/twiki-GluePlugin/Makefile b/www/twiki-GluePlugin/Makefile
index 06942acdb85c..1af1095b17df 100644
--- a/www/twiki-GluePlugin/Makefile
+++ b/www/twiki-GluePlugin/Makefile
@@ -8,6 +8,5 @@ MASTER_SITES=	http://protey.ru/freebsd/distfiles/ \
 
 COMMENT=	Allow to format tags and arguments on multiple lines
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-GluePlugin/pkg-plist b/www/twiki-GluePlugin/pkg-plist
index 971bf3918aa3..d36ea6fc330c 100644
--- a/www/twiki-GluePlugin/pkg-plist
+++ b/www/twiki-GluePlugin/pkg-plist
@@ -1,8 +1,8 @@
 %%TWDIR%%/data/TWiki/GluePlugin.txt
+%%TWDIR%%/lib/TWiki/Plugins/GluePlugin.pm
 %%TWDIR%%/lib/TWiki/Plugins/GluePlugin/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Plugins/GluePlugin/MANIFEST
 %%TWDIR%%/lib/TWiki/Plugins/GluePlugin/build.pl
-%%TWDIR%%/lib/TWiki/Plugins/GluePlugin.pm
 %%TWDIR%%/pub/TWiki/GluePlugin/wikiringlogo40x40.png
 @dirrm %%TWDIR%%/data/TWiki
 @dirrm %%TWDIR%%/data
diff --git a/www/twiki-InterwikiPlugin/Makefile b/www/twiki-InterwikiPlugin/Makefile
index 0a8f33546d8a..3c9f46335e0a 100644
--- a/www/twiki-InterwikiPlugin/Makefile
+++ b/www/twiki-InterwikiPlugin/Makefile
@@ -5,6 +5,5 @@ SVNREV=		17303
 
 COMMENT=	Wikilink to external sites
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-InterwikiPlugin/pkg-plist b/www/twiki-InterwikiPlugin/pkg-plist
index 83823e1941a9..907df4896dc3 100644
--- a/www/twiki-InterwikiPlugin/pkg-plist
+++ b/www/twiki-InterwikiPlugin/pkg-plist
@@ -1,9 +1,9 @@
 %%TWDIR%%/data/TWiki/InterWikis.txt
 %%TWDIR%%/data/TWiki/InterwikiPlugin.txt
+%%TWDIR%%/lib/TWiki/Plugins/InterwikiPlugin.pm
 %%TWDIR%%/lib/TWiki/Plugins/InterwikiPlugin/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Plugins/InterwikiPlugin/MANIFEST
 %%TWDIR%%/lib/TWiki/Plugins/InterwikiPlugin/build.pl
-%%TWDIR%%/lib/TWiki/Plugins/InterwikiPlugin.pm
 @dirrm %%TWDIR%%/data/TWiki
 @dirrm %%TWDIR%%/data
 @dirrm %%TWDIR%%/lib/TWiki/Plugins/InterwikiPlugin
diff --git a/www/twiki-JSCalendarContrib/Makefile b/www/twiki-JSCalendarContrib/Makefile
index 2d9b336e0f44..0bd89c558930 100644
--- a/www/twiki-JSCalendarContrib/Makefile
+++ b/www/twiki-JSCalendarContrib/Makefile
@@ -5,6 +5,5 @@ SVNREV=		17493
 
 COMMENT=	Mishoo JSCalendar repackaged
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-JSCalendarContrib/pkg-plist b/www/twiki-JSCalendarContrib/pkg-plist
index 9c6a05a3bfb7..f790ffd6fdc9 100644
--- a/www/twiki-JSCalendarContrib/pkg-plist
+++ b/www/twiki-JSCalendarContrib/pkg-plist
@@ -1,9 +1,9 @@
 %%TWDIR%%/data/TWiki/JSCalendarContrib.txt
 %%TWDIR%%/data/TWiki/JSCalendarContribInline.txt
+%%TWDIR%%/lib/TWiki/Contrib/JSCalendarContrib.pm
 %%TWDIR%%/lib/TWiki/Contrib/JSCalendarContrib/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Contrib/JSCalendarContrib/MANIFEST
 %%TWDIR%%/lib/TWiki/Contrib/JSCalendarContrib/build.pl
-%%TWDIR%%/lib/TWiki/Contrib/JSCalendarContrib.pm
 %%TWDIR%%/lib/TWiki/Form/Date.pm
 %%TWDIR%%/pub/TWiki/JSCalendarContrib/ChangeLog
 %%TWDIR%%/pub/TWiki/JSCalendarContrib/README
diff --git a/www/twiki-LDAPPasswordChangerPlugin/Makefile b/www/twiki-LDAPPasswordChangerPlugin/Makefile
index fde1b771b5f3..4ed22862a307 100644
--- a/www/twiki-LDAPPasswordChangerPlugin/Makefile
+++ b/www/twiki-LDAPPasswordChangerPlugin/Makefile
@@ -13,6 +13,5 @@ RUN_DEPENDS=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
 
 SVNREV=		18108
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-LDAPPasswordChangerPlugin/pkg-plist b/www/twiki-LDAPPasswordChangerPlugin/pkg-plist
index 314bd1f626fa..bec5413651ae 100644
--- a/www/twiki-LDAPPasswordChangerPlugin/pkg-plist
+++ b/www/twiki-LDAPPasswordChangerPlugin/pkg-plist
@@ -1,9 +1,9 @@
 %%TWDIR%%/data/Sandbox/LDAPPasswordChangerPlugin.txt
 %%TWDIR%%/data/TWiki/LDAPPasswordChangerPlugin.txt
+%%TWDIR%%/lib/TWiki/Plugins/LDAPPasswordChangerPlugin.pm
 %%TWDIR%%/lib/TWiki/Plugins/LDAPPasswordChangerPlugin/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Plugins/LDAPPasswordChangerPlugin/MANIFEST
 %%TWDIR%%/lib/TWiki/Plugins/LDAPPasswordChangerPlugin/build.pl
-%%TWDIR%%/lib/TWiki/Plugins/LDAPPasswordChangerPlugin.pm
 @dirrm %%TWDIR%%/data/Sandbox
 @dirrm %%TWDIR%%/data/TWiki
 @dirrm %%TWDIR%%/data
diff --git a/www/twiki-LdapContrib/Makefile b/www/twiki-LdapContrib/Makefile
index d8d850a603df..3aa3f2c63828 100644
--- a/www/twiki-LdapContrib/Makefile
+++ b/www/twiki-LdapContrib/Makefile
@@ -11,6 +11,5 @@ COMMENT=	LDAP services for TWiki
 
 RUN_DEPENDS=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-LdapContrib/pkg-plist b/www/twiki-LdapContrib/pkg-plist
index 4bdbfb88a1d3..53169e5d95b9 100644
--- a/www/twiki-LdapContrib/pkg-plist
+++ b/www/twiki-LdapContrib/pkg-plist
@@ -1,10 +1,10 @@
 %%TWDIR%%/data/TWiki/LdapContrib.txt
 %%TWDIR%%/lib/TWiki/Client/LdapApacheLogin.pm
+%%TWDIR%%/lib/TWiki/Contrib/LdapContrib.pm
 %%TWDIR%%/lib/TWiki/Contrib/LdapContrib/Config.spec
 %%TWDIR%%/lib/TWiki/Contrib/LdapContrib/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Contrib/LdapContrib/MANIFEST
 %%TWDIR%%/lib/TWiki/Contrib/LdapContrib/build.pl
-%%TWDIR%%/lib/TWiki/Contrib/LdapContrib.pm
 %%TWDIR%%/lib/TWiki/LoginManager/LdapApacheLogin.pm
 %%TWDIR%%/lib/TWiki/Users/LdapUser.pm
 %%TWDIR%%/lib/TWiki/Users/LdapUserMapping.pm
diff --git a/www/twiki-LdapNgPlugin/Makefile b/www/twiki-LdapNgPlugin/Makefile
index 1b8b998aec51..a2d4288d4d56 100644
--- a/www/twiki-LdapNgPlugin/Makefile
+++ b/www/twiki-LdapNgPlugin/Makefile
@@ -10,6 +10,5 @@ COMMENT=	Query and display data from an LDAP directory
 
 TWDEP=		LdapContrib>=0
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-LdapNgPlugin/pkg-plist b/www/twiki-LdapNgPlugin/pkg-plist
index b81674857ce2..b9a2214913c9 100644
--- a/www/twiki-LdapNgPlugin/pkg-plist
+++ b/www/twiki-LdapNgPlugin/pkg-plist
@@ -1,9 +1,9 @@
 %%TWDIR%%/data/TWiki/LdapNgPlugin.txt
+%%TWDIR%%/lib/TWiki/Plugins/LdapNgPlugin.pm
 %%TWDIR%%/lib/TWiki/Plugins/LdapNgPlugin/Core.pm
 %%TWDIR%%/lib/TWiki/Plugins/LdapNgPlugin/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Plugins/LdapNgPlugin/MANIFEST
 %%TWDIR%%/lib/TWiki/Plugins/LdapNgPlugin/build.pl
-%%TWDIR%%/lib/TWiki/Plugins/LdapNgPlugin.pm
 @dirrm %%TWDIR%%/data/TWiki
 @dirrm %%TWDIR%%/data
 @dirrm %%TWDIR%%/lib/TWiki/Plugins/LdapNgPlugin
diff --git a/www/twiki-MailerContrib/Makefile b/www/twiki-MailerContrib/Makefile
index 89756227ea7c..39789586539a 100644
--- a/www/twiki-MailerContrib/Makefile
+++ b/www/twiki-MailerContrib/Makefile
@@ -7,6 +7,5 @@ COMMENT=	E-mail notification of changes
 
 RUN_DEPENDS=	p5-URI>=1.35:${PORTSDIR}/net/p5-URI
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-MailerContrib/pkg-plist b/www/twiki-MailerContrib/pkg-plist
index 03dcfcd16e66..baa7bff1f95e 100644
--- a/www/twiki-MailerContrib/pkg-plist
+++ b/www/twiki-MailerContrib/pkg-plist
@@ -1,4 +1,5 @@
 %%TWDIR%%/data/TWiki/MailerContrib.txt
+%%TWDIR%%/lib/TWiki/Contrib/MailerContrib.pm
 %%TWDIR%%/lib/TWiki/Contrib/MailerContrib/Change.pm
 %%TWDIR%%/lib/TWiki/Contrib/MailerContrib/CompatibilityHacks.pm
 %%TWDIR%%/lib/TWiki/Contrib/MailerContrib/Config.spec
@@ -11,7 +12,6 @@
 %%TWDIR%%/lib/TWiki/Contrib/MailerContrib/UpData.pm
 %%TWDIR%%/lib/TWiki/Contrib/MailerContrib/WebNotify.pm
 %%TWDIR%%/lib/TWiki/Contrib/MailerContrib/build.pl
-%%TWDIR%%/lib/TWiki/Contrib/MailerContrib.pm
 %%TWDIR%%/pub/TWiki/MailerContrib/logo.gif
 %%TWDIR%%/pub/TWiki/MailerContrib/wikiringlogo20x20.png
 %%TWDIR%%/templates/mailnotify.tmpl
diff --git a/www/twiki-MathModePlugin/Makefile b/www/twiki-MathModePlugin/Makefile
index 0ac677fc8469..041bfa8415ac 100644
--- a/www/twiki-MathModePlugin/Makefile
+++ b/www/twiki-MathModePlugin/Makefile
@@ -12,7 +12,6 @@ RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 
 USE_TEX=	base latex
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -i '' -e 's!=/usr/bin!=${LOCALBASE}/bin!g; s!=/bin!=/usr/bin!g;' \
 		${WRKSRC}/pub/TWiki/MathModePlugin/latex2img
diff --git a/www/twiki-MathModePlugin/pkg-plist b/www/twiki-MathModePlugin/pkg-plist
index 3cb0eddcb34f..d72477773b15 100644
--- a/www/twiki-MathModePlugin/pkg-plist
+++ b/www/twiki-MathModePlugin/pkg-plist
@@ -1,9 +1,9 @@
 %%TWDIR%%/data/TWiki/MathModePlugin.txt
+%%TWDIR%%/lib/TWiki/Plugins/MathModePlugin.pm
 %%TWDIR%%/lib/TWiki/Plugins/MathModePlugin/Core.pm
 %%TWDIR%%/lib/TWiki/Plugins/MathModePlugin/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Plugins/MathModePlugin/MANIFEST
 %%TWDIR%%/lib/TWiki/Plugins/MathModePlugin/build.pl
-%%TWDIR%%/lib/TWiki/Plugins/MathModePlugin.pm
 %%TWDIR%%/pub/TWiki/MathModePlugin/latex2img
 %%TWDIR%%/pub/TWiki/MathModePlugin/wikiringlogo40x40.png
 @dirrm %%TWDIR%%/data/TWiki
diff --git a/www/twiki-NewUserPlugin/Makefile b/www/twiki-NewUserPlugin/Makefile
index 5ca3fc85770a..91402ad1dd57 100644
--- a/www/twiki-NewUserPlugin/Makefile
+++ b/www/twiki-NewUserPlugin/Makefile
@@ -8,6 +8,5 @@ MASTER_SITES=	http://protey.ru/freebsd/distfiles/ \
 
 COMMENT=	Create user's topic for externally authenticated users
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-NewUserPlugin/pkg-plist b/www/twiki-NewUserPlugin/pkg-plist
index 411f2ea82946..37c9065e5239 100644
--- a/www/twiki-NewUserPlugin/pkg-plist
+++ b/www/twiki-NewUserPlugin/pkg-plist
@@ -1,18 +1,18 @@
 %%TWDIR%%/NewUserPlugin/data/TWiki/NewLdapUserTemplate.txt
 %%TWDIR%%/NewUserPlugin/data/TWiki/NewUserPlugin.txt
 %%TWDIR%%/NewUserPlugin/data/TWiki/RenderLdapUser.txt
+%%TWDIR%%/NewUserPlugin/lib/TWiki/Plugins/NewUserPlugin.pm
 %%TWDIR%%/NewUserPlugin/lib/TWiki/Plugins/NewUserPlugin/DEPENDENCIES
 %%TWDIR%%/NewUserPlugin/lib/TWiki/Plugins/NewUserPlugin/MANIFEST
 %%TWDIR%%/NewUserPlugin/lib/TWiki/Plugins/NewUserPlugin/build.pl
-%%TWDIR%%/NewUserPlugin/lib/TWiki/Plugins/NewUserPlugin.pm
 %%TWDIR%%/NewUserPlugin/pub/TWiki/NewUserPlugin/wikiringlogo40x40.png
 %%TWDIR%%/data/TWiki/NewLdapUserTemplate.txt
 %%TWDIR%%/data/TWiki/NewUserPlugin.txt
 %%TWDIR%%/data/TWiki/RenderLdapUser.txt
+%%TWDIR%%/lib/TWiki/Plugins/NewUserPlugin.pm
 %%TWDIR%%/lib/TWiki/Plugins/NewUserPlugin/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Plugins/NewUserPlugin/MANIFEST
 %%TWDIR%%/lib/TWiki/Plugins/NewUserPlugin/build.pl
-%%TWDIR%%/lib/TWiki/Plugins/NewUserPlugin.pm
 %%TWDIR%%/pub/TWiki/NewUserPlugin/wikiringlogo40x40.png
 @dirrm %%TWDIR%%/NewUserPlugin/data/TWiki
 @dirrm %%TWDIR%%/NewUserPlugin/data
diff --git a/www/twiki-PatternSkin/Makefile b/www/twiki-PatternSkin/Makefile
index 2c9585034476..2c6290757a60 100644
--- a/www/twiki-PatternSkin/Makefile
+++ b/www/twiki-PatternSkin/Makefile
@@ -3,10 +3,9 @@
 PORTNAME=	PatternSkin
 SVNREV=		17425
 
-COMMENT=	A CSS-based skin
+COMMENT=	CSS-based skin
 
 TWDEP=		TwistyPlugin>=0 TablePlugin>=0
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-PatternSkin/pkg-plist b/www/twiki-PatternSkin/pkg-plist
index 184b01b680ff..ef4811a49069 100644
--- a/www/twiki-PatternSkin/pkg-plist
+++ b/www/twiki-PatternSkin/pkg-plist
@@ -27,10 +27,10 @@
 %%TWDIR%%/data/TWiki/WebTopBar.txt
 %%TWDIR%%/data/Trash/WebLeftBar.txt
 %%TWDIR%%/data/_default/WebLeftBar.txt
+%%TWDIR%%/lib/TWiki/Contrib/PatternSkin.pm
 %%TWDIR%%/lib/TWiki/Contrib/PatternSkin/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Contrib/PatternSkin/MANIFEST
 %%TWDIR%%/lib/TWiki/Contrib/PatternSkin/build.pl
-%%TWDIR%%/lib/TWiki/Contrib/PatternSkin.pm
 %%TWDIR%%/pub/TWiki/PatternSkin/TWiki_header.gif
 %%TWDIR%%/pub/TWiki/PatternSkin/background_action.gif
 %%TWDIR%%/pub/TWiki/PatternSkin/background_alert.gif
diff --git a/www/twiki-PreferencesPlugin/Makefile b/www/twiki-PreferencesPlugin/Makefile
index f4079420c257..edb7a5867799 100644
--- a/www/twiki-PreferencesPlugin/Makefile
+++ b/www/twiki-PreferencesPlugin/Makefile
@@ -5,6 +5,5 @@ SVNREV=		17568
 
 COMMENT=	Edit preferences in-place
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-PreferencesPlugin/pkg-plist b/www/twiki-PreferencesPlugin/pkg-plist
index 90d24efbbf1e..cb43853797fb 100644
--- a/www/twiki-PreferencesPlugin/pkg-plist
+++ b/www/twiki-PreferencesPlugin/pkg-plist
@@ -1,9 +1,9 @@
 %%TWDIR%%/data/TWiki/PreferencesPlugin.txt
 %%TWDIR%%/data/TWiki/TWikiPreferencesForm.txt
+%%TWDIR%%/lib/TWiki/Plugins/PreferencesPlugin.pm
 %%TWDIR%%/lib/TWiki/Plugins/PreferencesPlugin/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Plugins/PreferencesPlugin/MANIFEST
 %%TWDIR%%/lib/TWiki/Plugins/PreferencesPlugin/build.pl
-%%TWDIR%%/lib/TWiki/Plugins/PreferencesPlugin.pm
 %%TWDIR%%/test/unit/PreferencesPlugin/PreferencesPluginSuite.pm
 %%TWDIR%%/test/unit/PreferencesPlugin/PreferencesPluginTests.pm
 @dirrm %%TWDIR%%/data/TWiki
diff --git a/www/twiki-RenderListPlugin/Makefile b/www/twiki-RenderListPlugin/Makefile
index 60913dd1e04a..6de9d399df7e 100644
--- a/www/twiki-RenderListPlugin/Makefile
+++ b/www/twiki-RenderListPlugin/Makefile
@@ -5,6 +5,5 @@ SVNREV=		16417
 
 COMMENT=	Render bullet lists in a variety of formats
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-RenderListPlugin/pkg-plist b/www/twiki-RenderListPlugin/pkg-plist
index 6a71de86abc0..eadb5119c525 100644
--- a/www/twiki-RenderListPlugin/pkg-plist
+++ b/www/twiki-RenderListPlugin/pkg-plist
@@ -1,10 +1,10 @@
 %%TWDIR%%/data/TWiki/RenderListPlugin.txt
 %%TWDIR%%/data/TWiki/RenderListPlugin.txt,v
 %%TWDIR%%/data/TWiki/VarRENDERLIST.txt
+%%TWDIR%%/lib/TWiki/Plugins/RenderListPlugin.pm
 %%TWDIR%%/lib/TWiki/Plugins/RenderListPlugin/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Plugins/RenderListPlugin/MANIFEST
 %%TWDIR%%/lib/TWiki/Plugins/RenderListPlugin/build.pl
-%%TWDIR%%/lib/TWiki/Plugins/RenderListPlugin.pm
 %%TWDIR%%/pub/TWiki/RenderListPlugin/doc.gif
 %%TWDIR%%/pub/TWiki/RenderListPlugin/dot_ud.gif
 %%TWDIR%%/pub/TWiki/RenderListPlugin/dot_udr.gif
diff --git a/www/twiki-SlideShowPlugin/Makefile b/www/twiki-SlideShowPlugin/Makefile
index 1c7ec49f339d..fc5717bf5fe7 100644
--- a/www/twiki-SlideShowPlugin/Makefile
+++ b/www/twiki-SlideShowPlugin/Makefile
@@ -5,6 +5,5 @@ SVNREV=		17261
 
 COMMENT=	Convert a topic with headings into a slideshow
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-SlideShowPlugin/pkg-plist b/www/twiki-SlideShowPlugin/pkg-plist
index 8b6936d29738..97e2e7b11cb6 100644
--- a/www/twiki-SlideShowPlugin/pkg-plist
+++ b/www/twiki-SlideShowPlugin/pkg-plist
@@ -1,11 +1,11 @@
 %%TWDIR%%/data/TWiki/SlideShowPlugin.txt
 %%TWDIR%%/data/TWiki/VarSLIDESHOWEND.txt
 %%TWDIR%%/data/TWiki/VarSLIDESHOWSTART.txt
+%%TWDIR%%/lib/TWiki/Plugins/SlideShowPlugin.pm
 %%TWDIR%%/lib/TWiki/Plugins/SlideShowPlugin/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Plugins/SlideShowPlugin/MANIFEST
 %%TWDIR%%/lib/TWiki/Plugins/SlideShowPlugin/SlideShow.pm
 %%TWDIR%%/lib/TWiki/Plugins/SlideShowPlugin/build.pl
-%%TWDIR%%/lib/TWiki/Plugins/SlideShowPlugin.pm
 %%TWDIR%%/pub/TWiki/SlideShowPlugin/clearpixel.gif
 %%TWDIR%%/pub/TWiki/SlideShowPlugin/endpres.gif
 %%TWDIR%%/pub/TWiki/SlideShowPlugin/first.gif
diff --git a/www/twiki-SmiliesPlugin/Makefile b/www/twiki-SmiliesPlugin/Makefile
index a84ec3dbaa84..7883b33964b3 100644
--- a/www/twiki-SmiliesPlugin/Makefile
+++ b/www/twiki-SmiliesPlugin/Makefile
@@ -5,6 +5,5 @@ SVNREV=		16417
 
 COMMENT=	Converts smilies into icons automatically
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-SmiliesPlugin/pkg-plist b/www/twiki-SmiliesPlugin/pkg-plist
index 05cecc991c92..86ebd2f1acf1 100644
--- a/www/twiki-SmiliesPlugin/pkg-plist
+++ b/www/twiki-SmiliesPlugin/pkg-plist
@@ -1,8 +1,8 @@
 %%TWDIR%%/data/TWiki/SmiliesPlugin.txt
+%%TWDIR%%/lib/TWiki/Plugins/SmiliesPlugin.pm
 %%TWDIR%%/lib/TWiki/Plugins/SmiliesPlugin/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Plugins/SmiliesPlugin/MANIFEST
 %%TWDIR%%/lib/TWiki/Plugins/SmiliesPlugin/build.pl
-%%TWDIR%%/lib/TWiki/Plugins/SmiliesPlugin.pm
 %%TWDIR%%/pub/TWiki/SmiliesPlugin/biggrin.gif
 %%TWDIR%%/pub/TWiki/SmiliesPlugin/biggrin.gif,v
 %%TWDIR%%/pub/TWiki/SmiliesPlugin/confused.gif
diff --git a/www/twiki-SpreadSheetPlugin/Makefile b/www/twiki-SpreadSheetPlugin/Makefile
index aed5bbe8c9b2..f8bd84216fff 100644
--- a/www/twiki-SpreadSheetPlugin/Makefile
+++ b/www/twiki-SpreadSheetPlugin/Makefile
@@ -5,6 +5,5 @@ SVNREV=		16417
 
 COMMENT=	Spreadsheet capabilities in topics
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-SpreadSheetPlugin/pkg-plist b/www/twiki-SpreadSheetPlugin/pkg-plist
index 2610dabf021e..b76c559a2168 100644
--- a/www/twiki-SpreadSheetPlugin/pkg-plist
+++ b/www/twiki-SpreadSheetPlugin/pkg-plist
@@ -1,10 +1,10 @@
 %%TWDIR%%/data/TWiki/SpreadSheetPlugin.txt
 %%TWDIR%%/data/TWiki/VarCALC.txt
+%%TWDIR%%/lib/TWiki/Plugins/SpreadSheetPlugin.pm
 %%TWDIR%%/lib/TWiki/Plugins/SpreadSheetPlugin/Calc.pm
 %%TWDIR%%/lib/TWiki/Plugins/SpreadSheetPlugin/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Plugins/SpreadSheetPlugin/MANIFEST
 %%TWDIR%%/lib/TWiki/Plugins/SpreadSheetPlugin/build.pl
-%%TWDIR%%/lib/TWiki/Plugins/SpreadSheetPlugin.pm
 @dirrm %%TWDIR%%/data/TWiki
 @dirrm %%TWDIR%%/data
 @dirrm %%TWDIR%%/lib/TWiki/Plugins/SpreadSheetPlugin
diff --git a/www/twiki-SubscribePlugin/Makefile b/www/twiki-SubscribePlugin/Makefile
index 189db596793b..780332052db4 100644
--- a/www/twiki-SubscribePlugin/Makefile
+++ b/www/twiki-SubscribePlugin/Makefile
@@ -7,6 +7,5 @@ COMMENT=	Add an easy subscription link to topics
 
 TWDEP=	MailerContrib>=17628
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-SubscribePlugin/pkg-plist b/www/twiki-SubscribePlugin/pkg-plist
index ebb5c733d73e..18688b056632 100644
--- a/www/twiki-SubscribePlugin/pkg-plist
+++ b/www/twiki-SubscribePlugin/pkg-plist
@@ -1,9 +1,9 @@
 %%TWDIR%%/data/TWiki/SubscribePlugin.txt
 %%TWDIR%%/data/TWiki/VarSUBSCRIBE.txt
+%%TWDIR%%/lib/TWiki/Plugins/SubscribePlugin.pm
 %%TWDIR%%/lib/TWiki/Plugins/SubscribePlugin/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Plugins/SubscribePlugin/MANIFEST
 %%TWDIR%%/lib/TWiki/Plugins/SubscribePlugin/build.pl
-%%TWDIR%%/lib/TWiki/Plugins/SubscribePlugin.pm
 %%TWDIR%%/pub/TWiki/SubscribePlugin/logo.gif
 %%TWDIR%%/pub/TWiki/SubscribePlugin/wikiringlogo20x20.png
 @dirrm %%TWDIR%%/data/TWiki
diff --git a/www/twiki-TWikiUserMappingContrib/Makefile b/www/twiki-TWikiUserMappingContrib/Makefile
index 4a5a3bb83ddf..852d484bc4c4 100644
--- a/www/twiki-TWikiUserMappingContrib/Makefile
+++ b/www/twiki-TWikiUserMappingContrib/Makefile
@@ -5,6 +5,5 @@ SVNREV=		17569
 
 COMMENT=	Traditional topic-based user mapping and management
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-TWikiUserMappingContrib/pkg-plist b/www/twiki-TWikiUserMappingContrib/pkg-plist
index fa58aafd44dc..94464423ceca 100644
--- a/www/twiki-TWikiUserMappingContrib/pkg-plist
+++ b/www/twiki-TWikiUserMappingContrib/pkg-plist
@@ -22,10 +22,10 @@
 %%TWDIR%%/data/TWiki/TWikiUsersTemplate.txt
 %%TWDIR%%/data/TWiki/UserForm.txt
 %%TWDIR%%/data/TWiki/UserToolsCategory.txt
+%%TWDIR%%/lib/TWiki/Contrib/TWikiUserMappingContrib.pm
 %%TWDIR%%/lib/TWiki/Contrib/TWikiUserMappingContrib/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Contrib/TWikiUserMappingContrib/MANIFEST
 %%TWDIR%%/lib/TWiki/Contrib/TWikiUserMappingContrib/build.pl
-%%TWDIR%%/lib/TWiki/Contrib/TWikiUserMappingContrib.pm
 %%TWDIR%%/lib/TWiki/Users/TWikiUserMapping.pm
 %%TWDIR%%/pub/TWiki/RegistrationApprovals/.keep_me
 %%TWDIR%%/test/unit/TWikiUserMappingContrib/TWikiUserMappingContribSuite.pm
diff --git a/www/twiki-TablePlugin/Makefile b/www/twiki-TablePlugin/Makefile
index 6d3e38dfd725..7225e1a44790 100644
--- a/www/twiki-TablePlugin/Makefile
+++ b/www/twiki-TablePlugin/Makefile
@@ -5,6 +5,5 @@ SVNREV=		17558
 
 COMMENT=	Extra control of table display
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-TablePlugin/pkg-plist b/www/twiki-TablePlugin/pkg-plist
index d96f42b5d479..59b946f64405 100644
--- a/www/twiki-TablePlugin/pkg-plist
+++ b/www/twiki-TablePlugin/pkg-plist
@@ -1,10 +1,10 @@
 %%TWDIR%%/data/TWiki/TablePlugin.txt
 %%TWDIR%%/data/TWiki/VarTABLE.txt
+%%TWDIR%%/lib/TWiki/Plugins/TablePlugin.pm
 %%TWDIR%%/lib/TWiki/Plugins/TablePlugin/Core.pm
 %%TWDIR%%/lib/TWiki/Plugins/TablePlugin/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Plugins/TablePlugin/MANIFEST
 %%TWDIR%%/lib/TWiki/Plugins/TablePlugin/build.pl
-%%TWDIR%%/lib/TWiki/Plugins/TablePlugin.pm
 %%TWDIR%%/pub/TWiki/TablePlugin/.keep_me
 %%TWDIR%%/test/unit/TablePlugin/TablePluginSuite.pm
 %%TWDIR%%/test/unit/TablePlugin/TablePluginTests.pm
diff --git a/www/twiki-TagMePlugin/Makefile b/www/twiki-TagMePlugin/Makefile
index cca473e188d2..0ae1eb127376 100644
--- a/www/twiki-TagMePlugin/Makefile
+++ b/www/twiki-TagMePlugin/Makefile
@@ -5,6 +5,5 @@ SVNREV=		17472
 
 COMMENT=	Collaborative content tagging
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-TagMePlugin/pkg-plist b/www/twiki-TagMePlugin/pkg-plist
index cf2ea55680a9..66d30134cd32 100644
--- a/www/twiki-TagMePlugin/pkg-plist
+++ b/www/twiki-TagMePlugin/pkg-plist
@@ -8,10 +8,10 @@
 %%TWDIR%%/data/TWiki/TagMeSearch.txt
 %%TWDIR%%/data/TWiki/TagMeViewAllTags.txt
 %%TWDIR%%/data/TWiki/TagMeViewMyTags.txt
+%%TWDIR%%/lib/TWiki/Plugins/TagMePlugin.pm
 %%TWDIR%%/lib/TWiki/Plugins/TagMePlugin/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Plugins/TagMePlugin/MANIFEST
 %%TWDIR%%/lib/TWiki/Plugins/TagMePlugin/build.pl
-%%TWDIR%%/lib/TWiki/Plugins/TagMePlugin.pm
 %%TWDIR%%/pub/TWiki/TagMePlugin/alltagcloud.gif
 %%TWDIR%%/pub/TWiki/TagMePlugin/buttons_gradient.psd
 %%TWDIR%%/pub/TWiki/TagMePlugin/tag_add.gif
@@ -24,8 +24,8 @@
 %%TWDIR%%/pub/_work_areas_doc_example_TagMePlugin.zip
 %%TWDIR%%/templates/view.tagme.tmpl
 %%TWDIR%%/templates/view.tagme04x01.tmpl
-%%TWDIR%%/templates/view.tagme_styleblogbutton.tmpl
 %%TWDIR%%/templates/view.tagme_styleblog.tmpl
+%%TWDIR%%/templates/view.tagme_styleblogbutton.tmpl
 @dirrm %%TWDIR%%/data/TWiki
 @dirrm %%TWDIR%%/data
 @dirrm %%TWDIR%%/lib/TWiki/Plugins/TagMePlugin
diff --git a/www/twiki-TinyMCEPlugin/Makefile b/www/twiki-TinyMCEPlugin/Makefile
index 754ee84ade67..5d91a543786d 100644
--- a/www/twiki-TinyMCEPlugin/Makefile
+++ b/www/twiki-TinyMCEPlugin/Makefile
@@ -7,6 +7,5 @@ COMMENT=	TinyMCE WYSIWYG editor integration
 
 TWDEP=		BehaviourContrib>=15357 WysiwygPlugin>=16650
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-TinyMCEPlugin/pkg-plist b/www/twiki-TinyMCEPlugin/pkg-plist
index 91c10bafb724..70879bb7d25b 100644
--- a/www/twiki-TinyMCEPlugin/pkg-plist
+++ b/www/twiki-TinyMCEPlugin/pkg-plist
@@ -1,10 +1,11 @@
 %%TWDIR%%/data/TWiki/TinyMCEPlugin.txt
 %%TWDIR%%/data/TWiki/TinyMCEQuickHelp.txt
+%%TWDIR%%/lib/TWiki/Plugins/TinyMCEPlugin.pm
 %%TWDIR%%/lib/TWiki/Plugins/TinyMCEPlugin/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Plugins/TinyMCEPlugin/MANIFEST
 %%TWDIR%%/lib/TWiki/Plugins/TinyMCEPlugin/build.pl
-%%TWDIR%%/lib/TWiki/Plugins/TinyMCEPlugin.pm
 %%TWDIR%%/pub/TWiki/TinyMCEPlugin/screenshot.gif
+%%TWDIR%%/pub/TWiki/TinyMCEPlugin/tinymce.gif
 %%TWDIR%%/pub/TWiki/TinyMCEPlugin/tinymce/changelog
 %%TWDIR%%/pub/TWiki/TinyMCEPlugin/tinymce/docs/index.html
 %%TWDIR%%/pub/TWiki/TinyMCEPlugin/tinymce/examples/example_advanced.css
@@ -477,7 +478,6 @@
 %%TWDIR%%/pub/TWiki/TinyMCEPlugin/tinymce/jscripts/tiny_mce/utils/mctabs.js
 %%TWDIR%%/pub/TWiki/TinyMCEPlugin/tinymce/jscripts/tiny_mce/utils/validate.js
 %%TWDIR%%/pub/TWiki/TinyMCEPlugin/tinymce/readme
-%%TWDIR%%/pub/TWiki/TinyMCEPlugin/tinymce.gif
 %%TWDIR%%/pub/TWiki/TinyMCEPlugin/twiki.js
 %%TWDIR%%/pub/TWiki/TinyMCEPlugin/twiki_src.js
 %%TWDIR%%/pub/TWiki/TinyMCEPlugin/twiki_tiny.js
diff --git a/www/twiki-TipsContrib/Makefile b/www/twiki-TipsContrib/Makefile
index 1d101c0c4ced..83c833c808f1 100644
--- a/www/twiki-TipsContrib/Makefile
+++ b/www/twiki-TipsContrib/Makefile
@@ -7,6 +7,5 @@ COMMENT=	Tip-of-the-day rotating display
 
 TWDEP=	SpreadSheetPlugin>=0
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-TipsContrib/pkg-plist b/www/twiki-TipsContrib/pkg-plist
index 666f5e0fb298..16c0c4109f0a 100644
--- a/www/twiki-TipsContrib/pkg-plist
+++ b/www/twiki-TipsContrib/pkg-plist
@@ -34,10 +34,10 @@
 %%TWDIR%%/data/TWiki/TWikiTipsOfTheDayInclude.txt
 %%TWDIR%%/data/TWiki/TWikiTipsOfTheDayTemplate.txt
 %%TWDIR%%/data/TWiki/TipsContrib.txt
+%%TWDIR%%/lib/TWiki/Contrib/TipsContrib.pm
 %%TWDIR%%/lib/TWiki/Contrib/TipsContrib/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Contrib/TipsContrib/MANIFEST
 %%TWDIR%%/lib/TWiki/Contrib/TipsContrib/build.pl
-%%TWDIR%%/lib/TWiki/Contrib/TipsContrib.pm
 @dirrm %%TWDIR%%/data/TWiki
 @dirrm %%TWDIR%%/data
 @dirrm %%TWDIR%%/lib/TWiki/Contrib/TipsContrib
diff --git a/www/twiki-TopicVarsPlugin/Makefile b/www/twiki-TopicVarsPlugin/Makefile
index 9118cc8deee8..404ca32d32b3 100644
--- a/www/twiki-TopicVarsPlugin/Makefile
+++ b/www/twiki-TopicVarsPlugin/Makefile
@@ -7,6 +7,5 @@ PORTEPOCH=	1
 
 COMMENT=	Create externally usable variables in any topic
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-TopicVarsPlugin/pkg-plist b/www/twiki-TopicVarsPlugin/pkg-plist
index afa67a20f78f..94466616977f 100644
--- a/www/twiki-TopicVarsPlugin/pkg-plist
+++ b/www/twiki-TopicVarsPlugin/pkg-plist
@@ -1,8 +1,8 @@
 %%TWDIR%%/data/TWiki/TopicVarsPlugin.txt
+%%TWDIR%%/lib/TWiki/Plugins/TopicVarsPlugin.pm
 %%TWDIR%%/lib/TWiki/Plugins/TopicVarsPlugin/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Plugins/TopicVarsPlugin/MANIFEST
 %%TWDIR%%/lib/TWiki/Plugins/TopicVarsPlugin/build.pl
-%%TWDIR%%/lib/TWiki/Plugins/TopicVarsPlugin.pm
 @dirrm %%TWDIR%%/data/TWiki
 @dirrm %%TWDIR%%/data
 @dirrm %%TWDIR%%/lib/TWiki/Plugins/TopicVarsPlugin
diff --git a/www/twiki-TwistyContrib/Makefile b/www/twiki-TwistyContrib/Makefile
index bb38274d3432..e328276af55f 100644
--- a/www/twiki-TwistyContrib/Makefile
+++ b/www/twiki-TwistyContrib/Makefile
@@ -7,6 +7,5 @@ COMMENT=	JS library and CSS for Twisty sections
 
 TWDEP=	BehaviourContrib>=0
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-TwistyContrib/pkg-plist b/www/twiki-TwistyContrib/pkg-plist
index 7d2d2f6f35f9..aa0b253a7c3d 100644
--- a/www/twiki-TwistyContrib/pkg-plist
+++ b/www/twiki-TwistyContrib/pkg-plist
@@ -1,8 +1,8 @@
 %%TWDIR%%/data/TWiki/TwistyContrib.txt
+%%TWDIR%%/lib/TWiki/Contrib/TwistyContrib.pm
 %%TWDIR%%/lib/TWiki/Contrib/TwistyContrib/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Contrib/TwistyContrib/MANIFEST
 %%TWDIR%%/lib/TWiki/Contrib/TwistyContrib/build.pl
-%%TWDIR%%/lib/TWiki/Contrib/TwistyContrib.pm
 %%TWDIR%%/pub/TWiki/TwistyContrib/twist.compressed.js
 %%TWDIR%%/pub/TWiki/TwistyContrib/twist.compressed_src.js
 %%TWDIR%%/pub/TWiki/TwistyContrib/twist.css
diff --git a/www/twiki-TwistyPlugin/Makefile b/www/twiki-TwistyPlugin/Makefile
index bfdf53d0af96..2f008d61e961 100644
--- a/www/twiki-TwistyPlugin/Makefile
+++ b/www/twiki-TwistyPlugin/Makefile
@@ -7,6 +7,5 @@ COMMENT=	Show and hide content in JS-based sections
 
 TWDEP=	TwistyContrib>=0 BehaviourContrib>=0
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-TwistyPlugin/pkg-plist b/www/twiki-TwistyPlugin/pkg-plist
index be2f031c2efd..db37a589d220 100644
--- a/www/twiki-TwistyPlugin/pkg-plist
+++ b/www/twiki-TwistyPlugin/pkg-plist
@@ -1,16 +1,16 @@
 %%TWDIR%%/data/TWiki/TwistyPlugin.txt
+%%TWDIR%%/lib/TWiki/Plugins/TwistyPlugin.pm
 %%TWDIR%%/lib/TWiki/Plugins/TwistyPlugin/DEPENDENCIES
 %%TWDIR%%/lib/TWiki/Plugins/TwistyPlugin/MANIFEST
 %%TWDIR%%/lib/TWiki/Plugins/TwistyPlugin/build.pl
-%%TWDIR%%/lib/TWiki/Plugins/TwistyPlugin.pm
-%%TWDIR%%/pub/TWiki/TwistyPlugin/twistie.jquery.js
 %%TWDIR%%/pub/TWiki/TwistyPlugin/twistie.dojo.js
 %%TWDIR%%/pub/TWiki/TwistyPlugin/twistie.jquery.css
-%%TWDIR%%/templates/twistyplugin.jquery.tmpl
+%%TWDIR%%/pub/TWiki/TwistyPlugin/twistie.jquery.js
 %%TWDIR%%/templates/twistyplugin.dojo.tmpl
+%%TWDIR%%/templates/twistyplugin.jquery.tmpl
 %%TWDIR%%/templates/twistyplugin.tmpl
-%%TWDIR%%/test/unit/TwistyPlugin/TwistyPluginTests.pm
 %%TWDIR%%/test/unit/TwistyPlugin/TwistyPluginSuite.pm
+%%TWDIR%%/test/unit/TwistyPlugin/TwistyPluginTests.pm
 @dirrm %%TWDIR%%/data/TWiki
 @dirrm %%TWDIR%%/data
 @dirrm %%TWDIR%%/lib/TWiki/Plugins/TwistyPlugin
diff --git a/www/twiki-WysiwygPlugin/Makefile b/www/twiki-WysiwygPlugin/Makefile
index f581cc50fe85..64799b5fcd9c 100644
--- a/www/twiki-WysiwygPlugin/Makefile
+++ b/www/twiki-WysiwygPlugin/Makefile
@@ -8,6 +8,5 @@ COMMENT=	Translator framework for Wysiwyg editors
 
 RUN_DEPENDS=	p5-HTML-Parser>=3.28:${PORTSDIR}/www/p5-HTML-Parser
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../twiki/bsd.twiki.mk"
 .include <bsd.port.mk>
diff --git a/www/twiki-WysiwygPlugin/pkg-plist b/www/twiki-WysiwygPlugin/pkg-plist
index 1f5dcb59db49..8bc508c89e4b 100644
--- a/www/twiki-WysiwygPlugin/pkg-plist
+++ b/www/twiki-WysiwygPlugin/pkg-plist
@@ -2,17 +2,17 @@
 %%TWDIR%%/data/TWiki/WysiwygPlugin.txt
 %%TWDIR%%/data/TWiki/WysiwygPluginSettings.txt
 %%TWDIR%%/data/TWiki/WysiwygPluginTopicLister.txt
+%%TWDIR%%/lib/TWiki/Plugins/WysiwygPlugin.pm
 %%TWDIR%%/lib/TWiki/Plugins/WysiwygPlugin/Constants.pm
 %%TWDIR%%/lib/TWiki/Plugins/WysiwygPlugin/DEPENDENCIES
+%%TWDIR%%/lib/TWiki/Plugins/WysiwygPlugin/HTML2TML.pm
 %%TWDIR%%/lib/TWiki/Plugins/WysiwygPlugin/HTML2TML/Base.pm
 %%TWDIR%%/lib/TWiki/Plugins/WysiwygPlugin/HTML2TML/Leaf.pm
 %%TWDIR%%/lib/TWiki/Plugins/WysiwygPlugin/HTML2TML/Node.pm
 %%TWDIR%%/lib/TWiki/Plugins/WysiwygPlugin/HTML2TML/WC.pm
-%%TWDIR%%/lib/TWiki/Plugins/WysiwygPlugin/HTML2TML.pm
 %%TWDIR%%/lib/TWiki/Plugins/WysiwygPlugin/MANIFEST
 %%TWDIR%%/lib/TWiki/Plugins/WysiwygPlugin/TML2HTML.pm
 %%TWDIR%%/lib/TWiki/Plugins/WysiwygPlugin/build.pl
-%%TWDIR%%/lib/TWiki/Plugins/WysiwygPlugin.pm
 %%TWDIR%%/pub/TWiki/WysiwygPlugin/wikiringlogo20x20.png
 %%TWDIR%%/test/unit/WysiwygPlugin/TranslatorTests.pm
 %%TWDIR%%/test/unit/WysiwygPlugin/WysiwygPluginSuite.pm
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