FreeBSD porting: trying to make sure package cleanup goes smoothly.

diff --git a/packaging/freebsd/security/monkeysphere/Makefile b/packaging/freebsd/security/monkeysphere/Makefile
index ba293eaa62b59c0d4dd8530706b0537de99e8027..b6cacaf91e217a1f1c4461917d2e59b4c2f04e6c 100644 (file)
--- a/packaging/freebsd/security/monkeysphere/Makefile
+++ b/packaging/freebsd/security/monkeysphere/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkey
 # hack for debian orig tarballs
 DISTNAME=      ${PORTNAME}_${DISTVERSION}
 EXTRACT_SUFX=  .orig.tar.gz
+WRKSRC=        work/${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=    dkg@fifthhorseman.net
 COMMENT=       Use the OpenPGP web of trust to verify ssh connections

diff --git a/packaging/freebsd/security/monkeysphere/pkg-plist b/packaging/freebsd/security/monkeysphere/pkg-plist
index b52f99877738c3aacd7b1dc9abe1fee2660d211d..95afa0111dd0df727de11b37c008ca847f9df46c 100644 (file)
--- a/packaging/freebsd/security/monkeysphere/pkg-plist
+++ b/packaging/freebsd/security/monkeysphere/pkg-plist
@@ -7,7 +7,6 @@ share/doc/monkeysphere/getting-started-admin.mdwn
 bin/openpgp2ssh
 bin/pem2openpgp
 bin/monkeysphere
-share/monkeysphere/mh
 share/monkeysphere/mh/publish_key
 share/monkeysphere/mh/import_key
 share/monkeysphere/mh/set_expire
@@ -19,10 +18,8 @@ share/monkeysphere/mh/revoke_key
 share/monkeysphere/keytrans
 share/monkeysphere/defaultenv
 share/monkeysphere/VERSION
-share/monkeysphere/transitions
 share/monkeysphere/transitions/0.23
 share/monkeysphere/transitions/README.txt
-share/monkeysphere/ma
 share/monkeysphere/ma/list_certifiers
 share/monkeysphere/ma/add_certifier
 share/monkeysphere/ma/update_users
@@ -30,7 +27,6 @@ share/monkeysphere/ma/setup
 share/monkeysphere/ma/remove_certifier
 share/monkeysphere/ma/diagnostics
 share/monkeysphere/common
-share/monkeysphere/m
 share/monkeysphere/m/gen_subkey
 share/monkeysphere/m/ssh_proxycommand
 share/monkeysphere/m/subkey_to_ssh_agent
@@ -45,5 +41,9 @@ etc/monkeysphere/monkeysphere-host.conf.sample
 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 etc/monkeysphere