svn commit: r407328 - in head/devel/libvirt: . files

[Roman Bogorodskiy]

Author: novel
Date: Tue Jan 26 23:35:32 2016
New Revision: 407328
URL: https://svnweb.freebsd.org/changeset/ports/407328

Log:
  devel/libvirt: add GNUTLS option and custom flags support for rc script
  
   - libvirt currently depends on gnutls, but does not really use it,
     so add GNUTLS option and pull gnutls only when it's turned on
   - add a "libvirtd_flags" variable to the rc script to allow users to
     specify e.g. "--listen" flag that's required to make libvirtd
     listen on TCP ports [1]
   - bump PORTREVISION
  
  Differential Revision:	D5044
  Reviewed by:		jgh, koobs
  Tested by:		Nicolas Lienard [1]

Modified:
  head/devel/libvirt/Makefile
  head/devel/libvirt/files/libvirtd.in

Modified: head/devel/libvirt/Makefile
==============================================================================
--- head/devel/libvirt/Makefile	Tue Jan 26 23:31:56 2016	(r407327)
+++ head/devel/libvirt/Makefile	Tue Jan 26 23:35:32 2016	(r407328)
@@ -3,6 +3,7 @@
 
 PORTNAME=	libvirt
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://libvirt.org/sources/ \
 		ftp://libvirt.org/libvirt/
@@ -15,14 +16,14 @@ LICENSE=	LGPL3
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
 		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
 		libxml2.so:${PORTSDIR}/textproc/libxml2 \
-		libgnutls.so:${PORTSDIR}/security/gnutls \
 		libssh2.so:${PORTSDIR}/security/libssh2
 BUILD_DEPENDS=	dnsmasq:${PORTSDIR}/dns/dnsmasq \
 		xsltproc:${PORTSDIR}/textproc/libxslt
 RUN_DEPENDS=	dnsmasq:${PORTSDIR}/dns/dnsmasq \
 		dmidecode:${PORTSDIR}/sysutils/dmidecode
 
-OPTIONS_DEFINE=	DOCS NLS QEMU SASL
+OPTIONS_DEFINE=	DOCS GNUTLS NLS QEMU SASL
+OPTIONS_DEFAULT=	GNUTLS
 OPTIONS_DEFINE_amd64=	XEN
 .if exists(/usr/sbin/bhyve)
 OPTIONS_DEFINE_amd64+=	BHYVE
@@ -45,6 +46,10 @@ QEMU_LIB_DEPENDS=	libyajl.so:${PORTSDIR}
 QEMU_RUN_DEPENDS=	dmidecode:${PORTSDIR}/sysutils/dmidecode \
 			qemu-io:${PORTSDIR}/emulators/qemu-devel
 
+GNUTLS_CONFIGURE_ON=	--with-gnutls=${LOCALBASE}
+GNUTLS_CONFIGURE_OFF=	--without-gnutls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}

Modified: head/devel/libvirt/files/libvirtd.in
==============================================================================
--- head/devel/libvirt/files/libvirtd.in	Tue Jan 26 23:31:56 2016	(r407327)
+++ head/devel/libvirt/files/libvirtd.in	Tue Jan 26 23:35:32 2016	(r407328)
@@ -11,6 +11,11 @@
 # libvirtd_enable (bool):       Set to 'YES' to enable
 #                               Default: NO
 #
+# libvirtd_flags (str):         Custom additional arguments to be passed to libvirtd.
+#                               For example, to make it listen on TCP ports, set it
+#                               to "--listen".
+#                               Default: ""
+#
 
 . /etc/rc.subr
 
@@ -19,13 +24,14 @@ rcvar=libvirtd_enable
 
 load_rc_config $name
 
+: ${libvirtd_enable:="NO"}
+: ${libvirtd_flags:=""}
+
 command=%%PREFIX%%/sbin/libvirtd
 pidfile=/var/run/${name}.pid
 
 command_args="--daemon --pid-file=${pidfile}"
 
-: ${libvirtd_enable:="NO"}
-
 PATH="${PATH}:/usr/local/sbin:/usr/local/bin"
 
 run_rc_command "$1"