aboutsummaryrefslogtreecommitdiffstats
path: root/security/openssh-portable
diff options
context:
space:
mode:
authorosa <osa@FreeBSD.org>2009-05-19 18:13:28 +0800
committerosa <osa@FreeBSD.org>2009-05-19 18:13:28 +0800
commit6a93090f665f6c1a227dcf77f214115e179cd371 (patch)
tree4b42b6e7d3464e594872d360dacb85f499f513e5 /security/openssh-portable
parentf86374f899be9e94d1c80f43849c0011ccea6718 (diff)
downloadfreebsd-ports-gnome-6a93090f665f6c1a227dcf77f214115e179cd371.tar.gz
freebsd-ports-gnome-6a93090f665f6c1a227dcf77f214115e179cd371.tar.zst
freebsd-ports-gnome-6a93090f665f6c1a227dcf77f214115e179cd371.zip
Fix build with WITH_LPK support for amd64 by change extra patches order.
Do not bump PORTREVISION. Submitted by: Fedor Dikarev aka fe at rambler dash co dot ru Spotted by: maxim Approved by: maintainer unavailable, i.e. $ whois dindin.ru | grep ^state state: REGISTERED, NOT DELEGATED PR: amd64/134706
Diffstat (limited to 'security/openssh-portable')
-rw-r--r--security/openssh-portable/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index e4ced895533e..fee42364e87f 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -148,9 +148,6 @@ EXTRA_PATCHES+= ${FILESDIR}/openssh-5.2p1-hpn.patch
# See http://dev.inversepath.com/trac/openssh-lpk
.if defined(WITH_LPK)
EXTRA_PATCHES+= ${FILESDIR}/openssh-lpk-5.0p1-0.3.9.patch
-.if ${ARCH} == "amd64"
-EXTRA_PATCHES+= ${FILESDIR}/openssh-lpk-5.0p1-64bit.patch
-.endif
USE_OPENLDAP= yes
CPPFLAGS+= "-I${LOCALBASE}/include -DWITH_LDAP_PUBKEY"
CONFIGURE_ARGS+= --with-libs='-lldap' --with-ldflags='-L${LOCALBASE}/lib' \
@@ -167,6 +164,10 @@ EXTRA_PATCHES+= ${FILESDIR}/openssh-5.2p1-hpn-servconf.patch
EXTRA_PATCHES+= ${FILESDIR}/openssh-lpk-5.0p1-0.3.9-servconv.patch
.endif
+.if defined(WITH_LPK) && ${ARCH} == "amd64"
+EXTRA_PATCHES+= ${FILESDIR}/openssh-lpk-5.0p1-64bit.patch
+.endif
+
# See http://www.roumenpetrov.info/openssh/
.if defined(WITH_X509)
PATCH_DIST_STRIP= -p1