From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 12 Sep 2008 23:20:24 +0000 (-0400)
Subject: make sure that the FreeBSD package is using GNU-style getopt calls.
X-Git-Tag: monkeysphere_0.16-1~57
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c34410402a7e49030666553c731c267e14e9a508;p=monkeysphere.git

make sure that the FreeBSD package is using GNU-style getopt calls.
---

diff --git a/packaging/freebsd/Makefile b/packaging/freebsd/Makefile
index 2bdb283..e5e3694 100644
--- a/packaging/freebsd/Makefile
+++ b/packaging/freebsd/Makefile
@@ -22,6 +22,7 @@ LIB_DEPENDS=	gnutls.26:${PORTSDIR}/security/gnutls
 RUN_DEPENDS=    base64:${PORTSDIR}/converters/base64 \
 		gpg:${PORTSDIR}/security/gnupg \
 		lockfile:${PORTSDIR}/mail/procmail \
+		getopt:${PORTSDIR}/misc/getopt \
 		bash:${PORTSDIR}/shells/bash
 
 MAN1=		monkeysphere.1 openpgp2ssh.1 monkeysphere-ssh-proxycommand.1
diff --git a/packaging/freebsd/distinfo b/packaging/freebsd/distinfo
index 84fa981..1a3b6c5 100644
--- a/packaging/freebsd/distinfo
+++ b/packaging/freebsd/distinfo
@@ -1,3 +1,3 @@
-MD5 (monkeysphere_0.16~pre.orig.tar.gz) = e495b71d28afc36d65217e1935c43535
-SHA256 (monkeysphere_0.16~pre.orig.tar.gz) = c2c3c4203ac28d025e63a2e0683dfbb5ec558e4f061f3c3b1c2b736af2b38ba9
-SIZE (monkeysphere_0.16~pre.orig.tar.gz) = 58501
+MD5 (monkeysphere_0.16~pre.orig.tar.gz) = 7ec79824cf814c618b39e9bf33ff65b1
+SHA256 (monkeysphere_0.16~pre.orig.tar.gz) = bce97a2b2f90bc85b81af374cc0d32dfb23c6b2c1f1b2145f8a4d4a5bb00645b
+SIZE (monkeysphere_0.16~pre.orig.tar.gz) = 58595
diff --git a/src/monkeysphere b/src/monkeysphere
index 36b44dd..089c06e 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -63,7 +63,7 @@ gen_subkey(){
     keyExpire=
 
     # get options
-    TEMP=$(getopt -o l:e: -l length:,expire: -n "$PGRM" -- "$@")
+    TEMP=$(PATH="/usr/local/bin:$PATH" getopt -o l:e: -l length:,expire: -n "$PGRM" -- "$@") || failure "getopt failed!  Does your getopt support GNU-style long options?"
 
     if [ $? != 0 ] ; then
 	exit 1
diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index f4bdd1b..111f777 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -267,7 +267,7 @@ gen_key() {
     revoker=
 
     # get options
-    TEMP=$(getopt -o e:l:r -l expire:,length:,revoker: -n "$PGRM" -- "$@")
+    TEMP=$(PATH="/usr/local/bin:$PATH" getopt -o e:l:r -l expire:,length:,revoker: -n "$PGRM" -- "$@") || failure "getopt failed!  Does your getopt support GNU-style long options?"
 
     if [ $? != 0 ] ; then
 	exit 1
@@ -699,7 +699,7 @@ add_certifier() {
     depth=1
 
     # get options
-    TEMP=$(getopt -o n:t:d: -l domain:,trust:,depth: -n "$PGRM" -- "$@")
+    TEMP=$(PATH="/usr/local/bin:$PATH" getopt -o n:t:d: -l domain:,trust:,depth: -n "$PGRM" -- "$@") || failure "getopt failed!  Does your getopt support GNU-style long options?"
 
     if [ $? != 0 ] ; then
 	exit 1