From owner-svn-ports-all@FreeBSD.ORG  Fri Jun 14 14:06:00 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1C1C96CF;
 Fri, 14 Jun 2013 14:06:00 +0000 (UTC)
 (envelope-from bapt@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 0E52B114B;
 Fri, 14 Jun 2013 14:06:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5EE5xlv040970;
 Fri, 14 Jun 2013 14:05:59 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5EE5xuX040969;
 Fri, 14 Jun 2013 14:05:59 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201306141405.r5EE5xuX040969@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 14 Jun 2013 14:05:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r320923 - head/net/libvncserver
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Fri, 14 Jun 2013 14:06:00 -0000

Author: bapt
Date: Fri Jun 14 14:05:59 2013
New Revision: 320923
URL: http://svnweb.freebsd.org/changeset/ports/320923

Log:
  Use new options helpers

Modified:
  head/net/libvncserver/Makefile

Modified: head/net/libvncserver/Makefile
==============================================================================
--- head/net/libvncserver/Makefile	Fri Jun 14 14:04:38 2013	(r320922)
+++ head/net/libvncserver/Makefile	Fri Jun 14 14:05:59 2013	(r320923)
@@ -25,37 +25,26 @@ CONFIGURE_ARGS=	--without-x
 
 OPTIONS_DEFINE=	GNUTLS OPENSSL GCRYPT IPV6
 OPTIONS_DEFAULT=	OPENSSL
-GNUTLS_DESC=	Enable GnuTLS support
-OPENSSL_DESC=	Enable OpenSSL support
-GCRYPT_DESC=	Enable libgcrypt support
+GCRYPT_DESC=	libgcrypt support
 
-.include <bsd.port.options.mk>
+GNUTLS_LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls
+GNUTLS_CONFIGURE_ON=	--with-gnutls
+GNUTLS_CONFIGURE_OFF=	--without-gnutls
 
-.if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=		gnutls:${PORTSDIR}/security/gnutls
-CONFIGURE_ARGS+=	--with-gnutls
-.else
-CONFIGURE_ARGS+=	--without-gnutls
-.endif
+OPENSSL_CONFIGURE_ON=	--with-ssl
+OPENSSL_CONFIGURE_OFF=	--without-crypto --without-ssl
 
-.if ${PORT_OPTIONS:MOPENSSL}
-USE_OPENSSL=	yes
-CONFIGURE_ARGS+=	--with-ssl
-.else
-CONFIGURE_ARGS+=	--without-crypto --without-ssl
-.endif
+GCRYPT_LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt
+GCRYPT_CONFIGURE_ON=	--with-gcrypt
+GCRYPT_CONFIGURE_ON=	--without-gcrypt
 
-.if ${PORT_OPTIONS:MGCRYPT}
-LIB_DEPENDS+=		gcrypt:${PORTSDIR}/security/libgcrypt
-CONFIGURE_ARGS+=	--with-gcrypt
-.else
-CONFIGURE_ARGS+=	--without-gcrypt
-.endif
+IPV6_CONFIGURE_ON=	--with-ipv6
+IPV6_CONFIGURE_OFF=	--without-ipv6
+
+.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=	--with-ipv6
-.else
-CONFIGURE_ARGS+=	--without-ipv6
+.if ${PORT_OPTIONS:MOPENSSL}
+USE_OPENSSL=	yes
 .endif
 
 post-patch: