more packaging shennanigans (nc is available in FreeBSD-7-STABLE by default, apparently)

diff --git a/Makefile b/Makefile
index defd15a03988a11bafb74974245ded918ea8bb3a..a07d7d242ac26351857bea652ff5310a197883af 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -33,17 +33,19 @@ clean:
 # working dir!
 install: all
        mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/sbin $(DESTDIR)$(PREFIX)/share/monkeysphere
-       mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1 $(DESTDIR)$(PREFIX)/share/man/man7 $(DESTDIR)$(PREFIX)/share/man/man8
        mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
        mkdir -p $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere
-       install src/monkeysphere src/monkeysphere-ssh-proxycommand src/keytrans/openpgp2ssh $(DESTDIR)/$(PREFIX)/bin
-       install src/monkeysphere-server $(DESTDIR)/$(PREFIX)/sbin
-       install -m 0644 src/common $(DESTDIR)/$(PREFIX)/share/monkeysphere
+       install src/monkeysphere src/monkeysphere-ssh-proxycommand src/keytrans/openpgp2ssh $(DESTDIR)$(PREFIX)/bin
+       install src/monkeysphere-server $(DESTDIR)$(PREFIX)/sbin
+       install -m 0644 src/common $(DESTDIR)$(PREFIX)/share/monkeysphere
        install doc/* $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
+       install -m 0644 etc/* $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere
+
+installman:
+       mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1 $(DESTDIR)$(PREFIX)/share/man/man7 $(DESTDIR)$(PREFIX)/share/man/man8
        install man/man1/* $(DESTDIR)$(PREFIX)/share/man/man1
        install man/man7/* $(DESTDIR)$(PREFIX)/share/man/man7
        install man/man8/* $(DESTDIR)$(PREFIX)/share/man/man8
-       install -m 0644 etc/* $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere
 
 releasenote:
        ./utils/build-releasenote

diff --git a/debian/monkeysphere.manpages b/debian/monkeysphere.manpages
new file mode 100644 (file)
index 0000000..1490566
--- /dev/null
+++ b/debian/monkeysphere.manpages
@@ -0,0 +1,5 @@
+man/man1/monkeysphere.1
+man/man1/openpgp2ssh.1
+man/man1/monkeysphere-ssh-proxycommand.1
+man/man7/monkeysphere.7
+man/man8/monkeysphere-server.8

diff --git a/packaging/freebsd/Makefile b/packaging/freebsd/Makefile
index 8a12794958de3b592717acc5b9d5c3655b5853c1..5b96f7aea228f90582aaf4810866bcea04f7512c 100644 (file)
--- a/packaging/freebsd/Makefile
+++ b/packaging/freebsd/Makefile
@@ -21,7 +21,6 @@ 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/gnupg \
-               nc:${PORTSDIR}/net/netcat \
                bash:${PORTSDIR}/shells/bash
 
 MAN1=          monkeysphere.1 openpgp2ssh.1 monkeysphere-ssh-proxycommand.1
@@ -29,4 +28,6 @@ MAN7=         monkeysphere.7
 MAN8=          monkeysphere-server.8
 MANCOMPRESSED= yes
 
+ETCPREFIX = /usr/local
+
 .include <bsd.port.mk>

diff --git a/packaging/freebsd/pkg-plist b/packaging/freebsd/pkg-plist
index e54fd56dcadce4eebc64859a0e23751e29511fdb..70a9b1175c716452874c508a6a7a33ebfe8a5646 100644 (file)
--- a/packaging/freebsd/pkg-plist
+++ b/packaging/freebsd/pkg-plist
@@ -1,19 +1,15 @@
 sbin/monkeysphere-server
+share/doc/monkeysphere/TODO
 share/doc/monkeysphere/MonkeySpec
 share/doc/monkeysphere/getting-started-user.mdwn
 share/doc/monkeysphere/getting-started-admin.mdwn
-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
-share/man/man8/monkeysphere-server.8.gz
 bin/openpgp2ssh
 bin/monkeysphere-ssh-proxycommand
 bin/monkeysphere
+share/monkeysphere/common
 etc/monkeysphere/monkeysphere-server.conf
 etc/monkeysphere/monkeysphere.conf
 @dirrm share/doc/monkeysphere
-@dirrm share/monkeysphere/common
+@dirrm share/monkeysphere
 @dirrm etc/monkeysphere
-#@dirrm var/lib/monkeysphere
-#lib/monkeysphere/authorized_keys
+