Index: head/deskutils/virt-manager/Makefile =================================================================== --- head/deskutils/virt-manager/Makefile (revision 372161) +++ head/deskutils/virt-manager/Makefile (revision 372162) @@ -1,42 +1,42 @@ # Created by: Jason Helfman # $FreeBSD$ PORTNAME= virt-manager PORTVERSION= 0.9.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= deskutils net-mgmt MASTER_SITES= http://virt-manager.et.redhat.com/download/sources/${PORTNAME}/ \ LOCAL/jgh/deskutils/${PORTNAME}/ MAINTAINER= jgh@FreeBSD.org COMMENT= Toolkit to interact with virtualization capabilities LICENSE= LGPL3 LIB_DEPENDS= libvirt.so:${PORTSDIR}/devel/libvirt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.2:${PORTSDIR}/devel/py-dbus \ ${PYTHON_PKGNAMEPREFIX}libxml2>=2.7.8:${PORTSDIR}/textproc/py-libxml2 \ ${PYTHON_PKGNAMEPREFIX}virtinst>=0.600.4:${PORTSDIR}/net-mgmt/virtinst \ ${PYTHON_PKGNAMEPREFIX}vte>=0.26.2:${PORTSDIR}/x11-toolkits/py-vte \ gtk-vnc>=0.3.10:${PORTSDIR}/net/gtk-vnc \ librsvg2>=2.32.1:${PORTSDIR}/graphics/librsvg2 \ ${PYTHON_PKGNAMEPREFIX}libvirt>=0:${PORTSDIR}/devel/py-libvirt OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls USE_GNOME= pygnome2 INSTALLS_ICONS= yes GCONF_SCHEMAS= virt-manager.schemas GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-tui USES= gmake python post-patch: @${REINPLACE_CMD} -e 's|itlocaledir = $$(prefix)/$$(DATADIRNAME)/locale|itlocaledir = $$(prefix)/share/locale|' \ ${WRKSRC}/po/Makefile.in.in .include Index: head/devel/libvirt/Makefile =================================================================== --- head/devel/libvirt/Makefile (revision 372161) +++ head/devel/libvirt/Makefile (revision 372162) @@ -1,139 +1,139 @@ # Created by: Jason Helfman # $FreeBSD$ PORTNAME= libvirt -PORTVERSION= 1.2.9 +PORTVERSION= 1.2.10 CATEGORIES= devel MASTER_SITES= http://libvirt.org/sources/ \ ftp://libvirt.org/libvirt/ MAINTAINER= jgh@FreeBSD.org COMMENT= Toolkit to interact with virtualization capabilities 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 RUN_DEPENDS= dnsmasq:${PORTSDIR}/dns/dnsmasq OPTIONS_DEFINE= DOCS NLS QEMU OPTIONS_DEFINE_amd64= BHYVE .if exists(/usr/sbin/bhyve) OPTIONS_DEFAULT_amd64= BHYVE .endif QEMU_DESC= QEMU driver BHYVE_DESC= bhyve driver OPTIONS_SUB= yes QEMU_CONFIGURE_WITH= qemu yajl QEMU_CFLAGS= -I${LOCALBASE}/include QEMU_LIB_DEPENDS= libyajl.so:${PORTSDIR}/devel/yajl QEMU_RUN_DEPENDS= dmidecode:${PORTSDIR}/sysutils/dmidecode \ qemu-io:${PORTSDIR}/emulators/qemu-devel BHYVE_CONFIGURE_WITH= bhyve NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls NLS_CONFIGURE_ON= --with-libintl-prefix=${LOCALBASE} VARDIR= /var USE_RC_SUBR= libvirtd GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-sasl \ --without-avahi \ --without-polkit \ --without-hal \ --without-udev \ --without-netcf \ --without-sysctl \ --without-lxc \ --without-uml \ --with-ssh2 \ --localstatedir=${VARDIR} # random_data fix can be removed when 8.x is eol CONFIGURE_ENV= ac_cv_type_struct_random_data="" # limit production release x.x.x PORTSCOUT= limit:\d+\.\d+\.\d+$$ LDFLAGS+= -L${LOCALBASE}/lib -fstack-protector USES= charsetfix gmake libtool pathfix pkgconfig perl5 cpe CPE_VENDOR= redhat USE_PERL5= build USE_LDCONFIG= yes INSTALL_TARGET= install-strip -SHLIB_VER= 0.1002.9 +SHLIB_VER= 0.1002.10 PLIST_SUB= PORTVERSION="-${PORTVERSION}" \ SHLIB_VER=${SHLIB_VER} PORTDOCS= * .include #work around an options bug (thanks mat@) .if ${ARCH} != amd64 PLIST_SUB+= BHYVE="@comment " .endif .if ${PORT_OPTIONS:MBHYVE} STRIP_FILES+= libvirt/connection-driver/libvirt_driver_bhyve.so .endif post-patch: .if ${OSVERSION} < 900000 @${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||' \ ${WRKSRC}/configure .endif @${MV} ${WRKSRC}/daemon/libvirtd.conf ${WRKSRC}/daemon/libvirtd.conf.sample @${REINPLACE_CMD} -e 's|libvirtd\.conf|libvirtd.conf.sample|' \ ${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.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 @${REINPLACE_CMD} -e 's|cp $$(DESTDIR)|cp -f $$(DESTDIR)|' \ ${WRKSRC}/src/Makefile.in post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in AUTHORS ChangeLog INSTALL NEWS README TODO ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} .endfor .for dir in run/libvirt/network \ run/libvirt/qemu \ run/libvirt/lockd \ log/libvirt/uml \ log/libvirt/qemu \ log/libvirt/lxc \ lib/libvirt/boot \ lib/libvirt/lockd/files \ lib/libvirt/images \ lib/libvirt/dnsmasq \ lib/libvirt/filesystems \ lib/libvirt/network \ lib/libvirt/qemu/channel/target \ cache/libvirt/qemu @${MKDIR} "${STAGEDIR}/${VARDIR}/${dir}" .endfor regression-test: build @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check .include Index: head/devel/libvirt/distinfo =================================================================== --- head/devel/libvirt/distinfo (revision 372161) +++ head/devel/libvirt/distinfo (revision 372162) @@ -1,2 +1,2 @@ -SHA256 (libvirt-1.2.9.tar.gz) = 95931a5a52f451b9ab73d6a5ae11a5740e1ba69a66520c2a0cffc6068a7e8fc4 -SIZE (libvirt-1.2.9.tar.gz) = 30154430 +SHA256 (libvirt-1.2.10.tar.gz) = 5050f4cea3dd59d3eca25c3d3f16085e10d624ecc18bd35820cd3dac6f46c08e +SIZE (libvirt-1.2.10.tar.gz) = 30029503 Index: head/devel/libvirt-glib/Makefile =================================================================== --- head/devel/libvirt-glib/Makefile (revision 372161) +++ head/devel/libvirt-glib/Makefile (revision 372162) @@ -1,26 +1,27 @@ # Created by: Jason Helfman # $FreeBSD$ PORTNAME= libvirt-glib PORTVERSION= 0.1.9 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://libvirt.org/libvirt/glib/ MAINTAINER= jgh@FreeBSD.org COMMENT= Glib bindings for Libvirt virtualization API LIB_DEPENDS= libvirt.so:${PORTSDIR}/devel/libvirt GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-introspection USES= gmake libtool pathfix pkgconfig python:2 USE_LDCONFIG= yes USE_GNOME= intlhack introspection CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -fstack-protector LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip SHLIB_VER= 1.0 .include Index: head/devel/libvirt-java/Makefile =================================================================== --- head/devel/libvirt-java/Makefile (revision 372161) +++ head/devel/libvirt-java/Makefile (revision 372162) @@ -1,51 +1,51 @@ # Created by: Jason Helfman # $FreeBSD$ PORTNAME= libvirt-java PORTVERSION= 0.5.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel java MASTER_SITES= http://libvirt.org/sources/java/ \ ftp://libvirt.org/libvirt/java/ MAINTAINER= jgh@FreeBSD.org COMMENT= Java bindings for Libvirt virtualization API LICENSE= MIT LIB_DEPENDS= libvirt.so:${PORTSDIR}/devel/libvirt BUILD_DEPENDS= jna>=4.0:${PORTSDIR}/devel/jna \ junit>=4.8.2:${PORTSDIR}/java/junit USE_JAVA= YES JAVA_VERSION= 1.6+ USE_ANT= YES ALL_TARGET= jar PLIST_FILES= %%JAVAJARDIR%%/libvirt-${PORTVERSION}.jar PORTDOCS= * OPTIONS_DEFINE= DOCS .include post-patch: @${REINPLACE_CMD} -e 's|/usr/share/java|${JAVAJARDIR}|' \ ${WRKSRC}/build.properties post-build-script: .if ${PORT_OPTIONS:MDOCS} cd ${WRKSRC} && \ ${ANT} docs .endif do-install: ${INSTALL_DATA} ${WRKSRC}/target/libvirt-${PORTVERSION}.jar \ ${STAGEDIR}${JAVAJARDIR} .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/target/javadoc && \ ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} .endif .include Index: head/devel/p5-Sys-Virt/Makefile =================================================================== --- head/devel/p5-Sys-Virt/Makefile (revision 372161) +++ head/devel/p5-Sys-Virt/Makefile (revision 372162) @@ -1,42 +1,42 @@ # Created by: Frank Wall # $FreeBSD$ PORTNAME= Sys-Virt PORTVERSION= 1.1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- MAINTAINER= fw@moov.de COMMENT= Perl bindings for libvirt LICENSE= ART10 GPLv1 LICENSE_COMB= dual BUILD_DEPENDS= p5-XML-XPath>=0:${PORTSDIR}/textproc/p5-XML-XPath LIB_DEPENDS= libvirt.so:${PORTSDIR}/devel/libvirt RUN_DEPENDS= p5-XML-XPath>=0:${PORTSDIR}/textproc/p5-XML-XPath TEST_DEPENDS= p5-CPAN-Changes>=0:${PORTSDIR}/devel/p5-CPAN-Changes \ p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \ p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage USES= perl5 pkgconfig USE_PERL5= configure MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= EXAMPLES PORTEXAMPLES= * .include post-patch: @${REINPLACE_CMD} -e '1 s|/usr/bin/perl|${PERL}|' ${WRKSRC}/examples/*.pl post-install: ${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Sys/Virt/Virt.so ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_SCRIPT} ${WRKSRC}/examples/*.pl ${STAGEDIR}${EXAMPLESDIR} .include Index: head/devel/py-libvirt/Makefile =================================================================== --- head/devel/py-libvirt/Makefile (revision 372161) +++ head/devel/py-libvirt/Makefile (revision 372162) @@ -1,32 +1,33 @@ # Created by: Jason Helfman # $FreeBSD$ PORTNAME= libvirt PORTVERSION= 1.2.9 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://libvirt.org/sources/python/ \ ftp://libvirt.org/libvirt/python/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= ${PORTNAME}-python-${PORTVERSION} MAINTAINER= jgh@FreeBSD.org COMMENT= Python bindings for Libvirt virtualization API LICENSE= GPLv2 LIB_DEPENDS= libvirt.so:${PORTSDIR}/devel/libvirt USES= pkgconfig python shebangfix SHEBANG_FILES= generator.py sanitytest.py setup.py USE_PYTHON= distutils autoplist post-patch: @${REINPLACE_CMD} -e 's|"python"|"${PYTHON_CMD}"|g' \ ${WRKSRC}/setup.py post-install: .for lib in libvirtmod libvirtmod_qemu libvirtmod_lxc @${STRIP_CMD} ${STAGEDIR}${PYTHON_LIBDIR}/site-packages/${lib}.so .endfor .include Index: head/net-mgmt/collectd/Makefile =================================================================== --- head/net-mgmt/collectd/Makefile (revision 372161) +++ head/net-mgmt/collectd/Makefile (revision 372162) @@ -1,464 +1,464 @@ # Created by: Matt Peterson # $FreeBSD$ PORTNAME= collectd PORTVERSION= 4.10.9 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= net-mgmt MASTER_SITES= http://collectd.org/files/ MAINTAINER= ports@bsdserwis.com COMMENT= Systems & network statistics collection daemon LICENSE= GPLv2 LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl GNU_CONFIGURE= yes USES= autoreconf gmake libtool INSTALL_TARGET= install-strip OPTIONS_DEFINE= CGI BIND DEBUG GCRYPT LIBVIRT OPTIONS_GROUP= INPUT OUTPUT OPTIONS_GROUP_OUTPUT= RRDTOOL RRDCACHED WRITE_HTTP NOTIFYEMAIL NOTIFYDESKTOP OPTIONS_GROUP_INPUT= APACHE APCUPS CURL CURL_JSON CURL_XML DBI DISK \ NUTUPS INTERFACE MBMON MEMCACHED MYSQL NGINX \ OPENVPN PDNS PGSQL PING PYTHON ROUTEROS SNMP \ TOKYOTYRANT XMMS OPTIONS_DEFAULT= INTERFACE PING SNMP RRDTOOL RRDCACHED CGI_DESC= Install collection.cgi (requires RRDTOOL) BIND_DESC= Enable BIND 9.5+ statistics # INPUT APACHE_DESC= Apache mod_status (libcurl) APCUPS_DESC= APC UPS (apcupsd) CURL_DESC= CURL generic web statistics CURL_JSON_DESC= CURL JSON generic web statistics CURL_XML_DESC= CURL XML generic web statistics DBI_DESC= database abstraction library DISK_DESC= Disk performance statistics NUTUPS_DESC= NUT UPS daemon INTERFACE_DESC= Network interfaces (libstatgrab) MBMON_DESC= MBMon MEMCACHED_DESC= Memcached NGINX_DESC= Nginx NOTIFYEMAIL_DESC= Email notifications (libesmtp) NOTIFYDESKTOP_DESC= Email notifications (libnotify) OPENVPN_DESC= OpenVPN statistics PDNS_DESC= PowerDNS PING_DESC= Network latency (liboping) ROUTEROS_DESC= RouterOS plugin TOKYOTYRANT_DESC= Tokyotyrant database XMMS_DESC= XMMS # OUTPUT RRDTOOL_DESC= RRDTool RRDCACHED_DESC= RRDTool Cached (require RRDTOOL) WRITE_HTTP_DESC= write_http USE_RC_SUBR= collectd collectdmon USE_LDCONFIG= yes CONFLICTS= collectd-5.[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib .include # NOTE: Feel free to submit patches adding support for any of these # disabled plugins. If a plugin requires external dependencies, # make it optional through OPTIONS defaulting to Off. Some of # these are Linux specific, but others will probably run on # FreeBSD as well, given a bit of careful attention. CONFIGURE_ARGS= --localstatedir=/var \ --disable-getifaddrs \ --disable-apple_sensors \ --disable-ascent \ --disable-battery \ --disable-conntrack \ --disable-contextswitch \ --disable-cpufreq \ --disable-entropy \ --disable-fscache \ --disable-gmond \ --disable-hddtemp \ --disable-ipmi \ --disable-iptables \ --disable-ipvs \ --disable-irq \ --disable-java \ --disable-madwifi \ --disable-match_empty_counter \ --disable-match_hashed \ --disable-match_regex \ --disable-match_timediff \ --disable-match_value \ --disable-memcachec \ --disable-modbus \ --disable-multimeter \ --disable-netapp \ --disable-netlink \ --disable-nfs \ --disable-olsrd \ --disable-onewire \ --disable-oracle \ --disable-perl \ --disable-pinba \ --disable-protocols \ --disable-sensors \ --disable-serial \ --disable-table \ --disable-tape \ --disable-target_notification \ --disable-target_replace \ --disable-target_scale \ --disable-target_set \ --disable-teamspeak2 \ --disable-ted \ --disable-thermal \ --disable-users \ --disable-vmem \ --disable-vserver \ --disable-wireless \ --without-perl-bindings \ --without-librabbitmq \ --disable-varnish \ --without-libvarnish \ --without-libcredis \ --without-libganglia \ --without-libesmtp \ --disable-static .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-debug .endif .if ${PORT_OPTIONS:MCGI} RUN_DEPENDS+= p5-URI>=0:${PORTSDIR}/net/p5-URI \ p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm \ p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper \ p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser PLIST_SUB+= CGI="" . if empty(PORT_OPTIONS:MRRDTOOL) IGNORE= CGI requires RRDTOOL. Either select RRDTOOL or deselect CGI . endif .else PLIST_SUB+= CGI="@comment " .endif .if ${PORT_OPTIONS:MBIND} CONFIGURE_ARGS+=--enable-bind LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl LIB_DEPENDS+= libxml2.so:${PORTSDIR}/textproc/libxml2 PLIST_SUB+= BIND="" . if empty(PORT_OPTIONS:MCURL) IGNORE= BIND requires CURL. Either select CURL or deselect BIND . endif .else CONFIGURE_ARGS+=--disable-bind PLIST_SUB+= BIND="@comment " .endif .if ${PORT_OPTIONS:MAPACHE} CONFIGURE_ARGS+=--enable-apache LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl PLIST_SUB+= APACHE="" . if empty(PORT_OPTIONS:MCURL) IGNORE= APACHE requires CURL. Either select CURL or deselect APACHE . endif .else CONFIGURE_ARGS+=--disable-apache PLIST_SUB+= APACHE="@comment " .endif .if ${PORT_OPTIONS:MAPCUPS} CONFIGURE_ARGS+=--enable-apcups BUILD_DEPENDS+= ${LOCALBASE}/sbin/apcupsd:${PORTSDIR}/sysutils/apcupsd PLIST_SUB+= APCUPS="" .else CONFIGURE_ARGS+=--disable-apcups PLIST_SUB+= APCUPS="@comment " .endif .if ${PORT_OPTIONS:MCURL} CONFIGURE_ARGS+=--enable-curl --with-libcurl=${LOCALBASE} LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl PLIST_SUB+= CURL="" .else CONFIGURE_ARGS+=--disable-curl PLIST_SUB+= CURL="@comment " .endif .if ${PORT_OPTIONS:MCURL_JSON} .if empty(PORT_OPTIONS:MCURL) IGNORE= using CURL_JSON requires CURL support .endif CONFIGURE_ARGS+=--enable-curl_json LIB_DEPENDS+= libyajl.so:${PORTSDIR}/devel/yajl PLIST_SUB+= CURL_JSON="" .else CONFIGURE_ARGS+=--disable-curl_json --without-libyajl PLIST_SUB+= CURL_JSON="@comment " .endif .if ${PORT_OPTIONS:MCURL_XML} .if empty(PORT_OPTIONS:MCURL) IGNORE= using CURL_XML requires CURL support .endif CONFIGURE_ARGS+=--enable-curl_xml LIB_DEPENDS+= libxml2.so:${PORTSDIR}/textproc/libxml2 PLIST_SUB+= CURL_XML="" .else CONFIGURE_ARGS+=--disable-curl_xml PLIST_SUB+= CURL_XML="@comment " .endif .if ${PORT_OPTIONS:MDBI} CONFIGURE_ARGS+=--enable-dbi --with-libdbi=${LOCALBASE} LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi PLIST_SUB+= DBI="" .else CONFIGURE_ARGS+=--disable-dbi PLIST_SUB+= DBI="@comment " .endif .if ${PORT_OPTIONS:MDISK} CONFIGURE_ARGS+=--enable-disk PLIST_SUB+= DISK="" .else CONFIGURE_ARGS+=--disable-disk PLIST_SUB+= DISK="@comment " .endif .if ${PORT_OPTIONS:MGCRYPT} CONFIGURE_ARGS+=--with-libgcrypt-prefix=${LOCALBASE} LIB_DEPENDS+= libgcrypt.so:${PORTSDIR}/security/libgcrypt .endif .if ${PORT_OPTIONS:MNUTUPS} CONFIGURE_ARGS+=--enable-nut --with-upsclient LIB_DEPENDS+= libupsclient.so:${PORTSDIR}/sysutils/nut PLIST_SUB+= NUTUPS="" .else CONFIGURE_ARGS+=--disable-nut --without-libupsclient PLIST_SUB+= NUTUPS="@comment " .endif .if ${PORT_OPTIONS:MINTERFACE} USES+= pkgconfig CONFIGURE_ARGS+=--enable-interface LIB_DEPENDS+= libstatgrab.so:${PORTSDIR}/devel/libstatgrab PLIST_SUB+= INTERFACE="" LIBS+= `pkg-config --libs libstatgrab` .else CONFIGURE_ARGS+=--disable-interface PLIST_SUB+= INTERFACE="@comment " .endif .if ${PORT_OPTIONS:MMBMON} CONFIGURE_ARGS+=--enable-mbmon RUN_DEPENDS+= ${LOCALBASE}/bin/mbmon:${PORTSDIR}/sysutils/xmbmon PLIST_SUB+= MBMON="" .else CONFIGURE_ARGS+=--disable-mbmon PLIST_SUB+= MBMON="@comment " .endif .if ${PORT_OPTIONS:MMEMCACHED} LIB_DEPENDS+= libmemcached.so:${PORTSDIR}/databases/libmemcached CONFIGURE_ARGS+=--enable-memcached CONFIGURE_ARGS+=--with-libmemcached=${LOCALBASE} PLIST_SUB+= MEMCACHED="" .else CONFIGURE_ARGS+=--disable-memcached --without-libmemcached PLIST_SUB+= MEMCACHED="@comment " .endif .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+=--enable-mysql PLIST_SUB+= MYSQL="" .else CONFIGURE_ARGS+=--disable-mysql PLIST_SUB+= MYSQL="@comment " .endif .if ${PORT_OPTIONS:MNGINX} LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+=--enable-nginx PLIST_SUB+= NGINX="" . if empty(PORT_OPTIONS:MCURL) IGNORE= NGINX requires CURL. Either select CURL or deselect NGINX . endif .else CONFIGURE_ARGS+=--disable-nginx PLIST_SUB+= NGINX="@comment " .endif .if ${PORT_OPTIONS:MNOTIFYDESKTOP} LIB_DEPENDS+= libnotify.so:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+=--enable-notify_desktop PLIST_SUB+= NOTIFYDESKTOP="" .else CONFIGURE_ARGS+=--disable-notify_desktop PLIST_SUB+= NOTIFYDESKTOP="@comment " .endif .if ${PORT_OPTIONS:MNOTIFYEMAIL} LIB_DEPENDS+= libesmtp.so:${PORTSDIR}/mail/libesmtp CONFIGURE_ARGS+=--enable-notify_email CONFIGURE_ARGS+=--with-libesmtp=${PREFIX} PLIST_SUB+= NOTIFYEMAIL="" .else CONFIGURE_ARGS+=--disable-notify_email PLIST_SUB+= NOTIFYEMAIL="@comment " .endif .if ${PORT_OPTIONS:MOPENVPN} CONFIGURE_ARGS+=--enable-openvpn RUN_DEPENDS+= ${LOCALBASE}/sbin/openvpn:${PORTSDIR}/security/openvpn PLIST_SUB+= OPENVPN="" .else CONFIGURE_ARGS+=--disable-openvpn PLIST_SUB+= OPENVPN="@comment " .endif .if ${PORT_OPTIONS:MPDNS} USE_PDNS= yes CONFIGURE_ARGS+=--enable-powerdns PLIST_SUB+= PDNS="" .else CONFIGURE_ARGS+=--disable-powerdns PLIST_SUB+= PDNS="@comment " .endif .if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes CONFIGURE_ARGS+=--enable-postgresql PLIST_SUB+= PGSQL="" .else CONFIGURE_ARGS+=--disable-postgresql PLIST_SUB+= PGSQL="@comment " .endif .if ${PORT_OPTIONS:MPING} LIB_DEPENDS+= liboping.so:${PORTSDIR}/net/liboping CONFIGURE_ARGS+=--enable-ping PLIST_SUB+= PING="" .else CONFIGURE_ARGS+=--disable-ping PLIST_SUB+= PING="@comment " .endif .if ${PORT_OPTIONS:MPYTHON} USES+= python CONFIGURE_ARGS+=--enable-python --with-python=${PYTHON_CMD} PLIST_SUB+= PYTHON="" .else CONFIGURE_ARGS+=--disable-python PLIST_SUB+= PYTHON="@comment " .endif .if ${PORT_OPTIONS:MROUTEROS} LIB_DEPENDS+= librouteros.so:${PORTSDIR}/net/librouteros CONFIGURE_ARGS+=--enable-routeros --with-librouteros=${LOCALBASE} PLIST_SUB+= ROUTEROS="" .else CONFIGURE_ARGS+=--disable-routeros --without-librouteros PLIST_SUB+= ROUTEROS="@comment " .endif .if ${PORT_OPTIONS:MRRDTOOL} LIB_DEPENDS+= librrd.so:${PORTSDIR}/databases/rrdtool CONFIGURE_ARGS+=--enable-rrdtool PLIST_SUB+= RRD="" .else CONFIGURE_ARGS+=--disable-rrdtool PLIST_SUB+= RRD="@comment " .endif .if ${PORT_OPTIONS:MRRDCACHED} && ${PORT_OPTIONS:MRRDTOOL} CONFIGURE_ARGS+=--enable-rrdcached PLIST_SUB+= RRDCACHED="" .else CONFIGURE_ARGS+=--disable-rrdcached PLIST_SUB+= RRDCACHED="@comment " .endif .if ${PORT_OPTIONS:MSNMP} LIB_DEPENDS+= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp CONFIGURE_ARGS+=--enable-snmp PLIST_SUB+= SNMP="" .else CONFIGURE_ARGS+=--disable-snmp PLIST_SUB+= SNMP="@comment " .endif .if ${PORT_OPTIONS:MTOKYOTYRANT} LIB_DEPENDS+= libtokyotyrant.so:${PORTSDIR}/databases/tokyotyrant CONFIGURE_ARGS+=--enable-tokyotyrant CONFIGURE_ARGS+=--with-libtokyotyrant=${LOCALBASE} PLIST_SUB+= TOKYOTYRANT="" .else CONFIGURE_ARGS+=--disable-tokyotyrant --without-libtokyotyrant PLIST_SUB+= TOKYOTYRANT="@comment " .endif .if ${PORT_OPTIONS:MLIBVIRT} CONFIGURE_ARGS+=--enable-libvirt LIB_DEPENDS+= libvirt.so:${PORTSDIR}/devel/libvirt PLIST_SUB+= VIRT="" .else CONFIGURE_ARGS+=--disable-libvirt PLIST_SUB+= VIRT="@comment " .endif .if ${PORT_OPTIONS:MWRITE_HTTP} CONFIGURE_ARGS+=--enable-write_http PLIST_SUB+= WRITE_HTTP="" .else CONFIGURE_ARGS+=--disable-write_http PLIST_SUB+= WRITE_HTTP="@comment " .endif .if ${PORT_OPTIONS:MXMMS} LIB_DEPENDS+= libxmms.so:${PORTSDIR}/multimedia/xmms CONFIGURE_ARGS+=--enable-xmms CFLAGS+= `xmms-config --cflags` PLIST_SUB+= XMMS="" .else CONFIGURE_ARGS+=--disable-xmms PLIST_SUB+= XMMS="@comment " .endif post-patch: @${RM} -r ${WRKSRC}/libltdl @${REINPLACE_CMD} \ -e 's;@prefix@/var/;/var/;' \ -e 's;/var/lib/;/var/db/;' \ ${WRKSRC}/src/collectd.conf.in @${REINPLACE_CMD} \ -e '/^ACLOCAL_AMFLAGS =/s;libltdl/m4;m4;' \ -e '/\$$[(]mkinstalldirs)/d' \ ${WRKSRC}/Makefile.am @${REINPLACE_CMD} \ -e 's;/etc/collection\.conf;${WWWDIR}/collection.conf;' \ ${WRKSRC}/contrib/collection.cgi @${REINPLACE_CMD} \ -e 's;/opt/collectd/var/lib;/var/db;' \ -e 's;/opt/collectd/lib;${PREFIX}/lib;' \ ${WRKSRC}/contrib/collection.conf @${REINPLACE_CMD} \ -e 's;{libdir}/pkgconfig;{prefix}/libdata/pkgconfig;' \ ${WRKSRC}/configure.in post-install: .if ${PORT_OPTIONS:MCGI} ${MKDIR} ${STAGEDIR}${WWWDIR} ${INSTALL_SCRIPT} ${WRKSRC}/contrib/collection.cgi ${STAGEDIR}${WWWDIR}/ ${INSTALL_DATA} ${WRKSRC}/contrib/collection.conf \ ${STAGEDIR}${WWWDIR}/collection.conf.sample .endif .include Index: head/net-mgmt/collectd5/Makefile =================================================================== --- head/net-mgmt/collectd5/Makefile (revision 372161) +++ head/net-mgmt/collectd5/Makefile (revision 372162) @@ -1,492 +1,492 @@ # Created by: Matt Peterson # $FreeBSD$ PORTNAME= collectd PORTVERSION= 5.4.1 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= net-mgmt MASTER_SITES= http://collectd.org/files/ PKGNAMESUFFIX= 5 MAINTAINER= ports@bsdserwis.com COMMENT= Systems & network statistics collection daemon LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING # Only autoreconf stage and sigrok plugin need GLIB: BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/glib-2.0.m4:${PORTSDIR}/devel/glib20 LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl USES= autoreconf gmake libtool pkgconfig tar:bzip2 GNU_CONFIGURE= yes OPTIONS_DEFINE= CGI DEBUG GCRYPT VIRT OPTIONS_GROUP= INPUT OUTPUT OPTIONS_GROUP_OUTPUT= RRDTOOL NOTIFYEMAIL NOTIFYDESKTOP RIEMANN OPTIONS_GROUP_INPUT= CURL DBI JSON MEMCACHEC MODBUS MONGODB MYSQL \ NUTUPS PERL PGSQL PING PYTHON RABBITMQ REDIS \ ROUTEROS SIGROK SNMP STATGRAB TOKYOTYRANT XML XMMS CGI_DESC= Install collection.cgi (requires rrdtool) CURL_DESC= Enable curl-based plugins (apache, nginx, etc) DEBUG_DESC= Enable debugging DBI_DESC= Enable dbi plugin GCRYPT_DESC= Build with libgcrypt JSON_DESC= Enable JSON plugins MEMCACHEC_DESC= Enable memcachec plugin MODBUS_DESC= Enable modbus plugin MONGODB_DESC= Enable MongoDB-based plugins MYSQL_DESC= Enable mysql-based plugins NOTIFYEMAIL_DESC= Enable notifications via email NOTIFYDESKTOP_DESC= Enable desktop notifications NUTUPS_DESC= Enable nut (ups) plugin PERL_DESC= Enable libperl plugin and binding PGSQL_DESC= Enable postgresql-based plugins PING_DESC= Enable ping plugin PYTHON_DESC= Enable python-based plugins RABBITMQ_DESC= Enable rabbitmq-based plugins REDIS_DESC= Enable redis-based plugins RIEMANN_DESC= Enable write_riemann plugin (via protobuf-c) ROUTEROS_DESC= Enable routeros plugin RRDTOOL_DESC= Enable rrdtool plugin (also rrdcached plugin) SIGROK_DESC= Enable sigrok plugin SNMP_DESC= Enable SNMP plugin STATGRAB_DESC= Enable statgrab-based plugins (disk, interface, etc) TOKYOTYRANT_DESC= Enable tokyotyrant plugin VIRT_DESC= Enable libvirt plugin (requires XML) XML_DESC= Enable XML plugins XMMS_DESC= Enable xmms plugin USE_RC_SUBR= collectd collectdmon USE_LDCONFIG= yes CONFLICTS= collectd-4.[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib .include # NOTE: Plugins without dependencies are defined further down. CONFIGURE_ARGS= --localstatedir=/var \ --disable-all-plugins \ --disable-static \ --without-amqp \ --without-java \ --without-libaquaero5 \ --without-libganglia \ --without-libiptc \ --without-libjvm \ --without-libkstat \ --without-libmodbus \ --without-libnetlink \ --without-libnetapp \ --without-libopenipmi \ --without-libowcapi \ --without-libperfstat \ --without-libsensors \ --without-libvarnish \ --without-lvm \ --without-mic \ --without-oracle # NOTE: Plugins without external dependencies CONFIGURE_ARGS+= \ --enable-aggregation \ --enable-apcups \ --enable-contextswitch \ --enable-cpu \ --enable-csv \ --enable-df \ --enable-dns \ --enable-email \ --enable-exec \ --enable-filecount \ --enable-load \ --enable-logfile \ --enable-match_empty_counter \ --enable-match_hashed \ --enable-match_regex \ --enable-match_timediff \ --enable-match_value \ --enable-mbmon \ --enable-memcached \ --enable-memory \ --enable-network \ --enable-ntpd \ --enable-openvpn \ --enable-powerdns \ --enable-pf \ --enable-processes \ --enable-statsd \ --enable-swap \ --enable-syslog \ --enable-table \ --enable-tail \ --enable-target_notification \ --enable-target_replace \ --enable-target_scale \ --enable-target_set \ --enable-target_v5upgrade \ --enable-tcpconns \ --enable-teamspeak2 \ --enable-ted \ --enable-threshold \ --enable-unixsock \ --enable-uptime \ --enable-uuid \ --enable-write_graphite \ --enable-zfs_arc .if ${PORT_OPTIONS:MCGI} RUN_DEPENDS+= p5-URI>=0:${PORTSDIR}/net/p5-URI \ p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm \ p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper \ p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser PLIST_SUB+= CGI="" .if empty(PORT_OPTIONS:MRRDTOOL) IGNORE= CGI requires RRDTOOL. Either select RRDTOOL or deselect CGI .endif .else PLIST_SUB+= CGI="@comment " .endif .if ${PORT_OPTIONS:MCURL} LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+=--with-libcurl=${LOCALBASE} \ --enable-apache \ --enable-curl \ --enable-nginx \ --enable-write_http PLIST_SUB+= CURL="" .else CONFIGURE_ARGS+=--without-libcurl \ --disable-apache \ --disable-curl \ --disable-nginx \ --disable-write_http PLIST_SUB+= CURL="@comment " .endif .if ${PORT_OPTIONS:MCURL} && ${PORT_OPTIONS:MJSON} CONFIGURE_ARGS+=--enable-curl_json PLIST_SUB+= CURL_JSON="" .else CONFIGURE_ARGS+=--disable-curl_json PLIST_SUB+= CURL_JSON="@comment " .endif .if ${PORT_OPTIONS:MCURL} && ${PORT_OPTIONS:MXML} CONFIGURE_ARGS+= \ --enable-ascent \ --enable-bind \ --enable-curl_xml PLIST_SUB+= CURL_XML="" .else CONFIGURE_ARGS+= \ --disable-ascent \ --disable-bind \ --disable-curl_xml PLIST_SUB+= CURL_XML="@comment " .endif .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-debug .else CONFIGURE_ARGS+=--disable-debug .endif .if ${PORT_OPTIONS:MDBI} LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi CONFIGURE_ARGS+=--with-libdbi=${LOCALBASE} --enable-dbi PLIST_SUB+= DBI="" CFLAGS+= -Wno-deprecated-declarations .else CONFIGURE_ARGS+=--without-libdbi --disable-dbi PLIST_SUB+= DBI="@comment " .endif .if ${PORT_OPTIONS:MGCRYPT} LIB_DEPENDS+= libgcrypt.so:${PORTSDIR}/security/libgcrypt CONFIGURE_ARGS+=--with-libgcrypt=${LOCALBASE} LIBS+= -lgcrypt .else CONFIGURE_ARGS+=--without-libgcrypt .endif .if ${PORT_OPTIONS:MJSON} LIB_DEPENDS+= libyajl.so:${PORTSDIR}/devel/yajl CONFIGURE_ARGS+=--with-libyajl=${LOCALBASE} .else CONFIGURE_ARGS+=--without-libyajl .endif .if ${PORT_OPTIONS:MMEMCACHEC} LIB_DEPENDS+= libmemcached.so:${PORTSDIR}/databases/libmemcached CONFIGURE_ARGS+=--with-libmemcached=${LOCALBASE} --enable-memcachec PLIST_SUB+= MEMCACHEC="" .else CONFIGURE_ARGS+=--without-libmemcached PLIST_SUB+= MEMCACHEC="@comment " .endif .if ${PORT_OPTIONS:MMODBUS} LIB_DEPENDS+= libmodbus.so:${PORTSDIR}/comms/libmodbus CONFIGURE_ARGS+=--enable-modbus PLIST_SUB+= MODBUS="" .else PLIST_SUB+= MODBUS="@comment " .endif .if ${PORT_OPTIONS:MMONGODB} LIB_DEPENDS+= libmongoc.so:${PORTSDIR}/devel/mongo-c-driver CONFIGURE_ARGS+=--with-libmongoc=${LOCALBASE} \ --enable-write_mongodb PLIST_SUB+= MONGODB="" .else CONFIGURE_ARGS+=--without-libcmongoc \ --disable-write_mongodb PLIST_SUB+= MONGODB="@comment " .endif .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+=--with-libmysql=${LOCALBASE} --enable-mysql PLIST_SUB+= MYSQL="" .else CONFIGURE_ARGS+=--without-libmysql --disable-mysql PLIST_SUB+= MYSQL="@comment " .endif .if ${PORT_OPTIONS:MNOTIFYDESKTOP} LIB_DEPENDS+= libnotify.so:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+=--with-libnotify=${LOCALBASE} \ --enable-notify_desktop PLIST_SUB+= NOTIFYDESKTOP="" .else CONFIGURE_ARGS+=--without-libnotify --disable-notify_desktop PLIST_SUB+= NOTIFYDESKTOP="@comment " .endif .if ${PORT_OPTIONS:MNOTIFYEMAIL} LIB_DEPENDS+= libesmtp.so:${PORTSDIR}/mail/libesmtp CONFIGURE_ARGS+=--with-libesmtp=${LOCALBASE} \ --enable-notify_email PLIST_SUB+= NOTIFYEMAIL="" .else CONFIGURE_ARGS+=--without-libesmtp --disable-notify_email PLIST_SUB+= NOTIFYEMAIL="@comment " .endif .if ${PORT_OPTIONS:MNUTUPS} LIB_DEPENDS+= libupsclient.so:${PORTSDIR}/sysutils/nut CONFIGURE_ARGS+=--with-upsclient=${LOCALBASE} --enable-nut PLIST_SUB+= NUTUPS="" .else CONFIGURE_ARGS+=--without-libupsclient --disable-nut PLIST_SUB+= NUTUPS="@comment " .endif .if ${PORT_OPTIONS:MPERL} USES+= perl5 CONFIGURE_ARGS+=--with-perl=${PERL} --with-perl-bindings --enable-perl PLIST_SUB+= PERL="" .else CONFIGURE_ARGS+=--without-perl --without-perl-bindings --disable-perl PLIST_SUB+= PERL="@comment " .endif .if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes CONFIGURE_ARGS+=--with-postgresql=${LOCALBASE} --enable-postgresql --with-libpq PLIST_SUB+= PGSQL="" .else CONFIGURE_ARGS+=--without-postgresql --disable-postgresql --without-libpq PLIST_SUB+= PGSQL="@comment " .endif .if ${PORT_OPTIONS:MPING} LIB_DEPENDS+= liboping.so:${PORTSDIR}/net/liboping CONFIGURE_ARGS+=--with-liboping=${LOCALBASE} --enable-ping PLIST_SUB+= PING="" .else CONFIGURE_ARGS+=--without-liboping --disable-ping PLIST_SUB+= PING="@comment " .endif .if ${PORT_OPTIONS:MPYTHON} USES+= python CONFIGURE_ARGS+=--with-python=${PYTHON_CMD} --enable-python PLIST_SUB+= PYTHON="" .else CONFIGURE_ARGS+=--without-python --disable-python PLIST_SUB+= PYTHON="@comment " .endif .if ${PORT_OPTIONS:MRABBITMQ} LIB_DEPENDS+= librabbitmq.so:${PORTSDIR}/net/rabbitmq-c CONFIGURE_ARGS+=--with-librabbitmq=${LOCALBASE} \ --enable-rabbitmq PLIST_SUB+= RABBITMQ="" .else CONFIGURE_ARGS+=--without-librabbitmq \ --disable-rabbitmq PLIST_SUB+= RABBITMQ="@comment " .endif .if ${PORT_OPTIONS:MREDIS} LIB_DEPENDS+= libcredis.so:${PORTSDIR}/databases/credis CONFIGURE_ARGS+=--with-libcredis=${LOCALBASE} \ --enable-redis \ --enable-write_redis PLIST_SUB+= REDIS="" .else CONFIGURE_ARGS+=--without-libcredis \ --disable-redis \ --disable-write_redis PLIST_SUB+= REDIS="@comment " .endif .if ${PORT_OPTIONS:MRIEMANN} LIB_DEPENDS+= libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c CONFIGURE_ARGS+=--enable-write_riemann PLIST_SUB+= RIEMANN="" .else CONFIGURE_ARGS+=--disable-write_riemann PLIST_SUB+= RIEMANN="@comment " .endif .if ${PORT_OPTIONS:MROUTEROS} LIB_DEPENDS+= librouteros.so:${PORTSDIR}/net/librouteros CONFIGURE_ARGS+=--with-librouteros=${LOCALBASE} --enable-routeros PLIST_SUB+= ROUTEROS="" .else CONFIGURE_ARGS+=--without-librouteros --disable-routeros PLIST_SUB+= ROUTEROS="@comment " .endif .if ${PORT_OPTIONS:MRRDTOOL} LIB_DEPENDS+= librrd.so:${PORTSDIR}/databases/rrdtool CONFIGURE_ARGS+=--with-librrd=${LOCALBASE} \ --enable-rrdcached \ --enable-rrdtool PLIST_SUB+= RRDTOOL="" .else CONFIGURE_ARGS+=--without-librrd \ --disable-rrdcached \ --disable-rrdtool PLIST_SUB+= RRDTOOL="@comment " .endif .if ${PORT_OPTIONS:MSTATGRAB} USES+= pkgconfig LIB_DEPENDS+= libstatgrab.so:${PORTSDIR}/devel/libstatgrab LIBS+= `pkg-config --libs libstatgrab` CONFIGURE_ARGS+=--with-libstatgrab=${LOCALBASE} \ --enable-disk \ --enable-interface PLIST_SUB+= STATGRAB="" .else CONFIGURE_ARGS+=--without-libstatgrab PLIST_SUB+= STATGRAB="@comment " .endif .if ${OSVERSION} >= 900007 CONFIGURE_ARGS+=--enable-users PLIST_SUB+= USERS="" .elif ${PORT_OPTIONS:MSTATGRAB} CONFIGURE_ARGS+=--enable-users PLIST_SUB+= USERS="" .else PLIST_SUB+= USERS="@comment " .endif .if ${PORT_OPTIONS:MSIGROK} USE_GNOME+= glib20 LIB_DEPENDS+= libsigrok.so:${PORTSDIR}/devel/libsigrok CONFIGURE_ARGS+=--with-libsigrok --enable-sigrok PLIST_SUB+= SIGROK="" .else CONFIGURE_ARGS+=--disable-sigrok PLIST_SUB+= SIGROK="@comment " .endif .if ${PORT_OPTIONS:MSNMP} LIB_DEPENDS+= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp CONFIGURE_ARGS+=--with-libnetsnmp --enable-snmp PLIST_SUB+= SNMP="" .else CONFIGURE_ARGS+=--without-libnetsnmp PLIST_SUB+= SNMP="@comment " .endif .if ${PORT_OPTIONS:MTOKYOTYRANT} LIB_DEPENDS+= libtokyotyrant.so:${PORTSDIR}/databases/tokyotyrant CONFIGURE_ARGS+=--with-libtokyotyrant=${LOCALBASE} --enable-tokyotyrant PLIST_SUB+= TOKYOTYRANT="" .else CONFIGURE_ARGS+=--without-libtokyotyrant --disable-tokyotyrant PLIST_SUB+= TOKYOTYRANT="@comment " .endif .if ${PORT_OPTIONS:MVIRT} .if empty(PORT_OPTIONS:MXML) IGNORE= VIRT requires XML. Either select XML or deselect VIRT. .endif LIB_DEPENDS+= libvirt.so:${PORTSDIR}/devel/libvirt CONFIGURE_ARGS+=--enable-libvirt PLIST_SUB+= VIRT="" .else CONFIGURE_ARGS+=--without-libvirt --disable-libvirt PLIST_SUB+= VIRT="@comment " .endif .if ${PORT_OPTIONS:MXML} LIB_DEPENDS+= libxml2.so:${PORTSDIR}/textproc/libxml2 CONFIGURE_ARGS+=--with-libxml2=${LOCALBASE} .endif .if ${PORT_OPTIONS:MXMMS} LIB_DEPENDS+= libxmms.so:${PORTSDIR}/multimedia/xmms CONFIGURE_ARGS+=--with-libxmms=${LOCALBASE} --enable-xmms CFLAGS+= `xmms-config --cflags` PLIST_SUB+= XMMS="" .else CONFIGURE_ARGS+=--without-libxmms --disable-xmms PLIST_SUB+= XMMS="@comment " .endif post-patch: @${REINPLACE_CMD} 's/-Werror//' \ ${WRKSRC}/configure.ac ${WRKSRC}/src/Makefile.am \ ${WRKSRC}/src/libcollectdclient/Makefile.am @${REINPLACE_CMD} \ -e 's;@prefix@/var/;/var/;' \ -e 's;/var/lib/;/var/db/;' \ -e 's;@localstatedir@/lib/;/var/db/;' \ ${WRKSRC}/src/collectd.conf.in @${REINPLACE_CMD} \ -e 's;/etc/collection\.conf;${WWWDIR}/collection.conf;' \ ${WRKSRC}/contrib/collection.cgi @${REINPLACE_CMD} \ -e 's;/opt/collectd/var/lib;/var/db;' \ -e 's;/opt/collectd/lib;${PREFIX}/lib;' \ ${WRKSRC}/contrib/collection.conf post-install: @${MKDIR} ${STAGEDIR}/var/db/collectd .if ${PORT_OPTIONS:MCGI} @${MKDIR} ${STAGEDIR}${WWWDIR} ${INSTALL_SCRIPT} ${WRKSRC}/contrib/collection.cgi ${STAGEDIR}${WWWDIR}/ ${INSTALL_DATA} ${WRKSRC}/contrib/collection.conf \ ${STAGEDIR}${WWWDIR}/collection.conf.sample .endif post-stage: .if ${PORT_OPTIONS:MPERL} @${SED} -i '' -e 's,${STAGEDIR},,g' ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Collectd/.packlist .endif .include Index: head/net-mgmt/virt-viewer/Makefile =================================================================== --- head/net-mgmt/virt-viewer/Makefile (revision 372161) +++ head/net-mgmt/virt-viewer/Makefile (revision 372162) @@ -1,28 +1,28 @@ # Created by: Jason Helfman # $FreeBSD$ PORTNAME= virt-viewer PORTVERSION= 0.5.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-mgmt MASTER_SITES= http://virt-manager.org/download/sources/${PORTNAME}/ MAINTAINER= jgh@FreeBSD.org COMMENT= Provides a graphical viewer for a guest OS display BUILD_DEPENDS= xml2-config:${PORTSDIR}/textproc/libxml2 \ intltoolize:${PORTSDIR}/textproc/intltool LIB_DEPENDS= libvirt.so:${PORTSDIR}/devel/libvirt \ libgtk-vnc-1.0.so:${PORTSDIR}/net/gtk-vnc OPTIONS_DEFINE= NLS OPTIONS_SUB= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= DATADIRNAME=share USES= gmake pkgconfig NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls .include Index: head/net-mgmt/virtinst/Makefile =================================================================== --- head/net-mgmt/virtinst/Makefile (revision 372161) +++ head/net-mgmt/virtinst/Makefile (revision 372162) @@ -1,24 +1,24 @@ # Created by: Jason Helfman # $FreeBSD$ PORTNAME= virtinst PORTVERSION= 0.600.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-mgmt MASTER_SITES= http://virt-manager.org/download/sources/${PORTNAME}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= jgh@FreeBSD.org COMMENT= Module to help in starting installations inside of virtual machines LIB_DEPENDS= libvirt.so:${PORTSDIR}/devel/libvirt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urlgrabber>=3.9.1:${PORTSDIR}/www/py-urlgrabber USES= gettext python USE_PYTHON= distutils post-patch: ${REINPLACE_CMD} 's|share/man|man|g' \ ${WRKSRC}/setup.py .include Index: head/sysutils/cfengine33/Makefile =================================================================== --- head/sysutils/cfengine33/Makefile (revision 372161) +++ head/sysutils/cfengine33/Makefile (revision 372162) @@ -1,79 +1,79 @@ # Created by: jrhett@netconsonance.com # $FreeBSD$ PORTNAME= cfengine PORTVERSION= 3.3.8 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= sysutils MASTER_SITES= https://s3.amazonaws.com/cfengine.package-repos/tarballs/ PKGNAMESUFFIX= 33 MAINTAINER= cy@FreeBSD.org # gjb@FreeBSD.org is also committer for this port COMMENT= Systems administration tool for networks FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} CONFLICTS= cfengine-2* cfengine-3.[245]* cfengine-devel-* USE_RC_SUBR= cf-execd cf-serverd USES= gmake libtool USE_LDCONFIG= yes USE_OPENSSL= yes GNU_CONFIGURE= yes # EXAMPLESDIR= ${PREFIX}/share/examples/cfengine3 DOCSDIR= ${PREFIX}/share/doc/cfengine CONFIGURE_ARGS= --docdir=${DOCSDIR} \ --htmldir=${DOCSDIR}/html \ --with-pcre=${LOCALBASE} \ --enable-fhs CFLAGS+= -Wno-error=implicit-function-declaration LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre OPTIONS_DEFINE= PGSQL MYSQL LIBVIRT OPTIONS_SINGLE= DB OPTIONS_SINGLE_DB= TOKYOCABINET QDBM TOKYOCABINET_DESC= Enable TokyoCabinet database backend QDBM_DESC= Enable QDBM database backend PGSQL_DESC= Enable PostgreSQL integration MYSQL_DESC= Enable MySQL integration LIBVIRT_DESC= Enable libvirt integration OPTIONS_DEFAULT=TOKYOCABINET post-patch: @${REINPLACE_CMD} -e '/^htmldir/s!=.*!= @htmldir@!' \ ${WRKSRC}/docs/Makefile.in .include .if ${PORT_OPTIONS:MTOKYOCABINET} CONFIGURE_ARGS+= --with-tokyocabinet=${LOCALBASE} LIB_DEPENDS+= libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet .endif .if ${PORT_OPTIONS:MQDBM} CONFIGURE_ARGS+= --with-qdbm=${LOCALBASE} LIB_DEPENDS+= libqdbm.so:${PORTSDIR}/databases/qdbm .endif .if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE} LIB_DEPENDS+= libpq.so:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client .endif .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} LIB_DEPENDS+= libmysqlclient.so:${PORTSDIR}/${_MYSQL_CLIENT} LDFLAGS+= -L${LOCALBASE}/lib/mysql .endif .if ${PORT_OPTIONS:MLIBVIRT} CONFIGURE_ARGS+= --with-libvirt=${LOCALBASE} LIB_DEPENDS+= libvirt.so:${PORTSDIR}/devel/libvirt .endif .include Index: head/sysutils/cfengine34/Makefile =================================================================== --- head/sysutils/cfengine34/Makefile (revision 372161) +++ head/sysutils/cfengine34/Makefile (revision 372162) @@ -1,87 +1,87 @@ # Created by: jrhett@netconsonance.com # $FreeBSD$ PORTNAME= cfengine PORTVERSION= 3.4.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils MASTER_SITES= https://s3.amazonaws.com/cfengine.package-repos/tarballs/ MAINTAINER= cy@FreeBSD.org # gjb@FreeBSD.org is also committer for this port COMMENT= Systems administration tool for networks .if !defined(MASTERDIR) PKGNAMESUFFIX= 34 LATEST_LINK= cfengine34 .endif FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} CONFLICTS= cfengine-2* cfengine-3.[235]* cfengine-devel-* USE_RC_SUBR= cf-execd cf-serverd USES= libtool gmake USE_LDCONFIG= yes USE_OPENSSL= yes GNU_CONFIGURE= yes # EXAMPLESDIR= ${PREFIX}/share/examples/cfengine3 DOCSDIR= ${PREFIX}/share/doc/cfengine CONFIGURE_ARGS= --docdir=${DOCSDIR} \ --htmldir=${DOCSDIR}/html \ --libexecdir=${PREFIX}/libexec \ --libdir=${PREFIX}/libexec \ --mandir=${PREFIX}/man \ --with-workdir=/var/cfengine \ --with-pcre=${LOCALBASE} \ --enable-fhs LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre OPTIONS_DEFINE= PGSQL MYSQL LIBVIRT OPTIONS_SINGLE= BACKEND OPTIONS_SINGLE_BACKEND= TOKYOCABINET QDBM OPTIONS_DEFAULT= TOKYOCABINET TOKYOCABINET_DESC= Use TokyoCabinet as backend db QDBM_DESC= Use QDBM as backend db PGSQL_DESC= Enable PostgreSQL connector MYSQL_DESC= Enable MySQL connector LIBVIRT_DESC= Enable libvirt compatibility .include .if ${PORT_OPTIONS:MTOKYOCABINET} CONFIGURE_ARGS+= --with-tokyocabinet=${LOCALBASE} LIB_DEPENDS+= libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet .endif .if ${PORT_OPTIONS:MQDBM} CONFIGURE_ARGS+= --with-qdbm=${LOCALBASE} LIB_DEPENDS+= libqdbm.so:${PORTSDIR}/databases/qdbm .endif .if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE} LIB_DEPENDS+= libpq.so:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client .endif .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} LIB_DEPENDS+= libmysqlclient.so:${PORTSDIR}/${_MYSQL_CLIENT} LDFLAGS+= -L${LOCALBASE}/lib/mysql .endif .if ${PORT_OPTIONS:MLIBVIRT} CONFIGURE_ARGS+= --with-libvirt=${LOCALBASE} LIB_DEPENDS+= libvirt.so:${PORTSDIR}/devel/libvirt .endif post-patch: @${REINPLACE_CMD} -e '/^htmldir/s!=.*!= @htmldir@!'\ ${WRKSRC}/docs/Makefile.in .include Index: head/sysutils/cfengine35/Makefile =================================================================== --- head/sysutils/cfengine35/Makefile (revision 372161) +++ head/sysutils/cfengine35/Makefile (revision 372162) @@ -1,82 +1,82 @@ # Created by: jrhett@netconsonance.com # $FreeBSD$ PORTNAME= cfengine PORTVERSION= 3.5.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= sysutils MASTER_SITES= https://s3.amazonaws.com/cfengine.package-repos/tarballs/ MAINTAINER= cy@FreeBSD.org # gjb@FreeBSD.org is also committer for this port COMMENT= Systems administration tool for networks LICENSE= GPLv3 LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre .if !defined(MASTERDIR) PKGNAMESUFFIX= 35 .endif FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} CONFLICTS= cfengine-[234]* USE_RC_SUBR= cf-execd cf-serverd cf-monitord USES= gmake libtool USE_LDCONFIG= yes USE_OPENSSL= yes GNU_CONFIGURE= yes CFLAGS+= -Wno-return-type # EXAMPLESDIR= ${PREFIX}/share/examples/cfengine3 DOCSDIR= ${PREFIX}/share/doc/cfengine CONFIGURE_ARGS= --docdir=${DOCSDIR} \ --htmldir=${DOCSDIR}/html \ --libexecdir=${PREFIX}/libexec \ --libdir=${PREFIX}/libexec \ --mandir=${PREFIX}/man \ --with-workdir=/var/cfengine \ --with-pcre=${LOCALBASE} \ --enable-fhs INSTALL_TARGET= install-strip OPTIONS_DEFINE= PGSQL MYSQL LIBVIRT OPTIONS_SINGLE= DB OPTIONS_SINGLE_DB= TOKYOCABINET QDBM TOKYOCABINET_DESC= Enable TokyoCabinet database backend QDBM_DESC= Enable QDBM database backend OPTIONS_DEFAULT=TOKYOCABINET .include .if ${PORT_OPTIONS:MTOKYOCABINET} CONFIGURE_ARGS+= --with-tokyocabinet=${LOCALBASE} LIB_DEPENDS+= libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet .endif .if ${PORT_OPTIONS:MQDBM} CONFIGURE_ARGS+= --with-qdbm=${LOCALBASE} LIB_DEPENDS+= libqdbm.so:${PORTSDIR}/databases/qdbm .endif .if ${PORT_OPTIONS:MPGSQL} USE_PGSQL= yes CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE} LIB_DEPENDS+= libpq.so:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client .endif .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} LIB_DEPENDS+= libmysqlclient.so:${PORTSDIR}/${_MYSQL_CLIENT} LDFLAGS+= -L${LOCALBASE}/lib/mysql .endif .if ${PORT_OPTIONS:MLIBVIRT} CONFIGURE_ARGS+= --with-libvirt=${LOCALBASE} LIB_DEPENDS+= libvirt.so:${PORTSDIR}/devel/libvirt .endif .include Index: head/sysutils/cfengine36/Makefile =================================================================== --- head/sysutils/cfengine36/Makefile (revision 372161) +++ head/sysutils/cfengine36/Makefile (revision 372162) @@ -1,69 +1,69 @@ # Created by: jrhett@netconsonance.com # $FreeBSD$ PORTNAME= cfengine PORTVERSION= 3.6.1 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= sysutils MASTER_SITES= https://s3.amazonaws.com/cfengine.package-repos/tarballs/ MAINTAINER= cy@FreeBSD.org # gjb@FreeBSD.org is also committer for this port COMMENT= Systems administration tool for networks LICENSE= GPLv3 .if !defined(MASTERDIR) PKGNAMESUFFIX= 36 LATEST_LINK= cfengine36 .endif FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} CONFLICTS= cfengine-[234]* USE_RC_SUBR= cf-execd cf-serverd cf-monitord MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes USE_OPENSSL= yes GNU_CONFIGURE= yes USES= gmake libtool USE_AUTOTOOLS= autoconf:env automake:env libtoolize:env CFLAGS+= -Wno-return-type CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib # EXAMPLESDIR= ${PREFIX}/share/examples/cfengine3 DOCSDIR= ${PREFIX}/share/doc/cfengine CONFIGURE_ARGS= --docdir=${DOCSDIR} \ --htmldir=${DOCSDIR}/html \ --libexecdir=${PREFIX}/libexec \ --libdir=${PREFIX}/libexec \ --mandir=${PREFIX}/man \ --with-workdir=/var/cfengine \ --with-pcre=${LOCALBASE} \ --with-lmdb=${LOCALBASE} \ --enable-fhs INSTALL_TARGET= install-strip LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre \ liblmdb.so:${PORTSDIR}/databases/lmdb OPTIONS_DEFINE= PGSQL MYSQL LIBVIRT PGSQL_USES= pgsql PGSQL_CONFIGURE_ON= --with-postgresql=${LOCALBASE} MYSQL_USE= MYSQL=yes MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE} MYSQL_LIB_DEPENDS= libmysqlclient.so:${PORTSDIR}/${_MYSQL_CLIENT} MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql LIBVIRT_CONFIGURE_ON= --with-libvirt=${LOCALBASE} LIBVIRT_LIB_DEPENDS+= libvirt.so:${PORTSDIR}/devel/libvirt pre-configure: @cd ${WRKSRC}; autoreconf -Wno-portability --force --install -I m4 .include Index: head/sysutils/cfengine36-rc/Makefile =================================================================== --- head/sysutils/cfengine36-rc/Makefile (revision 372161) +++ head/sysutils/cfengine36-rc/Makefile (revision 372162) @@ -1,69 +1,69 @@ # Created by: jrhett@netconsonance.com # $FreeBSD$ PORTNAME= cfengine PORTVERSION= 3.6.2rc -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= sysutils MASTER_SITES= https://s3.amazonaws.com/cfengine.package-repos/tarballs/ MAINTAINER= cy@FreeBSD.org # gjb@FreeBSD.org is also committer for this port COMMENT= Systems administration tool for networks LICENSE= GPLv3 .if !defined(MASTERDIR) PKGNAMESUFFIX= 36-rc LATEST_LINK= cfengine36-rc .endif FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DISTFILES} CONFLICTS= cfengine-[234]* USE_RC_SUBR= cf-execd cf-serverd cf-monitord MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes USE_OPENSSL= yes GNU_CONFIGURE= yes USES= gmake libtool USE_AUTOTOOLS= autoconf:env automake:env libtoolize:env CFLAGS+= -Wno-return-type CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib # EXAMPLESDIR= ${PREFIX}/share/examples/cfengine3 DOCSDIR= ${PREFIX}/share/doc/cfengine CONFIGURE_ARGS= --docdir=${DOCSDIR} \ --htmldir=${DOCSDIR}/html \ --libexecdir=${PREFIX}/libexec \ --libdir=${PREFIX}/libexec \ --mandir=${PREFIX}/man \ --with-workdir=/var/cfengine \ --with-pcre=${LOCALBASE} \ --with-lmdb=${LOCALBASE} \ --enable-fhs INSTALL_TARGET= install-strip LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre \ liblmdb.so:${PORTSDIR}/databases/lmdb OPTIONS_DEFINE= PGSQL MYSQL LIBVIRT PGSQL_USES= pgsql PGSQL_CONFIGURE_ON= --with-postgresql=${LOCALBASE} MYSQL_USE= MYSQL=yes MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE} MYSQL_LIB_DEPENDS= libmysqlclient.so:${PORTSDIR}/${_MYSQL_CLIENT} MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql LIBVIRT_CONFIGURE_ON= --with-libvirt=${LOCALBASE} LIBVIRT_LIB_DEPENDS+= libvirt.so:${PORTSDIR}/devel/libvirt pre-configure: @cd ${WRKSRC}; autoreconf -Wno-portability --force --install -I m4 .include