2 files changed, 25 insertions, 20 deletions

diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index eb4b96b315ab..b3096612e051 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -15,11 +15,6 @@ COMMENT=	The portable version of OpenBSD's OpenSSH
 
 LICENSE=	BSD
 
-MAN1=	sftp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 scp.1 ssh.1
-MLINKS=	ssh.1 slogin.1
-MAN5=	moduli.5 ssh_config.5 sshd_config.5
-MAN8=	sftp-server.8 sshd.8 ssh-keysign.8 ssh-pkcs11-helper.8
-
 CONFLICTS?=		openssh-3.* ssh-1.* ssh2-3.*
 
 # XXX: ports/52706 will allow using DEFAULT,x509 here.
@@ -30,7 +25,6 @@ USES=			perl5
 USE_PERL5=		build
 USE_AUTOTOOLS=		autoconf autoheader
 USE_OPENSSL=		yes
-NO_STAGE=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV=		ac_cv_func_strnvis=no
 CONFIGURE_ARGS=		--prefix=${PREFIX} --with-md5-passwords \
@@ -62,6 +56,8 @@ HEIMDAL_BASE_DESC=	Heimdal Kerberos (base)
 MIT_DESC=		MIT Kerberos (security/krb5)
 AES_THREADED_DESC=	Threaded AES-CTR [HPN/Experimental]
 
+PLIST_SUB+=		MANPREFIX=${MANPREFIX}
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 900000
@@ -187,7 +183,6 @@ PATCH_SITES+=		http://www.roumenpetrov.info/openssh/x509-${X509_VERSION}/:x509
 PATCHFILES+=		${PORTNAME}-6.2p1+x509-${X509_VERSION}.diff.gz:x509
 PATCH_DIST_STRIP=	-p1
 PLIST_SUB+=		X509=""
-MAN5+=			ssh_engine.5
 .else
 PLIST_SUB+=		X509="@comment "
 .endif
@@ -246,22 +241,15 @@ post-patch:
 		${WRKSRC}/version.h
 .endif
 
-pre-su-install:
-.if !exists(${ETCSSH})
-	@${MKDIR} ${ETCSSH}
-.endif
-.for i in ${PRECIOUS}
-.if exists(${ETCOLD}/${i}) && !exists(${ETCSSH}/${i})
-	@${ECHO_MSG} "==>   Linking ${ETCSSH}/${i} from old layout."
-	${LN} ${ETCOLD}/${i} ${ETCSSH}/${i}
+pre-install:
+# Workaround not running mtree BSD.root.dist on / since PREFIX=/usr
+.if ${PORT_OPTIONS:MOVERWRITE_BASE}
+	${MKDIR} ${STAGEDIR}/etc/rc.d
 .endif
-.endfor
 
 post-install:
-	${INSTALL_DATA} -c ${WRKSRC}/ssh_config.out ${ETCSSH}/ssh_config-dist
-	${INSTALL_DATA} -c ${WRKSRC}/sshd_config.out ${ETCSSH}/sshd_config-dist
-
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_DATA} -c ${WRKSRC}/ssh_config.out ${STAGEDIR}${ETCSSH}/ssh_config-dist
+	${INSTALL_DATA} -c ${WRKSRC}/sshd_config.out ${STAGEDIR}${ETCSSH}/sshd_config-dist
 
 test:	build
 	(cd ${WRKSRC}/regress && ${SETENV} OBJ=${WRKDIR} ${MAKE_ENV} TEST_SHELL=/bin/sh \
diff --git a/security/openssh-portable/pkg-plist b/security/openssh-portable/pkg-plist
index dbc2df02433e..0befbc5b0959 100644
--- a/security/openssh-portable/pkg-plist
+++ b/security/openssh-portable/pkg-plist
@@ -24,3 +24,20 @@ sbin/sshd
 libexec/sftp-server
 libexec/ssh-keysign
 libexec/ssh-pkcs11-helper
+@cwd %%MANPREFIX%%
+man/man1/sftp.1.gz
+man/man1/ssh-add.1.gz
+man/man1/ssh-agent.1.gz
+man/man1/ssh-keygen.1.gz
+man/man1/ssh-keyscan.1.gz
+man/man1/scp.1.gz
+man/man1/ssh.1.gz
+man/man1/slogin.1.gz
+man/man5/moduli.5.gz
+man/man5/ssh_config.5.gz
+man/man5/sshd_config.5.gz
+%%X509%%man/man5/ssh_engine.5.gz
+man/man8/sftp-server.8.gz
+man/man8/sshd.8.gz
+man/man8/ssh-keysign.8.gz
+man/man8/ssh-pkcs11-helper.8.gz