Index: head/security/phpdeadlock/Makefile
===================================================================
--- head/security/phpdeadlock/Makefile	(revision 356109)
+++ head/security/phpdeadlock/Makefile	(revision 356110)
@@ -1,50 +1,41 @@
 # Created by: Greg Larkin <glarkin@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	phpdeadlock
 PORTVERSION=	1.01
 PORTREVISION=	1
 CATEGORIES=	security www
 MASTER_SITES=	SF/${PORTNAME}/Deadlock/${PORTVERSION}%20Stable
 DISTNAME=	Deadlock-${PORTVERSION}-Stable
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Web-based user authentication/password protection system
 
-WRKSRC=	${WRKDIR}/Deadlock-1.01
-DLURL?=	${PORTNAME}
+LICENSE=	GPLv2
+
+WRKSRC=		${WRKDIR}/Deadlock-1.01
+DLURL?=		${PORTNAME}
 DLDIR=		www/${DLURL}
 PORTDOCS=	CHANGES.txt COPYING.txt UPGRADE.txt
 
 USES=		dos2unix
 USE_APACHE_RUN=	22+
 USE_PHP=	mysql session ctype pcre
 NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
 SUB_LIST=	DLURL=${DLURL} DLDIR=${DLDIR}
+PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
-NO_STAGE=	yes
 post-extract:
 	@cd ${WRKDIR} && ${MV} "Deadlock v1.01" Deadlock-1.01
 
 post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -exec ${RM} {} \;
 
 do-install:
-	@cd ${WRKSRC}/deadlock && ${COPYTREE_SHARE} . ${WWWDIR}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
-	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
-		${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
-	@${CHMOD} 777 ${WWWDIR}/db_config.php
-	@${ECHO_CMD} '@exec ${CHMOD} 777 \
-		${WWWDIR:S|^${PREFIX}/|%D/|}/db_config.php' >> ${TMPPLIST}
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${INSTALL} -d ${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
-	@${CAT} ${PKGMESSAGE}
+	@cd ${WRKSRC}/deadlock && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
+	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/security/phpdeadlock/pkg-plist
===================================================================
--- head/security/phpdeadlock/pkg-plist	(revision 356109)
+++ head/security/phpdeadlock/pkg-plist	(revision 356110)
@@ -1,246 +1,250 @@
+@owner %%WWWOWN%%
+@group %%WWWGRP%%
 %%WWWDIR%%/.htaccess
 %%WWWDIR%%/admin/.htaccess
 %%WWWDIR%%/admin/bulkemail.php
 %%WWWDIR%%/admin/editconfig.php
 %%WWWDIR%%/admin/edituser.php
 %%WWWDIR%%/admin/inactiveusers.php
 %%WWWDIR%%/admin/index.php
 %%WWWDIR%%/admin/login.php
 %%WWWDIR%%/admin/newuser.php
 %%WWWDIR%%/admin/useraccept.php
 %%WWWDIR%%/admin/userdel.php
 %%WWWDIR%%/admin/userinfo.php
 %%WWWDIR%%/admin/userlist.php
 %%WWWDIR%%/admin/userrequests.php
 %%WWWDIR%%/admin/validateuser.php
+@mode 777
 %%WWWDIR%%/db_config.php
+@mode
 %%WWWDIR%%/fckeditor/_documentation.html
 %%WWWDIR%%/fckeditor/_whatsnew.html
 %%WWWDIR%%/fckeditor/editor/css/behaviors/disablehandles.htc
 %%WWWDIR%%/fckeditor/editor/css/behaviors/hiddenfield.gif
 %%WWWDIR%%/fckeditor/editor/css/behaviors/hiddenfield.htc
 %%WWWDIR%%/fckeditor/editor/css/behaviors/showtableborders.htc
 %%WWWDIR%%/fckeditor/editor/css/fck_editorarea.css
 %%WWWDIR%%/fckeditor/editor/css/fck_internal.css
 %%WWWDIR%%/fckeditor/editor/css/fck_showtableborders_gecko.css
 %%WWWDIR%%/fckeditor/editor/css/images/fck_anchor.gif
 %%WWWDIR%%/fckeditor/editor/css/images/fck_flashlogo.gif
 %%WWWDIR%%/fckeditor/editor/css/images/fck_pagebreak.gif
 %%WWWDIR%%/fckeditor/editor/dialog/common/fck_dialog_common.css
 %%WWWDIR%%/fckeditor/editor/dialog/common/fck_dialog_common.js
 %%WWWDIR%%/fckeditor/editor/dialog/common/fcknumericfield.htc
 %%WWWDIR%%/fckeditor/editor/dialog/common/images/locked.gif
 %%WWWDIR%%/fckeditor/editor/dialog/common/images/reset.gif
 %%WWWDIR%%/fckeditor/editor/dialog/common/images/unlocked.gif
 %%WWWDIR%%/fckeditor/editor/dialog/common/moz-bindings.xml
 %%WWWDIR%%/fckeditor/editor/dialog/fck_about.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_about/lgpl.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_about/logo_fckeditor.gif
 %%WWWDIR%%/fckeditor/editor/dialog/fck_about/logo_fredck.gif
 %%WWWDIR%%/fckeditor/editor/dialog/fck_anchor.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_button.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_checkbox.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_colorselector.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_docprops.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_find.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_flash.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_flash/fck_flash.js
 %%WWWDIR%%/fckeditor/editor/dialog/fck_flash/fck_flash_preview.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_form.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_hiddenfield.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_image.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_image/fck_image.js
 %%WWWDIR%%/fckeditor/editor/dialog/fck_image/fck_image_preview.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_link.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_link/fck_link.js
 %%WWWDIR%%/fckeditor/editor/dialog/fck_listprop.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_paste.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_radiobutton.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_replace.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_select.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_select/fck_select.js
 %%WWWDIR%%/fckeditor/editor/dialog/fck_smiley.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_source.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_specialchar.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_spellerpages.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_spellerpages/spellerpages/controlWindow.js
 %%WWWDIR%%/fckeditor/editor/dialog/fck_spellerpages/spellerpages/controls.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.cfm
 %%WWWDIR%%/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php
 %%WWWDIR%%/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl
 %%WWWDIR%%/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js
 %%WWWDIR%%/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellchecker.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css
 %%WWWDIR%%/fckeditor/editor/dialog/fck_spellerpages/spellerpages/wordWindow.js
 %%WWWDIR%%/fckeditor/editor/dialog/fck_table.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_tablecell.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_template.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_template/images/template1.gif
 %%WWWDIR%%/fckeditor/editor/dialog/fck_template/images/template2.gif
 %%WWWDIR%%/fckeditor/editor/dialog/fck_template/images/template3.gif
 %%WWWDIR%%/fckeditor/editor/dialog/fck_textarea.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_textfield.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_universalkey.html
 %%WWWDIR%%/fckeditor/editor/dialog/fck_universalkey/00.gif
 %%WWWDIR%%/fckeditor/editor/dialog/fck_universalkey/data.js
 %%WWWDIR%%/fckeditor/editor/dialog/fck_universalkey/diacritic.js
 %%WWWDIR%%/fckeditor/editor/dialog/fck_universalkey/dialogue.js
 %%WWWDIR%%/fckeditor/editor/dialog/fck_universalkey/fck_universalkey.css
 %%WWWDIR%%/fckeditor/editor/dialog/fck_universalkey/keyboard_layout.gif
 %%WWWDIR%%/fckeditor/editor/dialog/fck_universalkey/multihexa.js
 %%WWWDIR%%/fckeditor/editor/fckblank.html
 %%WWWDIR%%/fckeditor/editor/fckdebug.html
 %%WWWDIR%%/fckeditor/editor/fckdialog.html
 %%WWWDIR%%/fckeditor/editor/fckeditor.html
 %%WWWDIR%%/fckeditor/editor/fckeditor.original.html
 %%WWWDIR%%/fckeditor/editor/images/anchor.gif
 %%WWWDIR%%/fckeditor/editor/images/arrow_ltr.gif
 %%WWWDIR%%/fckeditor/editor/images/arrow_rtl.gif
 %%WWWDIR%%/fckeditor/editor/images/smiley/msn/angel_smile.gif
 %%WWWDIR%%/fckeditor/editor/images/smiley/msn/angry_smile.gif
 %%WWWDIR%%/fckeditor/editor/images/smiley/msn/broken_heart.gif
 %%WWWDIR%%/fckeditor/editor/images/smiley/msn/cake.gif
 %%WWWDIR%%/fckeditor/editor/images/smiley/msn/confused_smile.gif
 %%WWWDIR%%/fckeditor/editor/images/smiley/msn/cry_smile.gif
 %%WWWDIR%%/fckeditor/editor/images/smiley/msn/devil_smile.gif
 %%WWWDIR%%/fckeditor/editor/images/smiley/msn/embaressed_smile.gif
 %%WWWDIR%%/fckeditor/editor/images/smiley/msn/envelope.gif
 %%WWWDIR%%/fckeditor/editor/images/smiley/msn/heart.gif
 %%WWWDIR%%/fckeditor/editor/images/smiley/msn/kiss.gif
 %%WWWDIR%%/fckeditor/editor/images/smiley/msn/lightbulb.gif
 %%WWWDIR%%/fckeditor/editor/images/smiley/msn/omg_smile.gif
 %%WWWDIR%%/fckeditor/editor/images/smiley/msn/regular_smile.gif
 %%WWWDIR%%/fckeditor/editor/images/smiley/msn/sad_smile.gif
 %%WWWDIR%%/fckeditor/editor/images/smiley/msn/shades_smile.gif
 %%WWWDIR%%/fckeditor/editor/images/smiley/msn/teeth_smile.gif
 %%WWWDIR%%/fckeditor/editor/images/smiley/msn/thumbs_down.gif
 %%WWWDIR%%/fckeditor/editor/images/smiley/msn/thumbs_up.gif
 %%WWWDIR%%/fckeditor/editor/images/smiley/msn/tounge_smile.gif
 %%WWWDIR%%/fckeditor/editor/images/smiley/msn/whatchutalkingabout_smile.gif
 %%WWWDIR%%/fckeditor/editor/images/smiley/msn/wink_smile.gif
 %%WWWDIR%%/fckeditor/editor/images/spacer.gif
 %%WWWDIR%%/fckeditor/editor/js/fckeditorcode_gecko.js
 %%WWWDIR%%/fckeditor/editor/js/fckeditorcode_ie.js
 %%WWWDIR%%/fckeditor/editor/lang/_getfontformat.html
 %%WWWDIR%%/fckeditor/editor/lang/_translationstatus.txt
 %%WWWDIR%%/fckeditor/editor/lang/en.js
 %%WWWDIR%%/fckeditor/editor/plugins/autogrow/fckplugin.js
 %%WWWDIR%%/fckeditor/editor/plugins/placeholder/fck_placeholder.html
 %%WWWDIR%%/fckeditor/editor/plugins/placeholder/fckplugin.js
 %%WWWDIR%%/fckeditor/editor/plugins/placeholder/lang/de.js
 %%WWWDIR%%/fckeditor/editor/plugins/placeholder/lang/en.js
 %%WWWDIR%%/fckeditor/editor/plugins/placeholder/lang/fr.js
 %%WWWDIR%%/fckeditor/editor/plugins/placeholder/lang/it.js
 %%WWWDIR%%/fckeditor/editor/plugins/placeholder/lang/pl.js
 %%WWWDIR%%/fckeditor/editor/plugins/placeholder/placeholder.gif
 %%WWWDIR%%/fckeditor/editor/plugins/simplecommands/fckplugin.js
 %%WWWDIR%%/fckeditor/editor/plugins/tablecommands/fckplugin.js
 %%WWWDIR%%/fckeditor/editor/skins/_fckviewstrips.html
 %%WWWDIR%%/fckeditor/editor/skins/default/fck_dialog.css
 %%WWWDIR%%/fckeditor/editor/skins/default/fck_editor.css
 %%WWWDIR%%/fckeditor/editor/skins/default/fck_strip.gif
 %%WWWDIR%%/fckeditor/editor/skins/default/images/toolbar.arrowright.gif
 %%WWWDIR%%/fckeditor/editor/skins/default/images/toolbar.bg.gif
 %%WWWDIR%%/fckeditor/editor/skins/default/images/toolbar.buttonarrow.gif
 %%WWWDIR%%/fckeditor/editor/skins/default/images/toolbar.collapse.gif
 %%WWWDIR%%/fckeditor/editor/skins/default/images/toolbar.end.gif
 %%WWWDIR%%/fckeditor/editor/skins/default/images/toolbar.expand.gif
 %%WWWDIR%%/fckeditor/editor/skins/default/images/toolbar.separator.gif
 %%WWWDIR%%/fckeditor/editor/skins/default/images/toolbar.start.gif
 %%WWWDIR%%/fckeditor/fckconfig.js
 %%WWWDIR%%/fckeditor/fckeditor.php
 %%WWWDIR%%/fckeditor/fckstyles.xml
 %%WWWDIR%%/fckeditor/fcktemplates.xml
 %%WWWDIR%%/fckeditor/htaccess.txt
 %%WWWDIR%%/fckeditor/license.txt
 %%WWWDIR%%/func/str_ireplace.php
 %%WWWDIR%%/global.php
 %%WWWDIR%%/images/accept15px.gif
 %%WWWDIR%%/images/admin.css
 %%WWWDIR%%/images/delete15px.gif
 %%WWWDIR%%/images/edit15px.gif
 %%WWWDIR%%/images/grey_pixel.gif
 %%WWWDIR%%/images/header_logo.gif
 %%WWWDIR%%/images/hint.js
 %%WWWDIR%%/images/info15px.gif
 %%WWWDIR%%/images/mail15px.gif
 %%WWWDIR%%/images/minus.gif
 %%WWWDIR%%/images/plus.gif
 %%WWWDIR%%/images/tux.gif
 %%WWWDIR%%/images/user.css
 %%WWWDIR%%/index.php
 %%WWWDIR%%/install/changedsql.txt
 %%WWWDIR%%/install/index.php
 %%WWWDIR%%/install/install.php
 %%WWWDIR%%/install/upgrade.php
 %%WWWDIR%%/lib/MiniTemplator.class.php
 %%WWWDIR%%/lib/Pager.class.php
 %%WWWDIR%%/lib/UserAgentParse.class.php
 %%WWWDIR%%/lib/phpmailer.class.php
 %%WWWDIR%%/lib/smtp.class.php
 %%WWWDIR%%/templates/account_information.html
 %%WWWDIR%%/templates/edit_account.html
 %%WWWDIR%%/templates/forgot_password.html
 %%WWWDIR%%/templates/overall_footer.html
 %%WWWDIR%%/templates/overall_header.html
 %%WWWDIR%%/templates/resend_code.html
 %%WWWDIR%%/templates/standard_message.html
 %%WWWDIR%%/templates/user_panel_login.html
 %%WWWDIR%%/templates/user_registration.html
 %%WWWDIR%%/templates/user_registration_message.html
 %%WWWDIR%%/templates/verify_email.html
 %%WWWDIR%%/user/.htaccess
 %%WWWDIR%%/user/account.php
 %%WWWDIR%%/user/auth.inc.php
 %%WWWDIR%%/user/editaccount.php
 %%WWWDIR%%/user/forgotpass.php
 %%WWWDIR%%/user/index.php
 %%WWWDIR%%/user/login.php
 %%WWWDIR%%/user/register.php
 %%WWWDIR%%/user/resendcode.php
 %%WWWDIR%%/user/verifyemail.php
 %%WWWDIR%%/version.php
 @dirrm %%WWWDIR%%/user
 @dirrm %%WWWDIR%%/templates
 @dirrm %%WWWDIR%%/lib
 @dirrm %%WWWDIR%%/images
 @dirrm %%WWWDIR%%/install
 @dirrm %%WWWDIR%%/func
 @dirrm %%WWWDIR%%/fckeditor/editor/skins/default/images
 @dirrm %%WWWDIR%%/fckeditor/editor/skins/default
 @dirrm %%WWWDIR%%/fckeditor/editor/skins
 @dirrm %%WWWDIR%%/fckeditor/editor/plugins/tablecommands
 @dirrm %%WWWDIR%%/fckeditor/editor/plugins/simplecommands
 @dirrm %%WWWDIR%%/fckeditor/editor/plugins/placeholder/lang
 @dirrm %%WWWDIR%%/fckeditor/editor/plugins/placeholder
 @dirrm %%WWWDIR%%/fckeditor/editor/plugins/autogrow
 @dirrm %%WWWDIR%%/fckeditor/editor/plugins
 @dirrm %%WWWDIR%%/fckeditor/editor/lang
 @dirrm %%WWWDIR%%/fckeditor/editor/js
 @dirrm %%WWWDIR%%/fckeditor/editor/images/smiley/msn
 @dirrm %%WWWDIR%%/fckeditor/editor/images/smiley
 @dirrm %%WWWDIR%%/fckeditor/editor/images
 @dirrm %%WWWDIR%%/fckeditor/editor/dialog/fck_universalkey
 @dirrm %%WWWDIR%%/fckeditor/editor/dialog/fck_template/images
 @dirrm %%WWWDIR%%/fckeditor/editor/dialog/fck_template
 @dirrm %%WWWDIR%%/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts
 @dirrm %%WWWDIR%%/fckeditor/editor/dialog/fck_spellerpages/spellerpages
 @dirrm %%WWWDIR%%/fckeditor/editor/dialog/fck_spellerpages
 @dirrm %%WWWDIR%%/fckeditor/editor/dialog/fck_select
 @dirrm %%WWWDIR%%/fckeditor/editor/dialog/fck_link
 @dirrm %%WWWDIR%%/fckeditor/editor/dialog/fck_image
 @dirrm %%WWWDIR%%/fckeditor/editor/dialog/fck_flash
 @dirrm %%WWWDIR%%/fckeditor/editor/dialog/fck_docprops
 @dirrm %%WWWDIR%%/fckeditor/editor/dialog/fck_about
 @dirrm %%WWWDIR%%/fckeditor/editor/dialog/common/images
 @dirrm %%WWWDIR%%/fckeditor/editor/dialog/common
 @dirrm %%WWWDIR%%/fckeditor/editor/dialog
 @dirrm %%WWWDIR%%/fckeditor/editor/css/images
 @dirrm %%WWWDIR%%/fckeditor/editor/css/behaviors
 @dirrm %%WWWDIR%%/fckeditor/editor/css
 @dirrm %%WWWDIR%%/fckeditor/editor
 @dirrm %%WWWDIR%%/fckeditor
 @dirrm %%WWWDIR%%/admin
 @dirrmtry %%WWWDIR%%