The pkg_create(1) handles symlinks correctly. Delist manpages.

4 files changed, 40 insertions, 84 deletions

diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 123ad708cf68..d13628771ddb 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.60 1998/08/17 10:42:38 vanilla Exp $
+# $Id: Makefile,v 1.61 1998/08/17 12:12:34 vanilla Exp $
 #
 # Maximal ssh package requires YES values for
 # USE_PERL, USE_TCPWRAP
@@ -119,6 +119,8 @@ post-install:
 	ln -sf ssh.1.gz ${PREFIX}/man/man1/slogin.1.gz
 	ln -sf ssh1.1.gz ${PREFIX}/man/man1/slogin1.1.gz
 	ln -sf sshd1.8.gz ${PREFIX}/man/man8/sshd.8.gz
+.else
+	${ECHO} Warning---some manpages not installed.  See port Makefile
 .endif
 	@if [ ! -f ${PREFIX}/etc/rc.d/sshd.sh ]; then \
 		echo "Installing ${PREFIX}/etc/rc.d/sshd.sh startup file."; \
diff --git a/security/ssh/pkg-plist b/security/ssh/pkg-plist
index 47cf444de5dd..c99dd209976f 100644
--- a/security/ssh/pkg-plist
+++ b/security/ssh/pkg-plist
@@ -1,53 +1,29 @@
 etc/rc.d/sshd.sh
 bin/scp1
-@exec ln -fs %f %B/scp
-@unexec rm -f %B/scp
+bin/scp
 bin/ssh1
-@exec ln -fs %f %B/ssh
-@unexec rm -f %B/ssh
-@exec ln -fs %f %B/slogin
-@unexec rm -f %B/slogin
+bin/ssh
+bin/slogin
 bin/ssh-add1
-@exec ln -fs %f %B/ssh-add
-@unexec rm -f %B/ssh-add
+bin/ssh-add
 bin/ssh-agent1
-@exec ln -fs %f %B/ssh-agent
-@unexec rm -f %B/ssh-agent
+bin/ssh-agent
 bin/ssh-askpass1
-@exec ln -fs %f %B/ssh-askpass
-@unexec rm -f %B/ssh-askpass
+bin/ssh-askpass
 bin/ssh-keygen1
-@exec ln -fs %f %B/ssh-keygen
-@unexec rm -f %B/ssh-keygen
+bin/ssh-keygen
 bin/make-ssh-known-hosts1
-@exec ln -fs %f %B/make-ssh-known-hosts
-@unexec rm -f %B/make-ssh-known-hosts
+bin/make-ssh-known-hosts
 etc/ssh_config
 etc/sshd_config
-man/man1/make-ssh-known-hosts1.1.gz
-@exec ln -fs %f %B/make-ssh-known-hosts.1.gz
-@unexec rm -f %B/make-ssh-known-hosts.1.gz
-man/man1/scp1.1.gz
-@exec ln -fs %f %B/scp.1.gz
-@unexec rm -f %B/scp.1.gz
-man/man1/ssh-add1.1.gz
-@exec ln -fs %f %B/ssh-add.1.gz
-@unexec rm -f %B/ssh-add.1.gz
-man/man1/ssh-agent1.1.gz
-@exec ln -fs %f %B/ssh-agent.1.gz
-@unexec rm -f %B/ssh-agent.1.gz
-man/man1/ssh-keygen1.1.gz
-@exec ln -fs %f %B/ssh-keygen.1.gz
-@unexec rm -f %B/ssh-keygen.1.gz
-man/man1/ssh1.1.gz
-@exec ln -fs %f %B/ssh.1.gz
-@unexec rm -f %B/ssh.1.gz
-@exec ln -fs %f %B/slogin.1.gz
-@unexec rm -f %B/slogin.1.gz
-man/man8/sshd1.8.gz
-@exec ln -fs %f %B/sshd.8.gz
-@unexec rm -f %B/sshd.8.gz
+man/man1/make-ssh-known-hosts.1.gz
+man/man1/scp.1.gz
+man/man1/ssh-add.1.gz
+man/man1/ssh-agent.1.gz
+man/man1/ssh-keygen.1.gz
+man/man1/ssh.1.gz
+man/man1/slogin.1.gz
+man/man8/sshd.8.gz
 sbin/sshd1
-@exec ln -fs %f %B/sshd
-@unexec rm -f %B/sshd
+sbin/sshd
 @exec if [ ! -f %D/etc/ssh_host_key ]; then echo "Generating a secret host key.." ; %D/bin/ssh-keygen -N "" -f %D/etc/ssh_host_key; fi
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index 123ad708cf68..d13628771ddb 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.60 1998/08/17 10:42:38 vanilla Exp $
+# $Id: Makefile,v 1.61 1998/08/17 12:12:34 vanilla Exp $
 #
 # Maximal ssh package requires YES values for
 # USE_PERL, USE_TCPWRAP
@@ -119,6 +119,8 @@ post-install:
 	ln -sf ssh.1.gz ${PREFIX}/man/man1/slogin.1.gz
 	ln -sf ssh1.1.gz ${PREFIX}/man/man1/slogin1.1.gz
 	ln -sf sshd1.8.gz ${PREFIX}/man/man8/sshd.8.gz
+.else
+	${ECHO} Warning---some manpages not installed.  See port Makefile
 .endif
 	@if [ ! -f ${PREFIX}/etc/rc.d/sshd.sh ]; then \
 		echo "Installing ${PREFIX}/etc/rc.d/sshd.sh startup file."; \
diff --git a/security/ssh2/pkg-plist b/security/ssh2/pkg-plist
index 47cf444de5dd..c99dd209976f 100644
--- a/security/ssh2/pkg-plist
+++ b/security/ssh2/pkg-plist
@@ -1,53 +1,29 @@
 etc/rc.d/sshd.sh
 bin/scp1
-@exec ln -fs %f %B/scp
-@unexec rm -f %B/scp
+bin/scp
 bin/ssh1
-@exec ln -fs %f %B/ssh
-@unexec rm -f %B/ssh
-@exec ln -fs %f %B/slogin
-@unexec rm -f %B/slogin
+bin/ssh
+bin/slogin
 bin/ssh-add1
-@exec ln -fs %f %B/ssh-add
-@unexec rm -f %B/ssh-add
+bin/ssh-add
 bin/ssh-agent1
-@exec ln -fs %f %B/ssh-agent
-@unexec rm -f %B/ssh-agent
+bin/ssh-agent
 bin/ssh-askpass1
-@exec ln -fs %f %B/ssh-askpass
-@unexec rm -f %B/ssh-askpass
+bin/ssh-askpass
 bin/ssh-keygen1
-@exec ln -fs %f %B/ssh-keygen
-@unexec rm -f %B/ssh-keygen
+bin/ssh-keygen
 bin/make-ssh-known-hosts1
-@exec ln -fs %f %B/make-ssh-known-hosts
-@unexec rm -f %B/make-ssh-known-hosts
+bin/make-ssh-known-hosts
 etc/ssh_config
 etc/sshd_config
-man/man1/make-ssh-known-hosts1.1.gz
-@exec ln -fs %f %B/make-ssh-known-hosts.1.gz
-@unexec rm -f %B/make-ssh-known-hosts.1.gz
-man/man1/scp1.1.gz
-@exec ln -fs %f %B/scp.1.gz
-@unexec rm -f %B/scp.1.gz
-man/man1/ssh-add1.1.gz
-@exec ln -fs %f %B/ssh-add.1.gz
-@unexec rm -f %B/ssh-add.1.gz
-man/man1/ssh-agent1.1.gz
-@exec ln -fs %f %B/ssh-agent.1.gz
-@unexec rm -f %B/ssh-agent.1.gz
-man/man1/ssh-keygen1.1.gz
-@exec ln -fs %f %B/ssh-keygen.1.gz
-@unexec rm -f %B/ssh-keygen.1.gz
-man/man1/ssh1.1.gz
-@exec ln -fs %f %B/ssh.1.gz
-@unexec rm -f %B/ssh.1.gz
-@exec ln -fs %f %B/slogin.1.gz
-@unexec rm -f %B/slogin.1.gz
-man/man8/sshd1.8.gz
-@exec ln -fs %f %B/sshd.8.gz
-@unexec rm -f %B/sshd.8.gz
+man/man1/make-ssh-known-hosts.1.gz
+man/man1/scp.1.gz
+man/man1/ssh-add.1.gz
+man/man1/ssh-agent.1.gz
+man/man1/ssh-keygen.1.gz
+man/man1/ssh.1.gz
+man/man1/slogin.1.gz
+man/man8/sshd.8.gz
 sbin/sshd1
-@exec ln -fs %f %B/sshd
-@unexec rm -f %B/sshd
+sbin/sshd
 @exec if [ ! -f %D/etc/ssh_host_key ]; then echo "Generating a secret host key.." ; %D/bin/ssh-keygen -N "" -f %D/etc/ssh_host_key; fi