Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 16 Jul 2012 10:47:28 +0000 (UTC)
From:      Sofian Brabez <sbz@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r300938 - head/security/libssh2
Message-ID:  <201207161047.q6GAlSRm032715@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207161047.q6GAlSRm032715>