From owner-svn-ports-head@FreeBSD.ORG  Wed Dec 12 08:12:14 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 72479FA;
 Wed, 12 Dec 2012 08:12:14 +0000 (UTC)
 (envelope-from martymac@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 578D78FC14;
 Wed, 12 Dec 2012 08:12:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBC8CE3s096294;
 Wed, 12 Dec 2012 08:12:14 GMT
 (envelope-from martymac@svn.freebsd.org)
Received: (from martymac@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBC8CEqO096293;
 Wed, 12 Dec 2012 08:12:14 GMT
 (envelope-from martymac@svn.freebsd.org)
Message-Id: <201212120812.qBC8CEqO096293@svn.freebsd.org>
From: Ganael LAPLANCHE <martymac@FreeBSD.org>
Date: Wed, 12 Dec 2012 08:12:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r308745 - head/ftp/lftp
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2012 08:12:14 -0000

Author: martymac
Date: Wed Dec 12 08:12:13 2012
New Revision: 308745
URL: http://svnweb.freebsd.org/changeset/ports/308745

Log:
  - Use radio options for SSL flavour
  - Replace bsd.openssl.mk inclusion with USE_OPENSSL
  - Use bsd.port.options.mk
  
  Submitted by:	bapt

Modified:
  head/ftp/lftp/Makefile

Modified: head/ftp/lftp/Makefile
==============================================================================
--- head/ftp/lftp/Makefile	Wed Dec 12 07:42:34 2012	(r308744)
+++ head/ftp/lftp/Makefile	Wed Dec 12 08:12:13 2012	(r308745)
@@ -38,15 +38,15 @@ PORTDOCS=	AUTHORS BUGS ChangeLog FAQ FEA
 		MIRRORS NEWS README README.debug-levels README.modules \
 		THANKS TODO
 
-OPTIONS_DEFINE=	SSL NLS
-OPTIONS_SINGLE=	SSL
-OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS
+OPTIONS_DEFINE=	NLS
+OPTIONS_RADIO=	SSL
+OPTIONS_RADIO_SSL=	OPENSSL GNUTLS
 OPTIONS_DEFAULT=	SSL OPENSSL NLS
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENSSL}
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
+USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--with-openssl
 .else
 CONFIGURE_ARGS+=	--without-openssl
@@ -83,4 +83,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>