updates to FreeBSD port framework

6 files changed, 16 insertions, 31 deletions

diff --git a/packaging/freebsd/Makefile b/packaging/freebsd/Makefile
index c142f70..8a12794 100644
--- a/packaging/freebsd/Makefile
+++ b/packaging/freebsd/Makefile
@@ -1,12 +1,12 @@
-# New ports collection makefile for:   oneko
-# Date created:        5 December 1994
-# Whom:                asami
+# New ports collection makefile for:   monkeysphere
+# Date created:        2008-09-11 23:38:27-0400
+# Whom:                Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=      monkeysphere
-PORTVERSION=   0.14
+PORTVERSION=   0.15
 CATEGORIES=    security
 MASTER_SITES=  http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/
 # hack for debian orig tarballs
@@ -15,7 +15,7 @@ DISTFILES=      ${PORTNAME}_${DISTVERSION}.orig.tar.gz
 # comment this out to test the port
 IGNORE=			this port is not finished yet
 
-MAINTAINER=    anarcat@anarcat.ath.cx
+MAINTAINER=    dkg@fifthhorseman.net
 COMMENT=       use the OpenPGP web of trust to verify ssh connections
 
 LIB_DEPENDS=	gnutls.26:${PORTSDIR}/security/gnutls
@@ -25,9 +25,8 @@ RUN_DEPENDS=    base64:${PORTSDIR}/converters/base64 \
 		bash:${PORTSDIR}/shells/bash
 
 MAN1=		monkeysphere.1 openpgp2ssh.1 monkeysphere-ssh-proxycommand.1
-MAN5=		monkeysphere.5
+MAN7=		monkeysphere.7
 MAN8=		monkeysphere-server.8
 MANCOMPRESSED= yes
-USE_GMAKE=     yes
 
 .include <bsd.port.mk>
diff --git a/packaging/freebsd/TODO b/packaging/freebsd/TODO
index c726aeb..bb65ad7 100644
--- a/packaging/freebsd/TODO
+++ b/packaging/freebsd/TODO
@@ -1,9 +1,4 @@
-This port is not ready yet. Upstream needs to change a few things (or we
-need patches) to work around some dependencies, most notably:
-
- * lockfile-progs (they may use procmail's lockfile prog)
- * moreutils (for sponge)
- * an install target that also respects PREFIX
+This port is not ready yet. 
 
 We also need to create the monkeysphere user in the pkg-install and
 remove it in pkg-deinstall. To do this, this page has useful tips:
diff --git a/packaging/freebsd/distinfo b/packaging/freebsd/distinfo
index 21c7532..f020dd5 100644
--- a/packaging/freebsd/distinfo
+++ b/packaging/freebsd/distinfo
@@ -1,3 +1,3 @@
-MD5 (monkeysphere_0.14.orig.tar.gz) = cff32444de1b327fa18ec4acd64c1406
-SHA256 (monkeysphere_0.14.orig.tar.gz) = 5b27e0c4a21ede0afe682491ddfbdd70eeddae759287d9eb34e51397ced984cb
-SIZE (monkeysphere_0.14.orig.tar.gz) = 55291
+MD5 (monkeysphere_0.15.orig.tar.gz) = 8be275e5b5119921a536d8a67d3bfe24
+SHA256 (monkeysphere_0.15.orig.tar.gz) = 44f3feb6e9f6921d2ed0406af4e3862f67da9261c8f00c7ea37cfea5031cbc77
+SIZE (monkeysphere_0.15.orig.tar.gz) = 59462
diff --git a/packaging/freebsd/files/patch-src-keytrans-makefile b/packaging/freebsd/files/patch-src-keytrans-makefile
deleted file mode 100644
index f6b21fc..0000000
--- a/packaging/freebsd/files/patch-src-keytrans-makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/keytrans/Makefile.orig	2008-08-04 10:52:54.000000000 -0400
-+++ src/keytrans/Makefile	2008-09-04 17:31:18.000000000 -0400
-@@ -4,7 +4,7 @@
- 	gcc -g -Wall --pedantic -o openpgp2ssh openpgp2ssh.c `libgnutls-config --libs --cflags` gnutls-helpers.o
- 
- %.o: %.c
--	gcc -g -Wall --pedantic -o $@ -c $<
-+	gcc -g -Wall --pedantic `libgnutls-config --cflags` -o $@ -c $<
- 
- clean: 
- 	rm -f openpgp2ssh *.o
diff --git a/packaging/freebsd/pkg-descr b/packaging/freebsd/pkg-descr
index a63fcd3..9adc44f 100644
--- a/packaging/freebsd/pkg-descr
+++ b/packaging/freebsd/pkg-descr
@@ -1,5 +1,7 @@
-SSH key-based authentication is tried-and-true, but it lacks a true Public Key Infrastructure for key certification, revocation and
-expiration.  MonkeySphere is a framework that uses the OpenPGP web of trust for these PKI functions.  It can be used in both directions: for
-users to get validated host keys, and for hosts to manage user permissions.
+SSH key-based authentication is tried-and-true, but it lacks a true
+Public Key Infrastructure for key certification, revocation and
+expiration.  Monkeysphere is a framework that uses the OpenPGP web of
+trust for these PKI functions.  It can be used in both directions: for
+users to get validated host keys, and for hosts to authenticate users.
 
 WWW: http://web.monkeysphere.info/
diff --git a/packaging/freebsd/pkg-plist b/packaging/freebsd/pkg-plist
index 48d6395..e54fd56 100644
--- a/packaging/freebsd/pkg-plist
+++ b/packaging/freebsd/pkg-plist
@@ -2,7 +2,7 @@ sbin/monkeysphere-server
 share/doc/monkeysphere/MonkeySpec
 share/doc/monkeysphere/getting-started-user.mdwn
 share/doc/monkeysphere/getting-started-admin.mdwn
-share/man/man5/monkeysphere.5.gz
+share/man/man7/monkeysphere.7.gz
 share/man/man1/openpgp2ssh.1.gz
 share/man/man1/monkeysphere-ssh-proxycommand.1.gz
 share/man/man1/monkeysphere.1.gz