Date: Sun, 29 Sep 2013 14:51:30 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328701 - head/security/openssh-portable Message-ID: <201309291451.r8TEpUFg035597@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sun Sep 29 14:51:29 2013 New Revision: 328701 URL: http://svnweb.freebsd.org/changeset/ports/328701 Log: Convert to stagedir Modified: head/security/openssh-portable/Makefile head/security/openssh-portable/pkg-plist Modified: head/security/openssh-portable/Makefile ============================================================================== --- head/security/openssh-portable/Makefile Sun Sep 29 14:41:11 2013 (r328700) +++ head/security/openssh-portable/Makefile Sun Sep 29 14:51:29 2013 (r328701) @@ -15,11 +15,6 @@ COMMENT= The portable version of OpenBSD 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 (bas 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.i 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 \ Modified: head/security/openssh-portable/pkg-plist ============================================================================== --- head/security/openssh-portable/pkg-plist Sun Sep 29 14:41:11 2013 (r328700) +++ head/security/openssh-portable/pkg-plist Sun Sep 29 14:51:29 2013 (r328701) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309291451.r8TEpUFg035597>