From owner-svn-ports-head@FreeBSD.ORG Tue Sep 30 14:48:26 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 503C6294; Tue, 30 Sep 2014 14:48:26 +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 2BA1D6E1; Tue, 30 Sep 2014 14:48:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8UEmQej031679; Tue, 30 Sep 2014 14:48:26 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8UEmPIO031677; Tue, 30 Sep 2014 14:48:25 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201409301448.s8UEmPIO031677@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Tue, 30 Sep 2014 14:48:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369611 - 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-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Sep 2014 14:48:26 -0000 Author: lme Date: Tue Sep 30 14:48:25 2014 New Revision: 369611 URL: http://svnweb.freebsd.org/changeset/ports/369611 QAT: https://qat.redports.org/buildarchive/r369611/ Log: - Add EXAMPLES option to install schemas to create mysql/pgsql databases for Icinga 2 - Bump PORTREVISION Modified: head/net-mgmt/icinga2/Makefile head/net-mgmt/icinga2/pkg-plist Modified: head/net-mgmt/icinga2/Makefile ============================================================================== --- head/net-mgmt/icinga2/Makefile Tue Sep 30 14:36:54 2014 (r369610) +++ head/net-mgmt/icinga2/Makefile Tue Sep 30 14:48:25 2014 (r369611) @@ -2,6 +2,7 @@ PORTNAME= icinga2 DISTVERSION= 2.1.1 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= http://github.com/Icinga/${PORTNAME}/archive/v${DISTVERSION}.tar.gz?dummy=/ @@ -20,13 +21,13 @@ USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_MULTI= BACKEND OPTIONS_MULTI_BACKEND= MYSQL PGSQL OPTIONS_RADIO= PLUGINS OPTIONS_RADIO_PLUGINS= MONPLUGINS NAGPLUGINS -OPTIONS_DEFAULT= MYSQL MONPLUGINS +OPTIONS_DEFAULT= MYSQL MONPLUGINS EXAMPLES MONPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/monitoring-plugins NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins @@ -56,6 +57,7 @@ SUB_LIST= ICINGA2LOGDIR=${ICINGA2LOGDIR} ICINGA2GROUP=${ICINGA2GROUP} \ WWWGRP=${WWWGRP} +# Config files with references to "Linux" LINUX_CONFIG= groups.conf services.conf hosts/localhost.conf .include @@ -75,7 +77,7 @@ PLIST_SUB+= MYSQL="@comment " .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes +USES+= pgsql PLIST_SUB+= PGSQL="" .else PLIST_SUB+= PGSQL="@comment " @@ -94,4 +96,12 @@ post-patch: ${REINPLACE_CMD} '/^add_subdirectory(db_ido_pgsql)/d' ${WRKSRC}/components/CMakeLists.txt .endif +post-install: +.if ${PORT_OPTIONS:MEXAMPLES} +.for db in mysql pgsql + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${db} + (cd ${WRKSRC}/components/db_ido_${db} && ${COPYTREE_SHARE} schema ${STAGEDIR}${EXAMPLESDIR}/${db}) +.endfor +.endif + .include Modified: head/net-mgmt/icinga2/pkg-plist ============================================================================== --- head/net-mgmt/icinga2/pkg-plist Tue Sep 30 14:36:54 2014 (r369610) +++ head/net-mgmt/icinga2/pkg-plist Tue Sep 30 14:48:25 2014 (r369611) @@ -98,6 +98,12 @@ sbin/icinga2-list-objects %%PORTDOCS%%%%DOCSDIR%%/markdown/7-troubleshooting.md %%PORTDOCS%%%%DOCSDIR%%/markdown/8-migration.md %%PORTDOCS%%%%DOCSDIR%%/markdown/9-appendix.md +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mysql/schema/mysql.sql +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mysql/schema/upgrade/2.0.2.sql +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mysql/schema/upgrade/2.1.0.sql +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgsql/schema/pgsql.sql +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgsql/schema/upgrade/2.0.2.sql +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgsql/schema/upgrade/2.1.0.sql %%DATADIR%%/include/command-icinga.conf %%DATADIR%%/include/command-plugins-manubulon.conf %%DATADIR%%/include/command-plugins.conf