From 2aa0972ca88d2588fce9e0315caed050f020feb9 Mon Sep 17 00:00:00 2001
From: steve <steve@FreeBSD.org>
Date: Mon, 15 Mar 1999 01:18:49 +0000
Subject: Re-order definition of a couple of variables so the ssh1 dependency
 is picked up correctly.

PR:		10577
Submitted by:	maintainer
---
 security/ssh2/Makefile | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'security/ssh2')

diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index e8965b12fdfe..a6a201d9e3c4 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 Oct 1998
 # Whom:			Issei Suzuki <issei@jp.FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.75 1998/12/01 11:10:33 obrien Exp $
+# $Id: Makefile,v 1.78 1999/02/06 01:40:28 ache Exp $
 #
 # Maximal ssh2 package requires YES values for
 # USE_SSH1, USE_TCPWRAP
@@ -24,22 +24,27 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --with-etcdir=${PREFIX}/etc --enable-debug
 #Uncomment if all your users are in their own group and their homedir
 #is writeable by that group.  Beware the security implications!
 #CONFIGURE_ARGS+= --enable-group-writeability
-#
+
 # Include support for ssh1 client backward compatibility
+USE_SSH1?=	YES
+# Include tcp_wrappers support
+USE_TCPWRAP?=	NO
+# Warning: untested !
+# Include support for the TIS authentication server
+USE_TIS?=	NO
+# Include support for the SecureID card
+USE_SECUREID?=	NO
+
 .if defined(USE_SSH1) && ${USE_SSH1} == YES
 BUILD_DEPENDS+=	ssh1:${PORTSDIR}/security/ssh
 RUN_DEPENDS+=	ssh1:${PORTSDIR}/security/ssh
 .endif
-# Warning: untested !
-# Include support for the SecureID card
 .if defined(USE_SECUREID) && ${USE_SECUREID} == YES
 CONFIGURE_ARGS+= --with-secureid
 .endif
 .if defined(USE_TIS) && ${USE_TIS} == YES
-# Include support for the TIS authentication server
 CONFIGURE_ARGS+= --with-tis
 .endif
-# Include tcp_wrappers support
 .if defined(USE_TCPWRAP) && ${USE_TCPWRAP} == YES
 CONFIGURE_ARGS+= --with-libwrap="-L ${PREFIX}/lib -lwrap"
 LIB_DEPENDS+=   wrap.7:${PORTSDIR}/security/tcp_wrapper
@@ -49,10 +54,6 @@ MAN1=	ssh2.1 ssh-keygen2.1 ssh-add2.1 ssh-agent2.1 \
 	scp2.1 sftp2.1
 MAN8=	sshd2.8
 
-USE_SSH1?=	YES
-USE_TCPWRAP?=	NO
-USE_TIS?=	NO
-USE_SECUREID?=	NO
 PORTDOCS=	CHANGES LICENSING README
 .if !defined(USE_SSH1) || (defined(USE_SSH1) && ${USE_SSH1} != YES)
 PLIST=		${PKGDIR}/PLIST.ssh2_only
-- 
cgit