Date: Thu, 20 Dec 2012 05:28:31 +0000 (UTC) From: Jason Helfman <jgh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309278 - head/devel/libvirt Message-ID: <201212200528.qBK5SVOc077636@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jgh Date: Thu Dec 20 05:28:30 2012 New Revision: 309278 URL: http://svnweb.freebsd.org/changeset/ports/309278 Log: - update to 1.0.1 - support qemu bindings - drop dependency on autotools suite - perl is now a build dependency - fix configuration file installations - remove property on pkg-plist Changes: http://libvirt.org/news.html Modified: head/devel/libvirt/Makefile head/devel/libvirt/distinfo head/devel/libvirt/pkg-plist (contents, props changed) Modified: head/devel/libvirt/Makefile ============================================================================== --- head/devel/libvirt/Makefile Thu Dec 20 04:22:53 2012 (r309277) +++ head/devel/libvirt/Makefile Thu Dec 20 05:28:30 2012 (r309278) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libvirt -PORTVERSION= 1.0.0 +PORTVERSION= 1.0.1 CATEGORIES= devel MASTER_SITES= http://libvirt.org/sources/ @@ -11,6 +11,9 @@ COMMENT= Toolkit to interact with virtua LICENSE= LGPL3 +OPTIONS_DEFINE= QEMU +QEMU_DESC= QEMU bindings + LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \ gcrypt.18:${PORTSDIR}/security/libgcrypt \ xml2.5:${PORTSDIR}/textproc/libxml2 \ @@ -18,7 +21,7 @@ LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl ssh2.1:${PORTSDIR}/security/libssh2 GNU_CONFIGURE= yes -USE_AUTOTOOLS= automake autoconf +USE_PERL5_BUILD= yes CONFIGURE_ARGS= --without-sasl \ --without-yajl \ --without-avahi \ @@ -38,14 +41,25 @@ CONFIGURE_ENV= LDFLAGS="${LDFLAGS} ${PTH USE_GMAKE= yes USE_GNOME= gnomehack -GNOME_MAKEFILEIN= Makefile.am +GNOME_MAKEFILEIN= Makefile.in USE_LDCONFIG= yes USE_PYTHON_BUILD= yes SHLIB_VER= 1000 PLIST_SUB= PORTVERSION="-${PORTVERSION}" \ SHLIB_VER=${SHLIB_VER} -.if empty(PORT_OPTIONS:MNLS) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MQEMU} +CONFIGURE_ARGS+= --with-qemu +PLIST_SUB+= QEMU="" +QEMU_CONFIG= qemu +.else +CONFIGURE_ARGS+= --without-qemu +PLIST_SUB+= QEMU="@comment " +.endif + +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" CONFIGURE_ARGS+= --enable-nls \ @@ -58,19 +72,30 @@ PLIST_SUB+= NLS="@comment " MAN1= virsh.1 virt-pki-validate.1 virt-xml-validate.1 virt-host-validate.1 MAN8= libvirtd.8 -AUTOTOOLSFILES= aclocal.m4 - post-patch: - @${REINPLACE_CMD} -e 's|1.11.6|%%AUTOMAKE_APIVER%%|g' \ - ${WRKSRC}/aclocal.m4 @${MV} ${WRKSRC}/daemon/libvirtd.conf ${WRKSRC}/daemon/libvirtd.conf.sample @${REINPLACE_CMD} -e 's|libvirtd\.conf|libvirtd.conf.sample|' \ - ${WRKSRC}/daemon/Makefile.am \ ${WRKSRC}/daemon/Makefile.in @${MV} ${WRKSRC}/src/libvirt.conf ${WRKSRC}/src/libvirt.conf.sample @${REINPLACE_CMD} -e 's|conf_DATA = libvirt.conf|conf_DATA = libvirt.conf.sample|' \ - ${WRKSRC}/src/Makefile.am + ${WRKSRC}/src/Makefile.in + + @${MV} ${WRKSRC}/src/qemu/qemu.conf ${WRKSRC}/src/qemu/qemu.conf.sample + @${REINPLACE_CMD} -e 's|qemu.conf |qemu.conf.sample |' \ + ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} -e 's|qemu.conf$$|qemu.conf.sample|' \ + ${WRKSRC}/src/Makefile.in + +post-install: + @for configuration in libvirt libvirtd ${QEMU_CONFIG}; do \ + if [ ! -e "${ETCDIR}/$${configuration}.conf" ]; then \ + ${ECHO_MSG} " Installing local configuration file: ${ETCDIR}/$${configuration}.conf"; \ + ${CP} ${ETCDIR}/$${configuration}.conf.sample ${ETCDIR}/$${configuration}.conf; \ + else \ + ${ECHO_MSG} " Preserving local configuration file: ${ETCDIR}/$${configuration}.conf"; \ + fi; \ + done regression-test: build @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} check Modified: head/devel/libvirt/distinfo ============================================================================== --- head/devel/libvirt/distinfo Thu Dec 20 04:22:53 2012 (r309277) +++ head/devel/libvirt/distinfo Thu Dec 20 05:28:30 2012 (r309278) @@ -1,2 +1,2 @@ -SHA256 (libvirt-1.0.0.tar.gz) = 14c8a30ebfb939c82cab5f759a95d09646b43b4210e45490e92459ae65123076 -SIZE (libvirt-1.0.0.tar.gz) = 21868950 +SHA256 (libvirt-1.0.1.tar.gz) = 4a16c76c46ebc41a6514082b5d95b5d5a0868e7a8cc00ab2e6cc1a23ec6b5a3b +SIZE (libvirt-1.0.1.tar.gz) = 22512698 Modified: head/devel/libvirt/pkg-plist ============================================================================== --- head/devel/libvirt/pkg-plist Thu Dec 20 04:22:53 2012 (r309277) +++ head/devel/libvirt/pkg-plist Thu Dec 20 05:28:30 2012 (r309278) @@ -1,4 +1,3 @@ -@comment $FreeBSD$ bin/virsh bin/virt-host-validate bin/virt-pki-validate @@ -9,6 +8,10 @@ bin/virt-xml-validate @unexec if cmp -s %D/%%ETCDIR%%/libvirt.conf.sample %D/%%ETCDIR%%/libvirt.conf; then rm -f %D/%%ETCDIR%%/libvirt.conf; fi %%ETCDIR%%/libvirt.conf.sample @exec if [ ! -f %D/%%ETCDIR%%/libvirt.conf ] ; then cp -p %D/%%ETCDIR%%/libvirt.conf.sample %D/%%ETCDIR%%/libvirt.conf; fi +%%QEMU%%@unexec if cmp -s %D/%%ETCDIR%%/qemu.conf.sample %D/%%ETCDIR%%/qemu.conf; then rm -f %D/%%ETCDIR%%/qemu.conf; fi +%%QEMU%%%%ETCDIR%%/qemu.conf.sample +%%QEMU%%@exec if [ ! -f %D/%%ETCDIR%%/qemu.conf ] ; then cp -p %D/%%ETCDIR%%/qemu.conf.sample %D/%%ETCDIR%%/qemu.conf; fi +%%QEMU%%%%ETCDIR%%/qemu-lockd.conf %%ETCDIR%%/nwfilter/allow-arp.xml %%ETCDIR%%/nwfilter/allow-dhcp-server.xml %%ETCDIR%%/nwfilter/allow-dhcp.xml @@ -33,6 +36,9 @@ etc/logrotate.d/libvirtd.uml include/libvirt/libvirt-qemu.h include/libvirt/libvirt.h include/libvirt/virterror.h +lib/libvirt/lock-driver/lockd.so +lib/libvirt/lock-driver/lockd.la +lib/libvirt/lock-driver/lockd.a lib/libvirt-qemu.a lib/libvirt-qemu.la lib/libvirt-qemu.so @@ -49,9 +55,15 @@ lib/libvirt.so.%%SHLIB_VER%% %%PYTHON_SITELIBDIR%%/libvirtmod_qemu.so libdata/pkgconfig/libvirt.pc libexec/libvirt_iohelper +libexec/libvirt-guests.sh sbin/libvirtd +sbin/virtlockd +share/augeas/lenses/libvirt_lockd.aug share/augeas/lenses/libvirtd.aug +%%QEMU%%share/augeas/lenses/libvirtd_qemu.aug +share/augeas/lenses/tests/test_libvirt_lockd.aug share/augeas/lenses/tests/test_libvirtd.aug +%%QEMU%%share/augeas/lenses/tests/test_libvirtd_qemu.aug %%DOCSDIR%%%%PORTVERSION%%/html/32favicon.png %%DOCSDIR%%%%PORTVERSION%%/html/404.html %%DOCSDIR%%%%PORTVERSION%%/html/api.html @@ -268,6 +280,9 @@ share/gtk-doc/html/libvirt/up.png @dirrmtry %%PYTHON_SITELIBDIR%% @dirrmtry %%PYTHON_LIBDIR%% @exec /bin/mkdir -p %%PREFIX%%/lib/libvirt/connection-driver +%%QEMU%%lib/libvirt/connection-driver/libvirt_driver_qemu.so +%%QEMU%%lib/libvirt/connection-driver/libvirt_driver_qemu.la +%%QEMU%%lib/libvirt/connection-driver/libvirt_driver_qemu.a lib/libvirt/connection-driver/libvirt_driver_secret.a lib/libvirt/connection-driver/libvirt_driver_secret.so lib/libvirt/connection-driver/libvirt_driver_secret.la @@ -275,6 +290,7 @@ lib/libvirt/connection-driver/libvirt_dr lib/libvirt/connection-driver/libvirt_driver_storage.so lib/libvirt/connection-driver/libvirt_driver_storage.la @dirrm lib/libvirt/connection-driver +@dirrm lib/libvirt/lock-driver @dirrm lib/libvirt @dirrm %%DOCSDIR%%%%PORTVERSION%%/html/html @dirrm %%DOCSDIR%%%%PORTVERSION%%/html/internals
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212200528.qBK5SVOc077636>