diff --git a/www/netstiff/Makefile b/www/netstiff/Makefile
index d10e5e42c364..487f54220ba3 100644
--- a/www/netstiff/Makefile
+++ b/www/netstiff/Makefile
@@ -10,26 +10,23 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A powerful web page update checker
 
+LICENSE=	GPLv3
+
 NO_BUILD=	yes
 USE_RUBY=	yes
+USES=		shebangfix
+SHEBANG_FILES=	${WRKSRC}/${PORTNAME}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 PORTDOCS=	ChangeLog LICENSE THANKSTO
-PLIST_FILES=	bin/${PORTNAME}
-MAN1=		${PORTNAME}.1
-
-NO_STAGE=	yes
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/bin/ruby|${RUBY}|' ${WRKSRC}/${PORTNAME}
+PLIST_FILES=	bin/${PORTNAME} \
+		man/man1/${PORTNAME}.1.gz
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for i in ${PORTDOCS}
-	${INSTALL_DATA} -p ${WRKSRC}/${i} ${DOCSDIR}
-.endfor
-.endif
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/www/openxmldir/Makefile b/www/openxmldir/Makefile
index 39213fb09046..fbc9236cf66e 100644
--- a/www/openxmldir/Makefile
+++ b/www/openxmldir/Makefile
@@ -10,17 +10,15 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PHP based XML menuing system for Cisco 79xx IP phones
 
-NO_BUILD=	YES
-WANT_PHP_WEB=	YES
-USE_PHP=	mysql xml
-PLIST_SUB+=	OPENXMLDIR=${OPENXMLDIR}
-OPENXMLDIR=	www/${PORTNAME}
+LICENSE=	GPLv2
+
+NO_BUILD=	yes
+WANT_PHP_WEB=	yes
+USE_PHP=	mysql xml
+PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
-NO_STAGE=	yes
 do-install:
-	-${MKDIR} ${PREFIX}/${OPENXMLDIR}
-	@${CP} -R ${WRKSRC}/* ${PREFIX}/${OPENXMLDIR}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${OPENXMLDIR}
-	@${CHMOD} 755 ${PREFIX}/${OPENXMLDIR}
+	@${MKDIR} ${STAGEDIR}${WWWDIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 .include <bsd.port.mk>
diff --git a/www/openxmldir/pkg-plist b/www/openxmldir/pkg-plist
index 2744fcf3ea46..b606fdf9382b 100644
--- a/www/openxmldir/pkg-plist
+++ b/www/openxmldir/pkg-plist
@@ -1,177 +1,179 @@
-%%OPENXMLDIR%%/PhoneUI/index.php
-%%OPENXMLDIR%%/PhoneUI/lib/headers.php
-%%OPENXMLDIR%%/PhoneUI/lib/sec_breach.php
-%%OPENXMLDIR%%/PhoneUI/lib/security.php
-%%OPENXMLDIR%%/PhoneUI/lib/urlbase.php
-%%OPENXMLDIR%%/PhoneUI/memos.php
-%%OPENXMLDIR%%/PhoneUI/menuItems.php
-%%OPENXMLDIR%%/PhoneUI/searchdirectory.php
-%%OPENXMLDIR%%/PhoneUI/status.php
-%%OPENXMLDIR%%/PhoneUI/templates/cat_list_srch.xml
-%%OPENXMLDIR%%/PhoneUI/templates/contact_detail.xml
-%%OPENXMLDIR%%/PhoneUI/templates/dir_search.xml
-%%OPENXMLDIR%%/PhoneUI/templates/glo_index.xml
-%%OPENXMLDIR%%/PhoneUI/templates/glo_results_contacts.xml
-%%OPENXMLDIR%%/PhoneUI/templates/glo_results_phones.xml
-%%OPENXMLDIR%%/PhoneUI/templates/glo_search.xml
-%%OPENXMLDIR%%/PhoneUI/templates/glo_search_phone.xml
-%%OPENXMLDIR%%/PhoneUI/templates/img_empty_cat.php
-%%OPENXMLDIR%%/PhoneUI/templates/img_empty_cont.php
-%%OPENXMLDIR%%/PhoneUI/templates/img_menu.php
-%%OPENXMLDIR%%/PhoneUI/templates/img_no_res.php
-%%OPENXMLDIR%%/PhoneUI/templates/img_sec_breach.php
-%%OPENXMLDIR%%/PhoneUI/templates/listcontacts_sep.xml
-%%OPENXMLDIR%%/PhoneUI/templates/listcontacts_tog.xml
-%%OPENXMLDIR%%/PhoneUI/templates/listobjects.xml
-%%OPENXMLDIR%%/PhoneUI/templates/memo_detail.xml
-%%OPENXMLDIR%%/PhoneUI/templates/memo_menu.xml
-%%OPENXMLDIR%%/PhoneUI/templates/my_status.xml
-%%OPENXMLDIR%%/PhoneUI/templates/spec_status.xml
-%%OPENXMLDIR%%/PhoneUI/templates/srch_index.xml
-%%OPENXMLDIR%%/PhoneUI/templates/status_custom.xml
-%%OPENXMLDIR%%/PhoneUI/templates/status_detail.xml
-%%OPENXMLDIR%%/PhoneUI/templates/status_index.xml
-%%OPENXMLDIR%%/PhoneUI/templates/status_listing.xml
-%%OPENXMLDIR%%/PhoneUI/templates/status_others_index.xml
-%%OPENXMLDIR%%/PhoneUI/templates/user_or_dir.xml
-%%OPENXMLDIR%%/PhoneUI/templates/view_my_status.xml
-%%OPENXMLDIR%%/WebUI/header.html
-%%OPENXMLDIR%%/WebUI/images/directory.gif
-%%OPENXMLDIR%%/WebUI/images/draftheader.gif
-%%OPENXMLDIR%%/WebUI/images/fadebg.gif
-%%OPENXMLDIR%%/WebUI/images/header.gif
-%%OPENXMLDIR%%/WebUI/images/help_tree.gif
-%%OPENXMLDIR%%/WebUI/images/icon_object.gif
-%%OPENXMLDIR%%/WebUI/images/icon_phone.gif
-%%OPENXMLDIR%%/WebUI/images/memos.gif
-%%OPENXMLDIR%%/WebUI/images/my_account.gif
-%%OPENXMLDIR%%/WebUI/images/phones.gif
-%%OPENXMLDIR%%/WebUI/images/phoneskey.gif
-%%OPENXMLDIR%%/WebUI/images/phoneskeyhole.gif
-%%OPENXMLDIR%%/WebUI/images/ref/image2s.jpg
-%%OPENXMLDIR%%/WebUI/images/ref/images.jpg
-%%OPENXMLDIR%%/WebUI/images/ref/images2.jpg
-%%OPENXMLDIR%%/WebUI/images/settings.gif
-%%OPENXMLDIR%%/WebUI/images/settingscheck.gif
-%%OPENXMLDIR%%/WebUI/index.php
-%%OPENXMLDIR%%/WebUI/lib/xtra_java.php
-%%OPENXMLDIR%%/WebUI/login.php
-%%OPENXMLDIR%%/WebUI/modules/correct_members.php
-%%OPENXMLDIR%%/WebUI/modules/correct_ob_members.php
-%%OPENXMLDIR%%/WebUI/modules/delete_error.php
-%%OPENXMLDIR%%/WebUI/modules/edit_contact.php
-%%OPENXMLDIR%%/WebUI/modules/edit_memos.php
-%%OPENXMLDIR%%/WebUI/modules/edit_object.php
-%%OPENXMLDIR%%/WebUI/modules/edit_phone.php
-%%OPENXMLDIR%%/WebUI/modules/edit_user.php
-%%OPENXMLDIR%%/WebUI/modules/global_pref.php
-%%OPENXMLDIR%%/WebUI/modules/help.php
-%%OPENXMLDIR%%/WebUI/modules/images/_notes/spacer.gif.mno
-%%OPENXMLDIR%%/WebUI/modules/images/_notes/treespacer.gif.mno
-%%OPENXMLDIR%%/WebUI/modules/images/directory.gif
-%%OPENXMLDIR%%/WebUI/modules/images/draftheader.gif
-%%OPENXMLDIR%%/WebUI/modules/images/fadebg.gif
-%%OPENXMLDIR%%/WebUI/modules/images/fadebg.jpg
-%%OPENXMLDIR%%/WebUI/modules/images/header.gif
-%%OPENXMLDIR%%/WebUI/modules/images/headerofficial.gif
-%%OPENXMLDIR%%/WebUI/modules/images/help/coreystatus.gif
-%%OPENXMLDIR%%/WebUI/modules/images/help/loadingscreen.gif
-%%OPENXMLDIR%%/WebUI/modules/images/help/mainobjects.gif
-%%OPENXMLDIR%%/WebUI/modules/images/help/mainscreen.gif
-%%OPENXMLDIR%%/WebUI/modules/images/help/memo.gif
-%%OPENXMLDIR%%/WebUI/modules/images/help/mystatus.gif
-%%OPENXMLDIR%%/WebUI/modules/images/help/noresults.gif
-%%OPENXMLDIR%%/WebUI/modules/images/help/search.gif
-%%OPENXMLDIR%%/WebUI/modules/images/help/security.gif
-%%OPENXMLDIR%%/WebUI/modules/images/help/seperate2.gif
-%%OPENXMLDIR%%/WebUI/modules/images/help/sepereate1.gif
-%%OPENXMLDIR%%/WebUI/modules/images/help/showglobe.gif
-%%OPENXMLDIR%%/WebUI/modules/images/help/status.gif
-%%OPENXMLDIR%%/WebUI/modules/images/help/together1.gif
-%%OPENXMLDIR%%/WebUI/modules/images/help/xmlloading.gif
-%%OPENXMLDIR%%/WebUI/modules/images/helpq.gif
-%%OPENXMLDIR%%/WebUI/modules/images/icon_directory.gif
-%%OPENXMLDIR%%/WebUI/modules/images/icon_help.gif
-%%OPENXMLDIR%%/WebUI/modules/images/icon_help_main.gif
-%%OPENXMLDIR%%/WebUI/modules/images/icon_memo.gif
-%%OPENXMLDIR%%/WebUI/modules/images/icon_object.gif
-%%OPENXMLDIR%%/WebUI/modules/images/icon_phone.gif
-%%OPENXMLDIR%%/WebUI/modules/images/icon_security.gif
-%%OPENXMLDIR%%/WebUI/modules/images/icon_settings.gif
-%%OPENXMLDIR%%/WebUI/modules/images/icon_tree_menu.gif
-%%OPENXMLDIR%%/WebUI/modules/images/memos.gif
-%%OPENXMLDIR%%/WebUI/modules/images/my_account.gif
-%%OPENXMLDIR%%/WebUI/modules/images/phones.gif
-%%OPENXMLDIR%%/WebUI/modules/images/preview.cpt
-%%OPENXMLDIR%%/WebUI/modules/images/preview.gif
-%%OPENXMLDIR%%/WebUI/modules/images/settings.gif
-%%OPENXMLDIR%%/WebUI/modules/images/settingscheck.gif
-%%OPENXMLDIR%%/WebUI/modules/images/spacer.gif
-%%OPENXMLDIR%%/WebUI/modules/images/tree.gif
-%%OPENXMLDIR%%/WebUI/modules/images/tree_icon_categor2y.gif
-%%OPENXMLDIR%%/WebUI/modules/images/tree_icon_category.gif
-%%OPENXMLDIR%%/WebUI/modules/images/tree_icon_container.gif
-%%OPENXMLDIR%%/WebUI/modules/images/tree_icon_link.gif
-%%OPENXMLDIR%%/WebUI/modules/images/tree_menu_icon.gif
-%%OPENXMLDIR%%/WebUI/modules/images/tree_menu_icon_new.gif
-%%OPENXMLDIR%%/WebUI/modules/images/treespacer.gif
-%%OPENXMLDIR%%/WebUI/modules/import_contacts.php
-%%OPENXMLDIR%%/WebUI/modules/index.php
-%%OPENXMLDIR%%/WebUI/modules/install_success.php
-%%OPENXMLDIR%%/WebUI/modules/menu.php
-%%OPENXMLDIR%%/WebUI/modules/my_account.php
-%%OPENXMLDIR%%/WebUI/modules/not_admin.php
-%%OPENXMLDIR%%/WebUI/modules/object_type.php
-%%OPENXMLDIR%%/WebUI/modules/templates/breaks.html
-%%OPENXMLDIR%%/WebUI/modules/templates/correct_members.html
-%%OPENXMLDIR%%/WebUI/modules/templates/correct_ob_members.html
-%%OPENXMLDIR%%/WebUI/modules/templates/edit_contact.html
-%%OPENXMLDIR%%/WebUI/modules/templates/edit_memos.html
-%%OPENXMLDIR%%/WebUI/modules/templates/edit_object.html
-%%OPENXMLDIR%%/WebUI/modules/templates/edit_phone.html
-%%OPENXMLDIR%%/WebUI/modules/templates/edit_user.html
-%%OPENXMLDIR%%/WebUI/modules/templates/global_pref.html
-%%OPENXMLDIR%%/WebUI/modules/templates/help.html
-%%OPENXMLDIR%%/WebUI/modules/templates/import_contacts.html
-%%OPENXMLDIR%%/WebUI/modules/templates/index.php
-%%OPENXMLDIR%%/WebUI/modules/templates/install.html
-%%OPENXMLDIR%%/WebUI/modules/templates/install_success.html
-%%OPENXMLDIR%%/WebUI/modules/templates/login.html
-%%OPENXMLDIR%%/WebUI/modules/templates/menu.html
-%%OPENXMLDIR%%/WebUI/modules/templates/my_account.html
-%%OPENXMLDIR%%/WebUI/modules/templates/not_admin.html
-%%OPENXMLDIR%%/WebUI/modules/templates/object_type.html
-%%OPENXMLDIR%%/WebUI/modules/templates/tree.html
-%%OPENXMLDIR%%/WebUI/modules/templates/tree_print.html
-%%OPENXMLDIR%%/WebUI/modules/templates/view_contacts.html
-%%OPENXMLDIR%%/WebUI/modules/templates/view_memos.html
-%%OPENXMLDIR%%/WebUI/modules/templates/view_objects.html
-%%OPENXMLDIR%%/WebUI/modules/templates/view_phones.html
-%%OPENXMLDIR%%/WebUI/modules/templates/view_users.html
-%%OPENXMLDIR%%/WebUI/modules/tree.php
-%%OPENXMLDIR%%/WebUI/modules/view_contacts.php
-%%OPENXMLDIR%%/WebUI/modules/view_memos.php
-%%OPENXMLDIR%%/WebUI/modules/view_objects.php
-%%OPENXMLDIR%%/WebUI/modules/view_phones.php
-%%OPENXMLDIR%%/WebUI/modules/view_users.php
-%%OPENXMLDIR%%/WebUI/sidebar.html
-%%OPENXMLDIR%%/db.sql
-%%OPENXMLDIR%%/index.php
-%%OPENXMLDIR%%/install.php
-%%OPENXMLDIR%%/lib/mysql.php
-%%OPENXMLDIR%%/lib/utils.php
-%%OPENXMLDIR%%/lib/xtpl.php
-@dirrm %%OPENXMLDIR%%/lib
-@dirrm %%OPENXMLDIR%%/WebUI/modules/templates
-@dirrm %%OPENXMLDIR%%/WebUI/modules/images/help
-@dirrm %%OPENXMLDIR%%/WebUI/modules/images/_notes
-@dirrm %%OPENXMLDIR%%/WebUI/modules/images
-@dirrm %%OPENXMLDIR%%/WebUI/modules
-@dirrm %%OPENXMLDIR%%/WebUI/lib
-@dirrm %%OPENXMLDIR%%/WebUI/images/ref
-@dirrm %%OPENXMLDIR%%/WebUI/images
-@dirrm %%OPENXMLDIR%%/WebUI
-@dirrm %%OPENXMLDIR%%/PhoneUI/templates
-@dirrm %%OPENXMLDIR%%/PhoneUI/lib
-@dirrm %%OPENXMLDIR%%/PhoneUI
-@dirrm %%OPENXMLDIR%%
+@owner ${WWWOWN}
+@group ${WWWGRP}
+%%WWWDIR%%/PhoneUI/index.php
+%%WWWDIR%%/PhoneUI/lib/headers.php
+%%WWWDIR%%/PhoneUI/lib/sec_breach.php
+%%WWWDIR%%/PhoneUI/lib/security.php
+%%WWWDIR%%/PhoneUI/lib/urlbase.php
+%%WWWDIR%%/PhoneUI/memos.php
+%%WWWDIR%%/PhoneUI/menuItems.php
+%%WWWDIR%%/PhoneUI/searchdirectory.php
+%%WWWDIR%%/PhoneUI/status.php
+%%WWWDIR%%/PhoneUI/templates/cat_list_srch.xml
+%%WWWDIR%%/PhoneUI/templates/contact_detail.xml
+%%WWWDIR%%/PhoneUI/templates/dir_search.xml
+%%WWWDIR%%/PhoneUI/templates/glo_index.xml
+%%WWWDIR%%/PhoneUI/templates/glo_results_contacts.xml
+%%WWWDIR%%/PhoneUI/templates/glo_results_phones.xml
+%%WWWDIR%%/PhoneUI/templates/glo_search.xml
+%%WWWDIR%%/PhoneUI/templates/glo_search_phone.xml
+%%WWWDIR%%/PhoneUI/templates/img_empty_cat.php
+%%WWWDIR%%/PhoneUI/templates/img_empty_cont.php
+%%WWWDIR%%/PhoneUI/templates/img_menu.php
+%%WWWDIR%%/PhoneUI/templates/img_no_res.php
+%%WWWDIR%%/PhoneUI/templates/img_sec_breach.php
+%%WWWDIR%%/PhoneUI/templates/listcontacts_sep.xml
+%%WWWDIR%%/PhoneUI/templates/listcontacts_tog.xml
+%%WWWDIR%%/PhoneUI/templates/listobjects.xml
+%%WWWDIR%%/PhoneUI/templates/memo_detail.xml
+%%WWWDIR%%/PhoneUI/templates/memo_menu.xml
+%%WWWDIR%%/PhoneUI/templates/my_status.xml
+%%WWWDIR%%/PhoneUI/templates/spec_status.xml
+%%WWWDIR%%/PhoneUI/templates/srch_index.xml
+%%WWWDIR%%/PhoneUI/templates/status_custom.xml
+%%WWWDIR%%/PhoneUI/templates/status_detail.xml
+%%WWWDIR%%/PhoneUI/templates/status_index.xml
+%%WWWDIR%%/PhoneUI/templates/status_listing.xml
+%%WWWDIR%%/PhoneUI/templates/status_others_index.xml
+%%WWWDIR%%/PhoneUI/templates/user_or_dir.xml
+%%WWWDIR%%/PhoneUI/templates/view_my_status.xml
+%%WWWDIR%%/WebUI/header.html
+%%WWWDIR%%/WebUI/images/directory.gif
+%%WWWDIR%%/WebUI/images/draftheader.gif
+%%WWWDIR%%/WebUI/images/fadebg.gif
+%%WWWDIR%%/WebUI/images/header.gif
+%%WWWDIR%%/WebUI/images/help_tree.gif
+%%WWWDIR%%/WebUI/images/icon_object.gif
+%%WWWDIR%%/WebUI/images/icon_phone.gif
+%%WWWDIR%%/WebUI/images/memos.gif
+%%WWWDIR%%/WebUI/images/my_account.gif
+%%WWWDIR%%/WebUI/images/phones.gif
+%%WWWDIR%%/WebUI/images/phoneskey.gif
+%%WWWDIR%%/WebUI/images/phoneskeyhole.gif
+%%WWWDIR%%/WebUI/images/ref/image2s.jpg
+%%WWWDIR%%/WebUI/images/ref/images.jpg
+%%WWWDIR%%/WebUI/images/ref/images2.jpg
+%%WWWDIR%%/WebUI/images/settings.gif
+%%WWWDIR%%/WebUI/images/settingscheck.gif
+%%WWWDIR%%/WebUI/index.php
+%%WWWDIR%%/WebUI/lib/xtra_java.php
+%%WWWDIR%%/WebUI/login.php
+%%WWWDIR%%/WebUI/modules/correct_members.php
+%%WWWDIR%%/WebUI/modules/correct_ob_members.php
+%%WWWDIR%%/WebUI/modules/delete_error.php
+%%WWWDIR%%/WebUI/modules/edit_contact.php
+%%WWWDIR%%/WebUI/modules/edit_memos.php
+%%WWWDIR%%/WebUI/modules/edit_object.php
+%%WWWDIR%%/WebUI/modules/edit_phone.php
+%%WWWDIR%%/WebUI/modules/edit_user.php
+%%WWWDIR%%/WebUI/modules/global_pref.php
+%%WWWDIR%%/WebUI/modules/help.php
+%%WWWDIR%%/WebUI/modules/images/_notes/spacer.gif.mno
+%%WWWDIR%%/WebUI/modules/images/_notes/treespacer.gif.mno
+%%WWWDIR%%/WebUI/modules/images/directory.gif
+%%WWWDIR%%/WebUI/modules/images/draftheader.gif
+%%WWWDIR%%/WebUI/modules/images/fadebg.gif
+%%WWWDIR%%/WebUI/modules/images/fadebg.jpg
+%%WWWDIR%%/WebUI/modules/images/header.gif
+%%WWWDIR%%/WebUI/modules/images/headerofficial.gif
+%%WWWDIR%%/WebUI/modules/images/help/coreystatus.gif
+%%WWWDIR%%/WebUI/modules/images/help/loadingscreen.gif
+%%WWWDIR%%/WebUI/modules/images/help/mainobjects.gif
+%%WWWDIR%%/WebUI/modules/images/help/mainscreen.gif
+%%WWWDIR%%/WebUI/modules/images/help/memo.gif
+%%WWWDIR%%/WebUI/modules/images/help/mystatus.gif
+%%WWWDIR%%/WebUI/modules/images/help/noresults.gif
+%%WWWDIR%%/WebUI/modules/images/help/search.gif
+%%WWWDIR%%/WebUI/modules/images/help/security.gif
+%%WWWDIR%%/WebUI/modules/images/help/seperate2.gif
+%%WWWDIR%%/WebUI/modules/images/help/sepereate1.gif
+%%WWWDIR%%/WebUI/modules/images/help/showglobe.gif
+%%WWWDIR%%/WebUI/modules/images/help/status.gif
+%%WWWDIR%%/WebUI/modules/images/help/together1.gif
+%%WWWDIR%%/WebUI/modules/images/help/xmlloading.gif
+%%WWWDIR%%/WebUI/modules/images/helpq.gif
+%%WWWDIR%%/WebUI/modules/images/icon_directory.gif
+%%WWWDIR%%/WebUI/modules/images/icon_help.gif
+%%WWWDIR%%/WebUI/modules/images/icon_help_main.gif
+%%WWWDIR%%/WebUI/modules/images/icon_memo.gif
+%%WWWDIR%%/WebUI/modules/images/icon_object.gif
+%%WWWDIR%%/WebUI/modules/images/icon_phone.gif
+%%WWWDIR%%/WebUI/modules/images/icon_security.gif
+%%WWWDIR%%/WebUI/modules/images/icon_settings.gif
+%%WWWDIR%%/WebUI/modules/images/icon_tree_menu.gif
+%%WWWDIR%%/WebUI/modules/images/memos.gif
+%%WWWDIR%%/WebUI/modules/images/my_account.gif
+%%WWWDIR%%/WebUI/modules/images/phones.gif
+%%WWWDIR%%/WebUI/modules/images/preview.cpt
+%%WWWDIR%%/WebUI/modules/images/preview.gif
+%%WWWDIR%%/WebUI/modules/images/settings.gif
+%%WWWDIR%%/WebUI/modules/images/settingscheck.gif
+%%WWWDIR%%/WebUI/modules/images/spacer.gif
+%%WWWDIR%%/WebUI/modules/images/tree.gif
+%%WWWDIR%%/WebUI/modules/images/tree_icon_categor2y.gif
+%%WWWDIR%%/WebUI/modules/images/tree_icon_category.gif
+%%WWWDIR%%/WebUI/modules/images/tree_icon_container.gif
+%%WWWDIR%%/WebUI/modules/images/tree_icon_link.gif
+%%WWWDIR%%/WebUI/modules/images/tree_menu_icon.gif
+%%WWWDIR%%/WebUI/modules/images/tree_menu_icon_new.gif
+%%WWWDIR%%/WebUI/modules/images/treespacer.gif
+%%WWWDIR%%/WebUI/modules/import_contacts.php
+%%WWWDIR%%/WebUI/modules/index.php
+%%WWWDIR%%/WebUI/modules/install_success.php
+%%WWWDIR%%/WebUI/modules/menu.php
+%%WWWDIR%%/WebUI/modules/my_account.php
+%%WWWDIR%%/WebUI/modules/not_admin.php
+%%WWWDIR%%/WebUI/modules/object_type.php
+%%WWWDIR%%/WebUI/modules/templates/breaks.html
+%%WWWDIR%%/WebUI/modules/templates/correct_members.html
+%%WWWDIR%%/WebUI/modules/templates/correct_ob_members.html
+%%WWWDIR%%/WebUI/modules/templates/edit_contact.html
+%%WWWDIR%%/WebUI/modules/templates/edit_memos.html
+%%WWWDIR%%/WebUI/modules/templates/edit_object.html
+%%WWWDIR%%/WebUI/modules/templates/edit_phone.html
+%%WWWDIR%%/WebUI/modules/templates/edit_user.html
+%%WWWDIR%%/WebUI/modules/templates/global_pref.html
+%%WWWDIR%%/WebUI/modules/templates/help.html
+%%WWWDIR%%/WebUI/modules/templates/import_contacts.html
+%%WWWDIR%%/WebUI/modules/templates/index.php
+%%WWWDIR%%/WebUI/modules/templates/install.html
+%%WWWDIR%%/WebUI/modules/templates/install_success.html
+%%WWWDIR%%/WebUI/modules/templates/login.html
+%%WWWDIR%%/WebUI/modules/templates/menu.html
+%%WWWDIR%%/WebUI/modules/templates/my_account.html
+%%WWWDIR%%/WebUI/modules/templates/not_admin.html
+%%WWWDIR%%/WebUI/modules/templates/object_type.html
+%%WWWDIR%%/WebUI/modules/templates/tree.html
+%%WWWDIR%%/WebUI/modules/templates/tree_print.html
+%%WWWDIR%%/WebUI/modules/templates/view_contacts.html
+%%WWWDIR%%/WebUI/modules/templates/view_memos.html
+%%WWWDIR%%/WebUI/modules/templates/view_objects.html
+%%WWWDIR%%/WebUI/modules/templates/view_phones.html
+%%WWWDIR%%/WebUI/modules/templates/view_users.html
+%%WWWDIR%%/WebUI/modules/tree.php
+%%WWWDIR%%/WebUI/modules/view_contacts.php
+%%WWWDIR%%/WebUI/modules/view_memos.php
+%%WWWDIR%%/WebUI/modules/view_objects.php
+%%WWWDIR%%/WebUI/modules/view_phones.php
+%%WWWDIR%%/WebUI/modules/view_users.php
+%%WWWDIR%%/WebUI/sidebar.html
+%%WWWDIR%%/db.sql
+%%WWWDIR%%/index.php
+%%WWWDIR%%/install.php
+%%WWWDIR%%/lib/mysql.php
+%%WWWDIR%%/lib/utils.php
+%%WWWDIR%%/lib/xtpl.php
+@dirrm %%WWWDIR%%/PhoneUI/lib
+@dirrm %%WWWDIR%%/PhoneUI/templates
+@dirrm %%WWWDIR%%/PhoneUI
+@dirrm %%WWWDIR%%/WebUI/images/ref
+@dirrm %%WWWDIR%%/WebUI/images
+@dirrm %%WWWDIR%%/WebUI/lib
+@dirrm %%WWWDIR%%/WebUI/modules/images/_notes
+@dirrm %%WWWDIR%%/WebUI/modules/images/help
+@dirrm %%WWWDIR%%/WebUI/modules/images
+@dirrm %%WWWDIR%%/WebUI/modules/templates
+@dirrm %%WWWDIR%%/WebUI/modules
+@dirrm %%WWWDIR%%/WebUI
+@dirrm %%WWWDIR%%/lib
+@dirrm %%WWWDIR%%
diff --git a/www/pnews/Makefile b/www/pnews/Makefile
index 324feb4d15f8..d60816e3d4a6 100644
--- a/www/pnews/Makefile
+++ b/www/pnews/Makefile
@@ -12,6 +12,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PHP Web-based News Reader
 
+LICENSE=	GPLv2
+
 USE_PHP=	yes
 NO_BUILD=	yes
 
@@ -19,11 +21,11 @@ PNEWSDIR?=	www/pnews
 PNEWSFULLDIR=	${PREFIX}/${PNEWSDIR}
 PLIST_SUB+=	PNEWSDIR="${PNEWSDIR}"
 
-NO_STAGE=	yes
+post-extract:
+	${FIND} ${WRKSRC} -type d -name .svn | ${XARGS} ${RM} -r
+
 do-install:
-	@${MKDIR} ${PNEWSFULLDIR}
-	@${CP} -R ${WRKSRC}/* ${PNEWSFULLDIR}
-	@${CP} -R ${WRKSRC}/.htaccess ${WRKSRC}/* ${PNEWSFULLDIR}
-	@${FIND} ${PNEWSFULLDIR} -path '*/.svn' | ${XARGS} ${RM} -fr
+	@${MKDIR} ${STAGEDIR}${PNEWSFULLDIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PNEWSFULLDIR})
 
 .include <bsd.port.mk>
diff --git a/www/pnews/pkg-plist b/www/pnews/pkg-plist
index b34d57e20574..d9d033b134d4 100644
--- a/www/pnews/pkg-plist
+++ b/www/pnews/pkg-plist
@@ -67,9 +67,9 @@
 %%PNEWSDIR%%/utils.js
 %%PNEWSDIR%%/version.inc.php
 %%PNEWSDIR%%/xpost.php
-@dirrmtry %%PNEWSDIR%%/language
-@dirrmtry %%PNEWSDIR%%/examples
-@dirrmtry %%PNEWSDIR%%/doc
-@dirrmtry %%PNEWSDIR%%/css
 @dirrmtry %%PNEWSDIR%%/auth
+@dirrmtry %%PNEWSDIR%%/css
+@dirrmtry %%PNEWSDIR%%/doc
+@dirrmtry %%PNEWSDIR%%/examples
+@dirrmtry %%PNEWSDIR%%/language
 @dirrmtry %%PNEWSDIR%%