diff --git a/www/amphetadesk/Makefile b/www/amphetadesk/Makefile
index 2d6dc421222e..eb2a16187606 100644
--- a/www/amphetadesk/Makefile
+++ b/www/amphetadesk/Makefile
@@ -25,7 +25,8 @@ LICENSE_NAME=	The Clarified Artistic License
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_FILE=	${WRKSRC}/docs/LICENSE
 
-USE=		perl5
+USES=		perl5
+USE_PERL5=	run
 USE_RC_SUBR=	${PORTNAME}
 NO_BUILD=	yes
 
@@ -35,12 +36,8 @@ NO_BUILD=	yes
 SUB_LIST+=	PERL="${PERL}"
 .endif
 
-.ifndef(NOPORTDOCS)
-PORTDOCS=	\
-		*
-.endif
+PORTDOCS=	*
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 post-patch:
@@ -71,49 +68,47 @@ post-configure:
 do-install:
 ## create site_perl
 # dirs
-	@${MKDIR} ${SITE_PERL:S|${LOCALBASE}|${PREFIX}|}/AmphetaDesk
-	@cd ${WRKSRC}/lib && \
+	@${MKDIR} ${SITE_PERL:S|${LOCALBASE}|${STAGEDIR}${PREFIX}|}/AmphetaDesk
+	@(cd ${WRKSRC}/lib && \
 		${FIND} * -type d ! -empty -print0 | \
 		${XARGS} -0 -x -n 10 -I {} \
-		${MKDIR} ${SITE_PERL:S|${LOCALBASE}|${PREFIX}|}/AmphetaDesk/{}
+		${MKDIR} ${SITE_PERL:S|${LOCALBASE}|${STAGEDIR}${PREFIX}|}/AmphetaDesk/{})
 # files
-	@cd ${WRKSRC}/lib && \
+	(cd ${WRKSRC}/lib && \
 		${FIND} * -type f -name "*pm" -print0 | \
 		${XARGS} -0 -x -n 10 -I {} \
-		${INSTALL_DATA} {} ${SITE_PERL:S|${LOCALBASE}|${PREFIX}|}/AmphetaDesk/{}
+		${INSTALL_DATA} {} ${SITE_PERL:S|${LOCALBASE}|${STAGEDIR}${PREFIX}|}/AmphetaDesk/{})
 # script
-	@${INSTALL_DATA} ${WRKSRC}/AmphetaDesk.pl \
-		${PREFIX}/bin/AmphetaDesk-real
-	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh \
-		${PREFIX}/bin/AmphetaDesk
+	${INSTALL_DATA} ${WRKSRC}/AmphetaDesk.pl \
+		${STAGEDIR}${PREFIX}/bin/AmphetaDesk-real
+	${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh \
+		${STAGEDIR}${PREFIX}/bin/AmphetaDesk
 ## docs
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for ext in html txt xml
-	@${INSTALL_DATA} ${WRKSRC}/docs/*.${ext} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/*.${ext} ${STAGEDIR}${DOCSDIR}
 .endfor
-	@${MKDIR} ${DOCSDIR}/images
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/images
 .for ext in gif jpg
-	@${INSTALL_DATA} ${WRKSRC}/docs/images/*.${ext} \
-		${DOCSDIR}/images
+	${INSTALL_DATA} ${WRKSRC}/docs/images/*.${ext} \
+		${STAGEDIR}${DOCSDIR}/images
 .endfor
-.endif
 ## lists
-	@${MKDIR} ${DATADIR}/lists
-	@${INSTALL_DATA} ${WRKSRC}/data/lists/services-channels-recent.xml \
-		${DATADIR}/lists
+	@${MKDIR} ${STAGEDIR}${DATADIR}/lists
+	${INSTALL_DATA} ${WRKSRC}/data/lists/services-channels-recent.xml \
+		${STAGEDIR}${DATADIR}/lists
 ## templates
 # dirs
-	@cd ${WRKSRC} && \
+	(cd ${WRKSRC} && \
 		${FIND} templates -type d ! -empty -print0 | \
 		${XARGS} -0 -x -n 10 -I {} \
-		${MKDIR} ${DATADIR}/{}
+		${MKDIR} ${STAGEDIR}${DATADIR}/{})
 # files
 .for ext in gif html ico png pict 
-	@cd ${WRKSRC} && \
+	(cd ${WRKSRC} && \
 		${FIND} templates -type f -name "*.${ext}" -print0 | \
 		${XARGS} -0 -x -n 10 -I {} \
-		${INSTALL_DATA} {} ${DATADIR}/{}
+		${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{})
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/www/amphetadesk/pkg-plist b/www/amphetadesk/pkg-plist
index aea8688d517a..e236b9a62179 100644
--- a/www/amphetadesk/pkg-plist
+++ b/www/amphetadesk/pkg-plist
@@ -39,18 +39,15 @@ bin/AmphetaDesk-real
 %%DATADIR%%/templates/default/popup.html
 %%DATADIR%%/templates/default/tpl_footer.html
 %%DATADIR%%/templates/default/tpl_header.html
-@dirrm %%DATADIR%%/templates/default/images
-@dirrm %%DATADIR%%/templates/default/gui
-@dirrm %%DATADIR%%/templates/default
-@dirrm %%DATADIR%%/templates
-@dirrm %%DATADIR%%/lists
-@dirrm %%DATADIR%%
-@dirrm %%SITE_PERL%%/AmphetaDesk/XML
-@dirrm %%SITE_PERL%%/AmphetaDesk/Text/Template
-@dirrm %%SITE_PERL%%/AmphetaDesk/Text
 @dirrm %%SITE_PERL%%/AmphetaDesk/AmphetaDesk/OS
 @dirrm %%SITE_PERL%%/AmphetaDesk/AmphetaDesk
+@dirrm %%SITE_PERL%%/AmphetaDesk/Text/Template
+@dirrm %%SITE_PERL%%/AmphetaDesk/Text
+@dirrm %%SITE_PERL%%/AmphetaDesk/XML
 @dirrm %%SITE_PERL%%/AmphetaDesk
-@dirrmtry %%SITE_PERL%%
-@dirrmtry lib/perl5/site_perl
-@dirrmtry lib/perl5
+@dirrm %%DATADIR%%/lists
+@dirrm %%DATADIR%%/templates/default/gui
+@dirrm %%DATADIR%%/templates/default/images
+@dirrm %%DATADIR%%/templates/default
+@dirrm %%DATADIR%%/templates
+@dirrm %%DATADIR%%
diff --git a/www/css-mode.el/Makefile b/www/css-mode.el/Makefile
index 0c1fab21b72d..4e2796b9b85e 100644
--- a/www/css-mode.el/Makefile
+++ b/www/css-mode.el/Makefile
@@ -28,18 +28,15 @@ DOCSDIR=	${PREFIX}/share/doc/css-mode
 
 PLIST_SUB=	ELISP_SUBDIR=${ELISP_SUBDIR} XELISP_SUBDIR=${XELISP_SUBDIR}
 
-NO_STAGE=	yes
 do-install:
-	@${MKDIR} ${PREFIX}/${ELISP_SUBDIR}
-	${INSTALL_DATA} ${_DISTDIR}/${DISTNAME} ${PREFIX}/${ELISP_SUBDIR}/
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${ELISP_SUBDIR}
+	${INSTALL_DATA} ${_DISTDIR}/${DISTNAME} ${STAGEDIR}${PREFIX}/${ELISP_SUBDIR}
 # For XEmacs
-	@${MKDIR} ${PREFIX}/${XELISP_SUBDIR}
-	${INSTALL_DATA} ${_DISTDIR}/${DISTNAME} ${PREFIX}/${XELISP_SUBDIR}/
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${XELISP_SUBDIR}
+	${INSTALL_DATA} ${_DISTDIR}/${DISTNAME} ${STAGEDIR}${PREFIX}/${XELISP_SUBDIR}
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${_DISTDIR}/doco.html ${DOCSDIR}/css-mode-doc.html
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${_DISTDIR}/doco.html ${STAGEDIR}${DOCSDIR}/css-mode-doc.html
 
 .include <bsd.port.mk>
diff --git a/www/css-mode.el/pkg-plist b/www/css-mode.el/pkg-plist
index c52e3295d414..34ba972db4f8 100644
--- a/www/css-mode.el/pkg-plist
+++ b/www/css-mode.el/pkg-plist
@@ -1,6 +1,6 @@
-%%ELISP_SUBDIR%%/css-mode.el
 %%XELISP_SUBDIR%%/css-mode.el
 %%PORTDOCS%%%%DOCSDIR%%/css-mode-doc.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry lib/xemacs/site-lisp
+%%ELISP_SUBDIR%%/css-mode.el
+@dirrmtry %%XELISP_SUBDIR%%
 @dirrmtry lib/xemacs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%