From owner-svn-ports-all@FreeBSD.ORG Mon Sep 29 21:27:57 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5A4FC79F; Mon, 29 Sep 2014 21:27:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3CA2BA7D; Mon, 29 Sep 2014 21:27:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8TLRvBG050369; Mon, 29 Sep 2014 21:27:57 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8TLRuSD050366; Mon, 29 Sep 2014 21:27:56 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201409292127.s8TLRuSD050366@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Mon, 29 Sep 2014 21:27:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369560 - head/net-mgmt/icinga2 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.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Sep 2014 21:27:57 -0000 Author: lme Date: Mon Sep 29 21:27:55 2014 New Revision: 369560 URL: http://svnweb.freebsd.org/changeset/ports/369560 QAT: https://qat.redports.org/buildarchive/r369560/ Log: - Update to 2.1.1 - Add a dependency on Python - Remove @dirrmtry in plist Modified: head/net-mgmt/icinga2/Makefile head/net-mgmt/icinga2/distinfo (contents, props changed) head/net-mgmt/icinga2/pkg-plist (contents, props changed) Modified: head/net-mgmt/icinga2/Makefile ============================================================================== --- head/net-mgmt/icinga2/Makefile Mon Sep 29 21:24:18 2014 (r369559) +++ head/net-mgmt/icinga2/Makefile Mon Sep 29 21:27:55 2014 (r369560) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= icinga2 -DISTVERSION= 2.0.1 -PORTREVISION= 1 +DISTVERSION= 2.1.1 CATEGORIES= net-mgmt MASTER_SITES= http://github.com/Icinga/${PORTNAME}/archive/v${DISTVERSION}.tar.gz?dummy=/ @@ -11,11 +10,12 @@ COMMENT= Monitoring and management syste LICENSE= GPLv2 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX} LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \ libexecinfo.so:${PORTSDIR}/devel/libexecinfo # for better debugging RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash -USES= bison cmake +USES= bison cmake python USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} @@ -46,6 +46,7 @@ CMAKE_ARGS+= -DICINGA2_USER=${ICINGA2USE -DICINGA2_GROUP=${ICINGA2GROUP} \ -DICINGA2_COMMAND_USER=${ICINGA2USER} \ -DICINGA2_COMMAND_GROUP=${ICINGA2USER} \ + -DICINGA2_PLUGINDIR=${LOCALBASE}/libexec/nagios \ -DCMAKE_INSTALL_SYSCONFDIR=${PREFIX}/etc \ -DCMAKE_INSTALL_LOCALSTATEDIR=${LOCALSTATEDIR} \ -DCMAKE_INSTALL_MANDIR=${MANPREFIX}/man \ @@ -83,8 +84,6 @@ PLIST_SUB+= PGSQL="@comment " post-patch: ${REINPLACE_CMD} -e '/^add_subdirectory(initsystem)/d' \ -e '/logrotate\.d/d' ${WRKSRC}/etc/CMakeLists.txt - ${REINPLACE_CMD} 's,/usr/lib/nagios/plugins,${LOCALBASE}/libexec/nagios,g' \ - ${WRKSRC}/etc/icinga2/constants.conf .for f in ${LINUX_CONFIG} ${REINPLACE_CMD} 's,[Ll]inux,FreeBSD,g' ${WRKSRC}/etc/icinga2/conf.d/${f} .endfor Modified: head/net-mgmt/icinga2/distinfo ============================================================================== --- head/net-mgmt/icinga2/distinfo Mon Sep 29 21:24:18 2014 (r369559) +++ head/net-mgmt/icinga2/distinfo Mon Sep 29 21:27:55 2014 (r369560) @@ -1,2 +1,2 @@ -SHA256 (icinga2-2.0.1.tar.gz) = 7076ce1781454884b5b922cd7c0f1e7bf146435a7f3e49b2cc5887df28e179e5 -SIZE (icinga2-2.0.1.tar.gz) = 538638 +SHA256 (icinga2-2.1.1.tar.gz) = 57755272a32f6286632f07153225bb066cae07affe8731d4628cef7695de74a2 +SIZE (icinga2-2.1.1.tar.gz) = 574595 Modified: head/net-mgmt/icinga2/pkg-plist ============================================================================== --- head/net-mgmt/icinga2/pkg-plist Mon Sep 29 21:24:18 2014 (r369559) +++ head/net-mgmt/icinga2/pkg-plist Mon Sep 29 21:27:55 2014 (r369560) @@ -60,23 +60,35 @@ lib/icinga2/libmmatch.so lib/icinga2/libnotification.so lib/icinga2/libperfdata.so lib/icinga2/libremote.so -man/man8/icinga2-build-ca.8.gz -man/man8/icinga2-build-key.8.gz -man/man8/icinga2-disable-feature.8.gz -man/man8/icinga2-enable-feature.8.gz -man/man8/icinga2-prepare-dirs.8.gz -man/man8/icinga2-sign-key.8.gz -man/man8/icinga2.8.gz +%%PYTHON_SITELIBDIR%%/icinga2-2.1.1-py%%PYTHON_VER%%.egg-info/PKG-INFO +%%PYTHON_SITELIBDIR%%/icinga2-2.1.1-py%%PYTHON_VER%%.egg-info/SOURCES.txt +%%PYTHON_SITELIBDIR%%/icinga2-2.1.1-py%%PYTHON_VER%%.egg-info/dependency_links.txt +%%PYTHON_SITELIBDIR%%/icinga2-2.1.1-py%%PYTHON_VER%%.egg-info/entry_points.txt +%%PYTHON_SITELIBDIR%%/icinga2-2.1.1-py%%PYTHON_VER%%.egg-info/top_level.txt +%%PYTHON_SITELIBDIR%%/icinga2/__init__.py +%%PYTHON_SITELIBDIR%%/icinga2/__init__.pyc +%%PYTHON_SITELIBDIR%%/icinga2/commands/__init__.py +%%PYTHON_SITELIBDIR%%/icinga2/commands/__init__.pyc +%%PYTHON_SITELIBDIR%%/icinga2/commands/list_objects.py +%%PYTHON_SITELIBDIR%%/icinga2/commands/list_objects.pyc +%%PYTHON_SITELIBDIR%%/icinga2/config.py +%%PYTHON_SITELIBDIR%%/icinga2/config.pyc +%%PYTHON_SITELIBDIR%%/icinga2/utils/__init__.py +%%PYTHON_SITELIBDIR%%/icinga2/utils/__init__.pyc +%%PYTHON_SITELIBDIR%%/icinga2/utils/debug.py +%%PYTHON_SITELIBDIR%%/icinga2/utils/debug.pyc +%%PYTHON_SITELIBDIR%%/icinga2/utils/netstring.py +%%PYTHON_SITELIBDIR%%/icinga2/utils/netstring.pyc sbin/icinga2 sbin/icinga2-disable-feature sbin/icinga2-enable-feature +sbin/icinga2-list-objects %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/COPYING.Exceptions %%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.md %%PORTDOCS%%%%DOCSDIR%%/markdown/1-about.md %%PORTDOCS%%%%DOCSDIR%%/markdown/2-getting-started.md %%PORTDOCS%%%%DOCSDIR%%/markdown/3-monitoring-basics.md @@ -87,42 +99,36 @@ sbin/icinga2-enable-feature %%PORTDOCS%%%%DOCSDIR%%/markdown/8-migration.md %%PORTDOCS%%%%DOCSDIR%%/markdown/9-appendix.md %%DATADIR%%/include/command-icinga.conf +%%DATADIR%%/include/command-plugins-manubulon.conf %%DATADIR%%/include/command-plugins.conf %%DATADIR%%/include/command.conf %%DATADIR%%/include/itl +%%DATADIR%%/include/manubulon %%DATADIR%%/include/plugins %%DATADIR%%/include/timeperiod.conf %%DATADIR%%/pki/openssl-quiet.cnf %%DATADIR%%/pki/openssl.cnf %%DATADIR%%/pki/pkifuncs %%DATADIR%%/pki/vars -@dirrmtry %%ETCDIR%%/conf.d/hosts/localhost -@dirrmtry %%ETCDIR%%/conf.d/hosts -@dirrmtry %%ETCDIR%%/conf.d -@dirrmtry %%ETCDIR%%/features-available -@dirrmtry %%ETCDIR%%/features-enabled -@dirrmtry %%ETCDIR%%/pki -@dirrmtry %%ETCDIR%%/scripts -@dirrmtry %%ETCDIR%%/zones.d -@dirrmtry %%ETCDIR%% -@dirrmtry lib/icinga2 -%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/markdown -%%PORTDOCS%%@dirrmtry %%DOCSDIR%% -@dirrmtry %%DATADIR%%/include -@dirrmtry %%DATADIR%%/pki -@dirrmtry %%DATADIR%% -@unexec rmdir "/var/cache/icinga2" >/dev/null 2>&1 || : -@unexec rmdir "/var/lib/icinga2/api/log" >/dev/null 2>&1 || : -@unexec rmdir "/var/lib/icinga2/api/repository" >/dev/null 2>&1 || : -@unexec rmdir "/var/lib/icinga2/api/zones" >/dev/null 2>&1 || : -@unexec rmdir "/var/lib/icinga2/api" >/dev/null 2>&1 || : -@unexec rmdir "/var/lib/icinga2" >/dev/null 2>&1 || : -@unexec rmdir "/var/lib" >/dev/null 2>&1 || : -@unexec rmdir "/var/log/icinga2/compat/archives" >/dev/null 2>&1 || : -@unexec rmdir "/var/log/icinga2/compat" >/dev/null 2>&1 || : -@unexec rmdir "/var/log/icinga2" >/dev/null 2>&1 || : -@unexec rmdir "/var/run/icinga2/cmd" >/dev/null 2>&1 || : -@unexec rmdir "/var/run/icinga2" >/dev/null 2>&1 || : -@unexec rmdir "/var/spool/icinga2/perfdata" >/dev/null 2>&1 || : -@unexec rmdir "/var/spool/icinga2/tmp" >/dev/null 2>&1 || : -@unexec rmdir "/var/spool/icinga2" >/dev/null 2>&1 || : +share/man/man8/icinga2-build-ca.8 +share/man/man8/icinga2-build-key.8 +share/man/man8/icinga2-disable-feature.8 +share/man/man8/icinga2-enable-feature.8 +share/man/man8/icinga2-prepare-dirs.8 +share/man/man8/icinga2-sign-key.8 +share/man/man8/icinga2.8 +@dir /var/cache/icinga2 +@dir /var/lib/icinga2/api/log +@dir /var/lib/icinga2/api/repository +@dir /var/lib/icinga2/api/zones +@dir /var/lib/icinga2/api +@dir /var/lib/icinga2 +@dir /var/lib +@dir /var/log/icinga2/compat/archives +@dir /var/log/icinga2/compat +@dir /var/log/icinga2 +@dir /var/run/icinga2/cmd +@dir /var/run/icinga2 +@dir /var/spool/icinga2/perfdata +@dir /var/spool/icinga2/tmp +@dir /var/spool/icinga2