amd64/134706: security/openssh-portable does not compile on amd64 arch

[Alexey Loginov]

>Number:         134706
>Category:       amd64
>Synopsis:       security/openssh-portable does not compile on amd64 arch
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-amd64
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 19 09:50:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Alexey Loginov
>Release:        6.x-7.x
>Organization:
Rambler Internet Holding
>Environment:
>Description:
Because of a wrong order of application of patches, port security/openssh-portable does not compile on amd64 arch.
openssh-portable version: 5.2.p1_1,1
>How-To-Repeat:
On amd64:
cd /usr/ports/security/openssh-portable
make
>Fix:
Apply the included patch

Patch attached with submission follows:

--- Makefile.orig	2009-05-19 12:42:13.165868242 +0400
+++ Makefile	2009-05-19 12:43:10.968663011 +0400
@@ -148,9 +148,6 @@
 # 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-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


>Release-Note:
>Audit-Trail:
>Unformatted: