freebsd port: changes from anarcat

6 files changed, 46 insertions, 42 deletions

diff --git a/packaging/freebsd/Makefile b/packaging/freebsd/Makefile
index e5e3694..cc3d93f 100644
--- a/packaging/freebsd/Makefile
+++ b/packaging/freebsd/Makefile
@@ -22,7 +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 \
+		/usr/local/bin/getopt:${PORTSDIR}/misc/getopt \
 		bash:${PORTSDIR}/shells/bash
 
 MAN1=		monkeysphere.1 openpgp2ssh.1 monkeysphere-ssh-proxycommand.1
@@ -30,7 +30,7 @@ MAN7=		monkeysphere.7
 MAN8=		monkeysphere-server.8
 MANCOMPRESSED= yes
 
-MAKE_ARGS= ETCPREFIX=/usr/local MANPREFIX=/usr/local/man ETCSUFFIX=.sample
+MAKE_ARGS= ETCPREFIX=${PREFIX} MANPREFIX=${PREFIX}/man ETCSUFFIX=.sample
 
 # get rid of cruft after the patching:
 post-patch:
diff --git a/packaging/freebsd/distinfo b/packaging/freebsd/distinfo
index b8ad49b..3495f1a 100644
--- a/packaging/freebsd/distinfo
+++ b/packaging/freebsd/distinfo
@@ -1,3 +1,3 @@
-MD5 (monkeysphere_0.16~pre.orig.tar.gz) = c5c5211440e31d04df1f7904ec859fb9
-SHA256 (monkeysphere_0.16~pre.orig.tar.gz) = 77faf81cc51dff754ecb7122de26818b908e06ab4e0bdbd0320346dde53612cd
-SIZE (monkeysphere_0.16~pre.orig.tar.gz) = 59253
+MD5 (monkeysphere_0.16~pre.orig.tar.gz) = 6e9489117794fa6afab8935b75cc5ccf
+SHA256 (monkeysphere_0.16~pre.orig.tar.gz) = fceab7cc77d9755e6484895ede56701b298ce3649bfcd10288a12803a565b7e5
+SIZE (monkeysphere_0.16~pre.orig.tar.gz) = 59721
diff --git a/packaging/freebsd/files/patch-etclocation b/packaging/freebsd/files/patch-etclocation
index ebf5c0e..0100a9c 100644
--- a/packaging/freebsd/files/patch-etclocation
+++ b/packaging/freebsd/files/patch-etclocation
@@ -41,16 +41,14 @@ index f207e2c..360408e 100644
  System-wide monkeysphere config file.
  .TP
  /var/lib/monkeysphere/authorized_keys/USER
-diff --git src/common src/common
-index c8a7db6..cb4f8e1 100644
---- src/common
-+++ src/common
+--- 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
--ETC="/etc/monkeysphere"
-+ETC="/usr/local/etc/monkeysphere"
- export ETC
+-SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDIR:-"/etc/monkeysphere"}
++SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDIR:-"/usr/local/etc/monkeysphere"}
+ export SYSCONFIGDIR
  
  ########################################################################
diff --git a/packaging/freebsd/files/patch-sharelocation b/packaging/freebsd/files/patch-sharelocation
index be88e13..99c9604 100644
--- a/packaging/freebsd/files/patch-sharelocation
+++ b/packaging/freebsd/files/patch-sharelocation
@@ -1,26 +1,22 @@
-diff --git src/monkeysphere src/monkeysphere
-index 512d608..44f2b17 100755
---- src/monkeysphere
-+++ src/monkeysphere
+--- 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)
  
--SHARE=${MONKEYSPHERE_SHARE:-"/usr/share/monkeysphere"}
-+SHARE=${MONKEYSPHERE_SHARE:-"/usr/local/share/monkeysphere"}
- export SHARE
- . "${SHARE}/common" || exit 1
+-SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/share/monkeysphere"}
++SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/local/share/monkeysphere"}
+ export SYSSHAREDIR
+ . "${SYSSHAREDIR}/common" || exit 1
  
-diff --git src/monkeysphere-server src/monkeysphere-server
-index 4cda008..e359be7 100755
---- src/monkeysphere-server
-+++ src/monkeysphere-server
+--- 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)
  
--SHARE=${MONKEYSPHERE_SHARE:="/usr/share/monkeysphere"}
-+SHARE=${MONKEYSPHERE_SHARE:="/usr/local/share/monkeysphere"}
- export SHARE
- . "${SHARE}/common" || exit 1
+-SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/share/monkeysphere"}
++SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/local/share/monkeysphere"}
+ export SYSSHAREDIR
+ . "${SYSSHAREDIR}/common" || exit 1
  
diff --git a/packaging/freebsd/files/patch-varlocation b/packaging/freebsd/files/patch-varlocation
index 27f1527..c4d8dcd 100644
--- a/packaging/freebsd/files/patch-varlocation
+++ b/packaging/freebsd/files/patch-varlocation
@@ -42,19 +42,6 @@ index f207e2c..29c7b6a 100644
  Monkeysphere authentication GNUPG home directory.
  
  .SH AUTHOR
-diff --git src/monkeysphere-server src/monkeysphere-server
-index e590f3c..f46e8bb 100755
---- src/monkeysphere-server
-+++ src/monkeysphere-server
-@@ -17,7 +17,7 @@ SHARE=${MONKEYSPHERE_SHARE:="/usr/share/monkeysphere"}
- export SHARE
- . "${SHARE}/common" || exit 1
- 
--VARLIB="/var/lib/monkeysphere"
-+VARLIB="/var/monkeysphere"
- export VARLIB
- 
- # UTC date in ISO 8601 format if needed
 diff --git doc/getting-started-admin.mdwn doc/getting-started-admin.mdwn
 index 6c8ad53..67fdda1 100644
 --- doc/getting-started-admin.mdwn
@@ -77,3 +64,27 @@ index 6c8ad53..67fdda1 100644
  
  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
diff --git a/packaging/freebsd/pkg-plist b/packaging/freebsd/pkg-plist
index 43346c1..04a704a 100644
--- a/packaging/freebsd/pkg-plist
+++ b/packaging/freebsd/pkg-plist
@@ -16,4 +16,3 @@ etc/monkeysphere/monkeysphere-server.conf.sample
 @dirrm share/doc/monkeysphere
 @dirrm share/monkeysphere
 @dirrm etc/monkeysphere
-