- drop invalid post-deinstall target

- move to DOCSDIR/DATADIR in pkg-plist

PR:	ports/166092
Submitted by:	jgh
Approved by:	maintainer timeout ( 14 days )
Feature safe:	yes

2 files changed, 34 insertions, 37 deletions

diff --git a/security/monkeysphere/Makefile b/security/monkeysphere/Makefile
index bb98fadaacd8..0b7382d698e2 100644
--- a/security/monkeysphere/Makefile
+++ b/security/monkeysphere/Makefile
@@ -69,7 +69,4 @@ post-install:
 	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 
-post-deinstall:
-	@${SETENV} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL
-
 .include <bsd.port.mk>
diff --git a/security/monkeysphere/pkg-plist b/security/monkeysphere/pkg-plist
index 95afa0111dd0..7779f9a4cd0f 100644
--- a/security/monkeysphere/pkg-plist
+++ b/security/monkeysphere/pkg-plist
@@ -1,36 +1,36 @@
 sbin/monkeysphere-host
 sbin/monkeysphere-authentication
-share/doc/monkeysphere/TODO
-share/doc/monkeysphere/MonkeySpec
-share/doc/monkeysphere/getting-started-user.mdwn
-share/doc/monkeysphere/getting-started-admin.mdwn
+%%DOCSDIR%%/TODO
+%%DOCSDIR%%/MonkeySpec
+%%DOCSDIR%%/getting-started-user.mdwn
+%%DOCSDIR%%/getting-started-admin.mdwn
 bin/openpgp2ssh
 bin/pem2openpgp
 bin/monkeysphere
-share/monkeysphere/mh/publish_key
-share/monkeysphere/mh/import_key
-share/monkeysphere/mh/set_expire
-share/monkeysphere/mh/diagnostics
-share/monkeysphere/mh/add_hostname
-share/monkeysphere/mh/add_revoker
-share/monkeysphere/mh/revoke_hostname
-share/monkeysphere/mh/revoke_key
-share/monkeysphere/keytrans
-share/monkeysphere/defaultenv
-share/monkeysphere/VERSION
-share/monkeysphere/transitions/0.23
-share/monkeysphere/transitions/README.txt
-share/monkeysphere/ma/list_certifiers
-share/monkeysphere/ma/add_certifier
-share/monkeysphere/ma/update_users
-share/monkeysphere/ma/setup
-share/monkeysphere/ma/remove_certifier
-share/monkeysphere/ma/diagnostics
-share/monkeysphere/common
-share/monkeysphere/m/gen_subkey
-share/monkeysphere/m/ssh_proxycommand
-share/monkeysphere/m/subkey_to_ssh_agent
-share/monkeysphere/m/import_subkey
+%%DATADIR%%/mh/publish_key
+%%DATADIR%%/mh/import_key
+%%DATADIR%%/mh/set_expire
+%%DATADIR%%/mh/diagnostics
+%%DATADIR%%/mh/add_hostname
+%%DATADIR%%/mh/add_revoker
+%%DATADIR%%/mh/revoke_hostname
+%%DATADIR%%/mh/revoke_key
+%%DATADIR%%/keytrans
+%%DATADIR%%/defaultenv
+%%DATADIR%%/VERSION
+%%DATADIR%%/transitions/0.23
+%%DATADIR%%/transitions/README.txt
+%%DATADIR%%/ma/list_certifiers
+%%DATADIR%%/ma/add_certifier
+%%DATADIR%%/ma/update_users
+%%DATADIR%%/ma/setup
+%%DATADIR%%/ma/remove_certifier
+%%DATADIR%%/ma/diagnostics
+%%DATADIR%%/common
+%%DATADIR%%/m/gen_subkey
+%%DATADIR%%/m/ssh_proxycommand
+%%DATADIR%%/m/subkey_to_ssh_agent
+%%DATADIR%%/m/import_subkey
 @unexec if cmp -s %D/etc/monkeysphere/monkeysphere.conf.sample %D/etc/monkeysphere/monkeysphere.conf; then rm -f %D/etc/monkeysphere/monkeysphere.conf; fi
 etc/monkeysphere/monkeysphere.conf.sample
 @exec if [ ! -f %D/etc/monkeysphere/monkeysphere.conf ] ; then cp -p %D/%F %B/monkeysphere.conf; fi
@@ -40,10 +40,10 @@ etc/monkeysphere/monkeysphere-host.conf.sample
 @unexec if cmp -s %D/etc/monkeysphere/monkeysphere-authentication.conf.sample %D/etc/monkeysphere/monkeysphere-authentication.conf; then rm -f %D/etc/monkeysphere/monkeysphere-authentication.conf; fi
 etc/monkeysphere/monkeysphere-authentication.conf.sample
 @exec if [ ! -f %D/etc/monkeysphere/monkeysphere-authentication.conf ] ; then cp -p %D/%F %B/monkeysphere-authentication.conf; fi
-@dirrm share/doc/monkeysphere
-@dirrm share/monkeysphere/transitions
-@dirrm share/monkeysphere/mh
-@dirrm share/monkeysphere/ma
-@dirrm share/monkeysphere/m
-@dirrm share/monkeysphere
+@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/transitions
+@dirrm %%DATADIR%%/mh
+@dirrm %%DATADIR%%/ma
+@dirrm %%DATADIR%%/m
+@dirrm %%DATADIR%%
 @dirrm etc/monkeysphere