From 6b4f7702969176aad8e587f3fe39dabc0a458134 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 9 Mar 2009 22:02:17 -0400
Subject: updating FreeBSD port for 0.24

---
 packaging/freebsd/security/monkeysphere/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packaging/freebsd/security/monkeysphere/Makefile')

diff --git a/packaging/freebsd/security/monkeysphere/Makefile b/packaging/freebsd/security/monkeysphere/Makefile
index 24f9b2b..7049aba 100644
--- a/packaging/freebsd/security/monkeysphere/Makefile
+++ b/packaging/freebsd/security/monkeysphere/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=      monkeysphere
-PORTVERSION=   0.22
+PORTVERSION=   0.24
 CATEGORIES=    security
 MASTER_SITES=  http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/
 # hack for debian orig tarballs
-- 
cgit v1.2.3


From 02ef7e000ee2ed085135905c7fecf2a342ae7fc5 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 9 Mar 2009 22:39:41 -0400
Subject: update freebsd Makefile to reflect reorganization of Monkeysphere,
 and transition to perl.

---
 packaging/freebsd/security/monkeysphere/Makefile | 26 ++++++++++--------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'packaging/freebsd/security/monkeysphere/Makefile')

diff --git a/packaging/freebsd/security/monkeysphere/Makefile b/packaging/freebsd/security/monkeysphere/Makefile
index 7049aba..f625db6 100644
--- a/packaging/freebsd/security/monkeysphere/Makefile
+++ b/packaging/freebsd/security/monkeysphere/Makefile
@@ -15,16 +15,15 @@ DISTFILES=      ${PORTNAME}_${DISTVERSION}.orig.tar.gz
 MAINTAINER=    dkg@fifthhorseman.net
 COMMENT=       use the OpenPGP web of trust to verify ssh connections
 
-LIB_DEPENDS=	gnutls.26:${PORTSDIR}/security/gnutls
-RUN_DEPENDS=    base64:${PORTSDIR}/converters/base64 \
-		gpg:${PORTSDIR}/security/gnupg1 \
+RUN_DEPENDS=    gpg:${PORTSDIR}/security/gnupg1 \
 		lockfile:${PORTSDIR}/mail/procmail \
-		/usr/local/bin/getopt:${PORTSDIR}/misc/getopt \
-		bash:${PORTSDIR}/shells/bash
+		bash:${PORTSDIR}/shells/bash \
+		${SITE_PERL}/${PERL_ARCH}/Crypt/OpenSSL/RSA.pm:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
+		${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
 
-MAN1=		monkeysphere.1 openpgp2ssh.1 monkeysphere-ssh-proxycommand.1
+MAN1=		monkeysphere.1 openpgp2ssh.1 pem2openpgp.1
 MAN7=		monkeysphere.7
-MAN8=		monkeysphere-server.8
+MAN8=		monkeysphere-host.8 monkeysphere-authentication.8
 MANCOMPRESSED= yes
 
 MAKE_ARGS= ETCPREFIX=${PREFIX} MANPREFIX=${PREFIX}/man ETCSUFFIX=.sample
@@ -34,17 +33,14 @@ post-patch:
 	find . -iname '*.orig' -delete
 
 post-install:
-	@if [ ! -f ${PREFIX}/etc/monkeysphere/gnupg-host.conf ]; then \
-		${CP} -p ${PREFIX}/etc/monkeysphere/gnupg-host.conf.sample ${PREFIX}/etc/monkeysphere/gnupg-host.conf ; \
-	fi
-	@if [ ! -f ${PREFIX}/etc/monkeysphere/gnupg-authentication.conf ]; then \
-		${CP} -p ${PREFIX}/etc/monkeysphere/gnupg-authentication.conf.sample ${PREFIX}/etc/monkeysphere/gnupg-authentication.conf ; \
-	fi
 	@if [ ! -f ${PREFIX}/etc/monkeysphere/monkeysphere.conf ]; then \
 		${CP} -p ${PREFIX}/etc/monkeysphere/monkeysphere.conf.sample ${PREFIX}/etc/monkeysphere/monkeysphere.conf ; \
 	fi
-	@if [ ! -f ${PREFIX}/etc/monkeysphere/monkeysphere-server.conf ]; then \
-		${CP} -p ${PREFIX}/etc/monkeysphere/monkeysphere-server.conf.sample ${PREFIX}/etc/monkeysphere/monkeysphere-server.conf ; \
+	@if [ ! -f ${PREFIX}/etc/monkeysphere/monkeysphere-host.conf ]; then \
+		${CP} -p ${PREFIX}/etc/monkeysphere/monkeysphere-host.conf.sample ${PREFIX}/etc/monkeysphere/monkeysphere-host.conf ; \
+	fi
+	@if [ ! -f ${PREFIX}/etc/monkeysphere/monkeysphere-authentication.conf ]; then \
+		${CP} -p ${PREFIX}/etc/monkeysphere/monkeysphere-authentication.conf.sample ${PREFIX}/etc/monkeysphere/monkeysphere-authentication.conf ; \
 	fi
 .if !defined(PACKAGE_BUILDING)
 	@${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-- 
cgit v1.2.3


From e63549bb6a927d737546a74ba8a912a9b60c979e Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 10 Mar 2009 00:43:04 -0400
Subject: FreeBSD porting: using in-place sed to replace paths.  Using
 pack("%32U",...) for checksum, which seems to work for both perl 5.8 and 5.10

---
 packaging/freebsd/security/monkeysphere/Makefile   | 19 ++++-
 .../security/monkeysphere/files/patch-etclocation  | 54 -------------
 .../monkeysphere/files/patch-sharelocation         | 33 --------
 .../monkeysphere/files/patch-src_share_keytrans    | 11 +++
 .../security/monkeysphere/files/patch-varlocation  | 90 ----------------------
 5 files changed, 28 insertions(+), 179 deletions(-)
 delete mode 100644 packaging/freebsd/security/monkeysphere/files/patch-etclocation
 delete mode 100644 packaging/freebsd/security/monkeysphere/files/patch-sharelocation
 create mode 100644 packaging/freebsd/security/monkeysphere/files/patch-src_share_keytrans
 delete mode 100644 packaging/freebsd/security/monkeysphere/files/patch-varlocation

(limited to 'packaging/freebsd/security/monkeysphere/Makefile')

diff --git a/packaging/freebsd/security/monkeysphere/Makefile b/packaging/freebsd/security/monkeysphere/Makefile
index f625db6..46a1d01 100644
--- a/packaging/freebsd/security/monkeysphere/Makefile
+++ b/packaging/freebsd/security/monkeysphere/Makefile
@@ -28,9 +28,24 @@ MANCOMPRESSED= yes
 
 MAKE_ARGS= ETCPREFIX=${PREFIX} MANPREFIX=${PREFIX}/man ETCSUFFIX=.sample
 
-# get rid of cruft after the patching:
+# use proper system paths for FreeBSD instead of debian's:
 post-patch:
-	find . -iname '*.orig' -delete
+	@${REINPLACE_CMD} -e 's|/etc/monkeysphere|/usr/local/etc/monkeysphere|g' \
+	  ${WRKSRC}/src/share/defaultenv \
+	  ${WRKSRC}/src/transitions/0.23 \
+	  ${WRKSRC}/man/man1/monkeysphere.1 \
+	  ${WRKSRC}/man/man8/monkeysphere-authentication.8 \
+	  ${WRKSRC}/man/man8/monkeysphere-host.8 \
+	  ${WRKSRC}/etc/monkeysphere-authentication.conf
+	@${REINPLACE_CMD} -e 's|/var/lib/monkeysphere|/var/monkeysphere|g' \
+	  ${WRKSRC}/src/transitions/0.23 \
+	  ${WRKSRC}/man/man1/monkeysphere.1 \
+	  ${WRKSRC}/man/man8/monkeysphere-authentication.8 \
+	  ${WRKSRC}/man/man8/monkeysphere-host.8 \
+	  ${WRKSRC}/src/monkeysphere-host \
+	  ${WRKSRC}/src/monkeysphere-authentication \
+	  ${WRKSRC}/doc/getting-started-admin.mdwn
+
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/monkeysphere/monkeysphere.conf ]; then \
diff --git a/packaging/freebsd/security/monkeysphere/files/patch-etclocation b/packaging/freebsd/security/monkeysphere/files/patch-etclocation
deleted file mode 100644
index 2ab3ac0..0000000
--- a/packaging/freebsd/security/monkeysphere/files/patch-etclocation
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git etc/monkeysphere-server.conf etc/monkeysphere-server.conf
-index c001f2d..d33fd36 100644
---- etc/monkeysphere-server.conf
-+++ etc/monkeysphere-server.conf
-@@ -17,7 +17,7 @@
- # authorized_keys file.  '%h' will be replaced by the home directory
- # of the user, and %u will be replaced by the username of the user.
- # For purely admin-controlled authorized_user_ids, you might put them
--# in /etc/monkeysphere/authorized_user_ids/%u, for instance.
-+# in /usr/local/etc/monkeysphere/authorized_user_ids/%u, for instance.
- #AUTHORIZED_USER_IDS="%h/.monkeysphere/authorized_user_ids"
- 
- # Whether to add user controlled authorized_keys file to
-diff --git man/man1/monkeysphere.1 man/man1/monkeysphere.1
-index 3ece735..09320d2 100644
---- man/man1/monkeysphere.1
-+++ man/man1/monkeysphere.1
-@@ -111,7 +111,7 @@ Path to ssh authorized_keys file (~/.ssh/authorized_keys).
- ~/.monkeysphere/monkeysphere.conf
- User monkeysphere config file.
- .TP
--/etc/monkeysphere/monkeysphere.conf
-+/usr/local/etc/monkeysphere/monkeysphere.conf
- System-wide monkeysphere config file.
- .TP
- ~/.monkeysphere/authorized_user_ids
-diff --git man/man8/monkeysphere-server.8 man/man8/monkeysphere-server.8
-index f207e2c..360408e 100644
---- man/man8/monkeysphere-server.8
-+++ man/man8/monkeysphere-server.8
-@@ -203,10 +203,10 @@ User to control authentication keychain (monkeysphere).
- .SH FILES
- 
- .TP
--/etc/monkeysphere/monkeysphere-server.conf
-+/usr/local/etc/monkeysphere/monkeysphere-server.conf
- System monkeysphere-server config file.
- .TP
--/etc/monkeysphere/monkeysphere.conf
-+/usr/local/etc/monkeysphere/monkeysphere.conf
- System-wide monkeysphere config file.
- .TP
- /var/lib/monkeysphere/authorized_keys/USER
---- src/common.orig	2008-10-12 14:58:00.000000000 -0400
-+++ src/common	2008-10-25 17:40:34.000000000 -0400
-@@ -16,7 +16,7 @@
- ### COMMON VARIABLES
- 
- # managed directories
--SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDIR:-"/etc/monkeysphere"}
-+SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDIR:-"/usr/local/etc/monkeysphere"}
- export SYSCONFIGDIR
- 
- ########################################################################
diff --git a/packaging/freebsd/security/monkeysphere/files/patch-sharelocation b/packaging/freebsd/security/monkeysphere/files/patch-sharelocation
deleted file mode 100644
index e41c479..0000000
--- a/packaging/freebsd/security/monkeysphere/files/patch-sharelocation
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/monkeysphere.orig	2008-10-12 14:58:00.000000000 -0400
-+++ src/monkeysphere	2008-10-25 17:41:41.000000000 -0400
-@@ -13,7 +13,7 @@
- ########################################################################
- PGRM=$(basename $0)
- 
--SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/share/monkeysphere"}
-+SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/local/share/monkeysphere"}
- export SYSSHAREDIR
- . "${SYSSHAREDIR}/common" || exit 1
- 
---- src/monkeysphere-server.orig	2008-10-25 14:17:50.000000000 -0400
-+++ src/monkeysphere-server	2008-10-25 17:42:50.000000000 -0400
-@@ -13,7 +13,7 @@
- ########################################################################
- PGRM=$(basename $0)
- 
--SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/share/monkeysphere"}
-+SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/local/share/monkeysphere"}
- export SYSSHAREDIR
- . "${SYSSHAREDIR}/common" || exit 1
- 
---- src/monkeysphere-ssh-proxycommand.orig
-+++ src/monkeysphere-ssh-proxycommand
-@@ -16,7 +16,7 @@
- ########################################################################
- PGRM=$(basename $0)
- 
--SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/share/monkeysphere"}
-+SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/local/share/monkeysphere"}
- export SYSSHAREDIR
- . "${SYSSHAREDIR}/common" || exit 1
- 
diff --git a/packaging/freebsd/security/monkeysphere/files/patch-src_share_keytrans b/packaging/freebsd/security/monkeysphere/files/patch-src_share_keytrans
new file mode 100644
index 0000000..9d584ac
--- /dev/null
+++ b/packaging/freebsd/security/monkeysphere/files/patch-src_share_keytrans
@@ -0,0 +1,11 @@
+--- src/share/keytrans	2009-03-01 13:39:50.000000000 -0500
++++ src/share/keytrans	2009-03-10 00:39:53.681890554 -0400
+@@ -199,7 +199,7 @@
+ sub simple_checksum {
+   my $bytes = shift;
+ 
+-  return unpack("%32W*",$bytes) % 65536;
++  return unpack("%32U*",$bytes) % 65536;
+ }
+ 
+ # calculate the multiplicative inverse of a mod b this is euclid's
diff --git a/packaging/freebsd/security/monkeysphere/files/patch-varlocation b/packaging/freebsd/security/monkeysphere/files/patch-varlocation
deleted file mode 100644
index c4d8dcd..0000000
--- a/packaging/freebsd/security/monkeysphere/files/patch-varlocation
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git man/man8/monkeysphere-server.8 man/man8/monkeysphere-server.8
-index f207e2c..29c7b6a 100644
---- man/man8/monkeysphere-server.8
-+++ man/man8/monkeysphere-server.8
-@@ -128,7 +128,7 @@ command to push the key to a keyserver.  You must also modify the
- sshd_config on the server to tell sshd where the new server host key
- is located:
- 
--HostKey /var/lib/monkeysphere/ssh_host_rsa_key
-+HostKey /var/monkeysphere/ssh_host_rsa_key
- 
- In order for users logging into the system to be able to verify the
- host via the monkeysphere, at least one person (e.g. a server admin)
-@@ -170,7 +170,7 @@ users.  You must also tell sshd to look at the monkeysphere-generated
- authorized_keys file for user authentication by setting the following
- in the sshd_config:
- 
--AuthorizedKeysFile /var/lib/monkeysphere/authorized_keys/%u
-+AuthorizedKeysFile /var/monkeysphere/authorized_keys/%u
- 
- It is recommended to add "monkeysphere-server update-users" to a
- system crontab, so that user keys are kept up-to-date, and key
-@@ -209,17 +209,17 @@ System monkeysphere-server config file.
- /etc/monkeysphere/monkeysphere.conf
- System-wide monkeysphere config file.
- .TP
--/var/lib/monkeysphere/authorized_keys/USER
-+/var/monkeysphere/authorized_keys/USER
- Monkeysphere-generated user authorized_keys files.
- .TP
--/var/lib/monkeysphere/ssh_host_rsa_key
-+/var/monkeysphere/ssh_host_rsa_key
- Copy of the host's private key in ssh format, suitable for use by
- sshd.
- .TP
--/var/lib/monkeysphere/gnupg-host
-+/var/monkeysphere/gnupg-host
- Monkeysphere host GNUPG home directory.
- .TP
--/var/lib/monkeysphere/gnupg-authentication
-+/var/monkeysphere/gnupg-authentication
- Monkeysphere authentication GNUPG home directory.
- 
- .SH AUTHOR
-diff --git doc/getting-started-admin.mdwn doc/getting-started-admin.mdwn
-index 6c8ad53..67fdda1 100644
---- doc/getting-started-admin.mdwn
-+++ doc/getting-started-admin.mdwn
-@@ -30,7 +30,7 @@ To use the newly-generated host key for ssh connections, put the
- following line in `/etc/ssh/sshd_config` (be sure to remove references
- to any other keys):
- 
--	HostKey /var/lib/monkeysphere/ssh_host_rsa_key
-+	HostKey /var/monkeysphere/ssh_host_rsa_key
- 
- FIXME: should we just suggest symlinks in the filesystem here instead?
- 
-@@ -40,7 +40,7 @@ To enable users to use the monkeysphere to authenticate using the
- OpenPGP web of trust, add this line to `/etc/ssh/sshd_config` (again,
- making sure that no other AuthorizedKeysFile directive exists):
- 
--	AuthorizedKeysFile /var/lib/monkeysphere/authorized_keys/%u
-+	AuthorizedKeysFile /var/monkeysphere/authorized_keys/%u
- 
- And then read the section below about how to ensure these files are
- maintained.  You'll need to restart `sshd` to have your changes take
---- src/monkeysphere-server.orig	2008-10-25 18:01:19.000000000 -0400
-+++ src/monkeysphere-server	2008-10-25 18:01:24.000000000 -0400
-@@ -17,7 +17,7 @@
- export SYSSHAREDIR
- . "${SYSSHAREDIR}/common" || exit 1
- 
--SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"/var/lib/monkeysphere"}
-+SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"/var/monkeysphere"}
- export SYSDATADIR
- 
- # UTC date in ISO 8601 format if needed
---- etc/gnupg-authentication.conf.orig	2008-10-25 18:02:58.000000000 -0400
-+++ etc/gnupg-authentication.conf	2008-10-25 18:03:04.000000000 -0400
-@@ -4,8 +4,8 @@
- # It is highly recommended that you
- #    DO NOT MODIFY
- # these variables.
--primary-keyring /var/lib/monkeysphere/gnupg-authentication/pubring.gpg
--keyring /var/lib/monkeysphere/gnupg-host/pubring.gpg
-+primary-keyring /var/monkeysphere/gnupg-authentication/pubring.gpg
-+keyring /var/monkeysphere/gnupg-host/pubring.gpg
- 
- # PGP keyserver to use for PGP queries.
- keyserver hkp://pgp.mit.edu
-- 
cgit v1.2.3


From 4be67d246780ed85bc45c730f374100949fa61e9 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 10 Mar 2009 00:44:29 -0400
Subject: FreeBSD porting: do one more path translation.

---
 packaging/freebsd/security/monkeysphere/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'packaging/freebsd/security/monkeysphere/Makefile')

diff --git a/packaging/freebsd/security/monkeysphere/Makefile b/packaging/freebsd/security/monkeysphere/Makefile
index 46a1d01..c54f56c 100644
--- a/packaging/freebsd/security/monkeysphere/Makefile
+++ b/packaging/freebsd/security/monkeysphere/Makefile
@@ -45,7 +45,10 @@ post-patch:
 	  ${WRKSRC}/src/monkeysphere-host \
 	  ${WRKSRC}/src/monkeysphere-authentication \
 	  ${WRKSRC}/doc/getting-started-admin.mdwn
-
+	@${REINPLACE_CMD} -e 's|/usr/share/monkeysphere|/usr/local/share/monkeysphere|g' \
+	  ${WRKSRC}/src/monkeysphere-host \
+	  ${WRKSRC}/src/monkeysphere-authentication \
+	  ${WRKSRC}/src/monkeysphere
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/monkeysphere/monkeysphere.conf ]; then \
-- 
cgit v1.2.3


From 9e9966f07914d394771aa33900f5b86576318a23 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 10 Mar 2009 01:08:59 -0400
Subject: FreeBSD: clean up some portlint warnings.

---
 packaging/freebsd/security/monkeysphere/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'packaging/freebsd/security/monkeysphere/Makefile')

diff --git a/packaging/freebsd/security/monkeysphere/Makefile b/packaging/freebsd/security/monkeysphere/Makefile
index c54f56c..4fad979 100644
--- a/packaging/freebsd/security/monkeysphere/Makefile
+++ b/packaging/freebsd/security/monkeysphere/Makefile
@@ -10,10 +10,11 @@ PORTVERSION=   0.24
 CATEGORIES=    security
 MASTER_SITES=  http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/
 # hack for debian orig tarballs
-DISTFILES=      ${PORTNAME}_${DISTVERSION}.orig.tar.gz
+DISTNAME=      ${PORTNAME}_${DISTVERSION}
+EXTRACT_SUFX=  .orig.tar.gz
 
 MAINTAINER=    dkg@fifthhorseman.net
-COMMENT=       use the OpenPGP web of trust to verify ssh connections
+COMMENT=       Use the OpenPGP web of trust to verify ssh connections
 
 RUN_DEPENDS=    gpg:${PORTSDIR}/security/gnupg1 \
 		lockfile:${PORTSDIR}/mail/procmail \
-- 
cgit v1.2.3


From e6c5dca14f7e694d77621e671202464bba41666a Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 10 Mar 2009 01:18:16 -0400
Subject: FreeBSD packaging: use tabs for variable declarations in Makefile

---
 packaging/freebsd/security/monkeysphere/Makefile | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'packaging/freebsd/security/monkeysphere/Makefile')

diff --git a/packaging/freebsd/security/monkeysphere/Makefile b/packaging/freebsd/security/monkeysphere/Makefile
index 4fad979..ba293ea 100644
--- a/packaging/freebsd/security/monkeysphere/Makefile
+++ b/packaging/freebsd/security/monkeysphere/Makefile
@@ -5,18 +5,18 @@
 # $FreeBSD$
 #
 
-PORTNAME=      monkeysphere
-PORTVERSION=   0.24
-CATEGORIES=    security
-MASTER_SITES=  http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/
+PORTNAME=	monkeysphere
+PORTVERSION=	0.24
+CATEGORIES=	security
+MASTER_SITES=	http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/
 # hack for debian orig tarballs
-DISTNAME=      ${PORTNAME}_${DISTVERSION}
-EXTRACT_SUFX=  .orig.tar.gz
+DISTNAME=	${PORTNAME}_${DISTVERSION}
+EXTRACT_SUFX=	.orig.tar.gz
 
-MAINTAINER=    dkg@fifthhorseman.net
-COMMENT=       Use the OpenPGP web of trust to verify ssh connections
+MAINTAINER=	dkg@fifthhorseman.net
+COMMENT=	Use the OpenPGP web of trust to verify ssh connections
 
-RUN_DEPENDS=    gpg:${PORTSDIR}/security/gnupg1 \
+RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg1 \
 		lockfile:${PORTSDIR}/mail/procmail \
 		bash:${PORTSDIR}/shells/bash \
 		${SITE_PERL}/${PERL_ARCH}/Crypt/OpenSSL/RSA.pm:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA \
@@ -25,9 +25,9 @@ RUN_DEPENDS=    gpg:${PORTSDIR}/security/gnupg1 \
 MAN1=		monkeysphere.1 openpgp2ssh.1 pem2openpgp.1
 MAN7=		monkeysphere.7
 MAN8=		monkeysphere-host.8 monkeysphere-authentication.8
-MANCOMPRESSED= yes
+MANCOMPRESSED=	yes
 
-MAKE_ARGS= ETCPREFIX=${PREFIX} MANPREFIX=${PREFIX}/man ETCSUFFIX=.sample
+MAKE_ARGS=	ETCPREFIX=${PREFIX} MANPREFIX=${PREFIX}/man ETCSUFFIX=.sample
 
 # use proper system paths for FreeBSD instead of debian's:
 post-patch:
-- 
cgit v1.2.3


From 53c9fcabe2881cbb7e231ab9ec7270e54a211845 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 10 Mar 2009 02:07:15 -0400
Subject: FreeBSD porting: trying to make sure package cleanup goes smoothly.

---
 packaging/freebsd/security/monkeysphere/Makefile  | 1 +
 packaging/freebsd/security/monkeysphere/pkg-plist | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'packaging/freebsd/security/monkeysphere/Makefile')

diff --git a/packaging/freebsd/security/monkeysphere/Makefile b/packaging/freebsd/security/monkeysphere/Makefile
index ba293ea..b6cacaf 100644
--- 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 b52f998..95afa01 100644
--- 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
-- 
cgit v1.2.3


From 309e0854c96d9f2702fec433af049ad7d41d8e71 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 10 Mar 2009 02:14:36 -0400
Subject: FreeBSD packaging: make sure to clean up cruft after in-place sed
 replacement.

---
 packaging/freebsd/security/monkeysphere/Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'packaging/freebsd/security/monkeysphere/Makefile')

diff --git a/packaging/freebsd/security/monkeysphere/Makefile b/packaging/freebsd/security/monkeysphere/Makefile
index b6cacaf..f2484b5 100644
--- a/packaging/freebsd/security/monkeysphere/Makefile
+++ b/packaging/freebsd/security/monkeysphere/Makefile
@@ -51,6 +51,8 @@ post-patch:
 	  ${WRKSRC}/src/monkeysphere-host \
 	  ${WRKSRC}/src/monkeysphere-authentication \
 	  ${WRKSRC}/src/monkeysphere
+	# and clean up cruft from the sed replacements:
+	find ${WRKSRC} -name '*.bak' -delete
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/monkeysphere/monkeysphere.conf ]; then \
-- 
cgit v1.2.3


From 69b3e256e2017d5664ef37d06aae5e5bcf446575 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 10 Mar 2009 02:33:29 -0400
Subject: FreeBSD packaging: revert to simpler hack for debian tarballs; use
 ${FIND} instead of find

---
 packaging/freebsd/security/monkeysphere/Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'packaging/freebsd/security/monkeysphere/Makefile')

diff --git a/packaging/freebsd/security/monkeysphere/Makefile b/packaging/freebsd/security/monkeysphere/Makefile
index f2484b5..65d71f4 100644
--- a/packaging/freebsd/security/monkeysphere/Makefile
+++ b/packaging/freebsd/security/monkeysphere/Makefile
@@ -10,9 +10,7 @@ PORTVERSION=	0.24
 CATEGORIES=	security
 MASTER_SITES=	http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/
 # hack for debian orig tarballs
-DISTNAME=	${PORTNAME}_${DISTVERSION}
-EXTRACT_SUFX=	.orig.tar.gz
-WRKSRC=	work/${PORTNAME}-${DISTVERSION}
+DISTFILES=	${PORTNAME}_${DISTVERSION}.orig.tar.gz
 
 MAINTAINER=	dkg@fifthhorseman.net
 COMMENT=	Use the OpenPGP web of trust to verify ssh connections
@@ -52,7 +50,7 @@ post-patch:
 	  ${WRKSRC}/src/monkeysphere-authentication \
 	  ${WRKSRC}/src/monkeysphere
 	# and clean up cruft from the sed replacements:
-	find ${WRKSRC} -name '*.bak' -delete
+	${FIND} ${WRKSRC} -name '*.bak' -delete
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/monkeysphere/monkeysphere.conf ]; then \
-- 
cgit v1.2.3