From owner-svn-ports-all@FreeBSD.ORG  Mon Jul 16 10:47:29 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 28EBA106564A;
	Mon, 16 Jul 2012 10:47:29 +0000 (UTC) (envelope-from sbz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 136E48FC12;
	Mon, 16 Jul 2012 10:47:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6GAlSem032717;
	Mon, 16 Jul 2012 10:47:28 GMT (envelope-from sbz@svn.freebsd.org)
Received: (from sbz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6GAlSRm032715;
	Mon, 16 Jul 2012 10:47:28 GMT (envelope-from sbz@svn.freebsd.org)
Message-Id: <201207161047.q6GAlSRm032715@svn.freebsd.org>
From: Sofian Brabez <sbz@FreeBSD.org>
Date: Mon, 16 Jul 2012 10:47:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r300938 - head/security/libssh2
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Jul 2012 10:47:29 -0000

Author: sbz
Date: Mon Jul 16 10:47:28 2012
New Revision: 300938
URL: http://svn.freebsd.org/changeset/ports/300938

Log:
  - Convert to OptionsNG

Modified:
  head/security/libssh2/Makefile

Modified: head/security/libssh2/Makefile
==============================================================================
--- head/security/libssh2/Makefile	Mon Jul 16 10:30:27 2012	(r300937)
+++ head/security/libssh2/Makefile	Mon Jul 16 10:47:28 2012	(r300938)
@@ -23,26 +23,29 @@ USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-OPTIONS=	GCRYPT "Use libgcrypt instead of OpenSSL" off \
-		TRACE "Enable debug packet traces" off \
-		ZLIB "Enable compression" on
+OPTIONS_DEFINE=	GCRYPT TRACE ZLIB
+OPTIONS_DEFAULT=	ZLIB
+
+GCRYPT_DESC=	Use libgcrypt instead of OpenSSL
+TRACE_DESC=	Enable debug packet traces
+ZLIB_DESC=	Enable compression
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_TRACE)
+.if ${PORT_OPTIONS:MTRACE}
 CONFIGURE_ARGS+=	--enable-debug
 .else
 CONFIGURE_ARGS+=	--disable-debug
 .endif
 
-.if defined(WITH_GCRYPT)
+.if ${PORT_OPTIONS:MGCRYPT}
 LIB_DEPENDS+=	gcrypt:${PORTSDIR}/security/libgcrypt
 CONFIGURE_ARGS+=	--with-libgcrypt -with-libgcrypt-prefix=${LOCALBASE} --without-openssl
-CFLAGS+=-I${LOCALBASE}/include
-LDFLAGS+=-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
-.if defined(WITH_ZLIB)
+.if ${PORT_OPTIONS:MZLIB}
 CONFIGURE_ARGS+=	--with-libz
 .else
 CONFIGURE_ARGS+=	--without-libz