svn commit: r320923 - head/net/libvncserver

[Baptiste Daroussin]

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: