- Clarify LICENSE

- Add LICENSE_FILE
- Modernize plist

2 files changed, 46 insertions, 43 deletions

diff --git a/security/phpdeadlock/Makefile b/security/phpdeadlock/Makefile
index 1f641bf0ebf2..d54bc5cca683 100644
--- a/security/phpdeadlock/Makefile
+++ b/security/phpdeadlock/Makefile
@@ -11,7 +11,8 @@ DISTNAME=	Deadlock-${PORTVERSION}-Stable
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Web-based user authentication/password protection system
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 # or later
+LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 WRKSRC=		${WRKDIR}/Deadlock-1.01
 DLURL?=		${PORTNAME}
diff --git a/security/phpdeadlock/pkg-plist b/security/phpdeadlock/pkg-plist
index 159323e2206b..46c865f5a772 100644
--- a/security/phpdeadlock/pkg-plist
+++ b/security/phpdeadlock/pkg-plist
@@ -206,45 +206,47 @@
 %%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%%
+@dir %%WWWDIR%%/user
+@dir %%WWWDIR%%/templates
+@dir %%WWWDIR%%/lib
+@dir %%WWWDIR%%/images
+@dir %%WWWDIR%%/install
+@dir %%WWWDIR%%/func
+@dir %%WWWDIR%%/fckeditor/editor/skins/default/images
+@dir %%WWWDIR%%/fckeditor/editor/skins/default
+@dir %%WWWDIR%%/fckeditor/editor/skins
+@dir %%WWWDIR%%/fckeditor/editor/plugins/tablecommands
+@dir %%WWWDIR%%/fckeditor/editor/plugins/simplecommands
+@dir %%WWWDIR%%/fckeditor/editor/plugins/placeholder/lang
+@dir %%WWWDIR%%/fckeditor/editor/plugins/placeholder
+@dir %%WWWDIR%%/fckeditor/editor/plugins/autogrow
+@dir %%WWWDIR%%/fckeditor/editor/plugins
+@dir %%WWWDIR%%/fckeditor/editor/lang
+@dir %%WWWDIR%%/fckeditor/editor/js
+@dir %%WWWDIR%%/fckeditor/editor/images/smiley/msn
+@dir %%WWWDIR%%/fckeditor/editor/images/smiley
+@dir %%WWWDIR%%/fckeditor/editor/images
+@dir %%WWWDIR%%/fckeditor/editor/dialog/fck_universalkey
+@dir %%WWWDIR%%/fckeditor/editor/dialog/fck_template/images
+@dir %%WWWDIR%%/fckeditor/editor/dialog/fck_template
+@dir %%WWWDIR%%/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts
+@dir %%WWWDIR%%/fckeditor/editor/dialog/fck_spellerpages/spellerpages
+@dir %%WWWDIR%%/fckeditor/editor/dialog/fck_spellerpages
+@dir %%WWWDIR%%/fckeditor/editor/dialog/fck_select
+@dir %%WWWDIR%%/fckeditor/editor/dialog/fck_link
+@dir %%WWWDIR%%/fckeditor/editor/dialog/fck_image
+@dir %%WWWDIR%%/fckeditor/editor/dialog/fck_flash
+@dir %%WWWDIR%%/fckeditor/editor/dialog/fck_docprops
+@dir %%WWWDIR%%/fckeditor/editor/dialog/fck_about
+@dir %%WWWDIR%%/fckeditor/editor/dialog/common/images
+@dir %%WWWDIR%%/fckeditor/editor/dialog/common
+@dir %%WWWDIR%%/fckeditor/editor/dialog
+@dir %%WWWDIR%%/fckeditor/editor/css/images
+@dir %%WWWDIR%%/fckeditor/editor/css/behaviors
+@dir %%WWWDIR%%/fckeditor/editor/css
+@dir %%WWWDIR%%/fckeditor/editor
+@dir %%WWWDIR%%/fckeditor
+@dir %%WWWDIR%%/admin
+@dir %%WWWDIR%%
+@owner
+@group