From owner-svn-ports-all@FreeBSD.ORG Fri Oct 3 13:30:48 2014 Return-Path: Delivered-To: svn-ports-all@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 6DE8DF12; Fri, 3 Oct 2014 13:30:48 +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 59AB5CE6; Fri, 3 Oct 2014 13:30:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s93DUmLG071182; Fri, 3 Oct 2014 13:30:48 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s93DUlwN071178; Fri, 3 Oct 2014 13:30:47 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201410031330.s93DUlwN071178@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Fri, 3 Oct 2014 13:30:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369899 - in head/net-mgmt/icinga2: . files 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: Fri, 03 Oct 2014 13:30:48 -0000 Author: lme Date: Fri Oct 3 13:30:47 2014 New Revision: 369899 URL: https://svnweb.freebsd.org/changeset/ports/369899 QAT: https://qat.redports.org/buildarchive/r369899/ Log: - Fix dependency on PGSQL - Enable PGSQL by default - Install manpages to the proper location - Use option helpers [1] - Use proper order of .mk includes [1] - Bump PORTREVISION Suggested by: bapt [1] Added: head/net-mgmt/icinga2/files/patch-third-party__cmake__GNUInstallDirs.cmake (contents, props changed) Modified: head/net-mgmt/icinga2/Makefile head/net-mgmt/icinga2/pkg-plist Modified: head/net-mgmt/icinga2/Makefile ============================================================================== --- head/net-mgmt/icinga2/Makefile Fri Oct 3 13:27:09 2014 (r369898) +++ head/net-mgmt/icinga2/Makefile Fri Oct 3 13:30:47 2014 (r369899) @@ -2,7 +2,7 @@ PORTNAME= icinga2 DISTVERSION= 2.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= http://github.com/Icinga/${PORTNAME}/archive/v${DISTVERSION}.tar.gz?dummy=/ @@ -27,7 +27,7 @@ OPTIONS_MULTI_BACKEND= MYSQL PGSQL OPTIONS_RADIO= PLUGINS OPTIONS_RADIO_PLUGINS= MONPLUGINS NAGPLUGINS -OPTIONS_DEFAULT= MYSQL MONPLUGINS EXAMPLES +OPTIONS_DEFAULT= MYSQL PGSQL 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 @@ -60,29 +60,18 @@ SUB_LIST= ICINGA2LOGDIR=${ICINGA2LOGDIR} # Config files with references to "Linux" LINUX_CONFIG= groups.conf services.conf hosts/localhost.conf -.include +MYSQL_USE= mysql=yes +PGSQL_USES= pgsql + +OPTIONS_SUB= yes + +.include .if ${OSVERSION} < 1000033 BUILD_DEPENDS+= flex>=2.5.31:${PORTSDIR}/textproc/flex CMAKE_ARGS+= -DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex CXXFLAGS+= -I${LOCALBASE}/include/flex .endif -.include - -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes -PLIST_SUB+= MYSQL="" -.else -PLIST_SUB+= MYSQL="@comment " -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USES+= pgsql -PLIST_SUB+= PGSQL="" -.else -PLIST_SUB+= PGSQL="@comment " -.endif - post-patch: ${REINPLACE_CMD} -e '/^add_subdirectory(initsystem)/d' \ -e '/logrotate\.d/d' ${WRKSRC}/etc/CMakeLists.txt @@ -104,4 +93,4 @@ post-install: .endfor .endif -.include +.include Added: head/net-mgmt/icinga2/files/patch-third-party__cmake__GNUInstallDirs.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/icinga2/files/patch-third-party__cmake__GNUInstallDirs.cmake Fri Oct 3 13:30:47 2014 (r369899) @@ -0,0 +1,11 @@ +--- third-party/cmake/GNUInstallDirs.cmake.orig 2014-10-03 15:04:47.712808574 +0200 ++++ third-party/cmake/GNUInstallDirs.cmake 2014-10-03 15:05:17.916805737 +0200 +@@ -166,7 +166,7 @@ + set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}") + endif() + +-if(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") ++if(CMAKE_SYSTEM_NAME MATCHES "^(FreeBSD|OpenBSD)$") + if(NOT CMAKE_INSTALL_INFODIR) + set(CMAKE_INSTALL_INFODIR "" CACHE PATH "info documentation (info)") + set(CMAKE_INSTALL_INFODIR "info") Modified: head/net-mgmt/icinga2/pkg-plist ============================================================================== --- head/net-mgmt/icinga2/pkg-plist Fri Oct 3 13:27:09 2014 (r369898) +++ head/net-mgmt/icinga2/pkg-plist Fri Oct 3 13:30:47 2014 (r369899) @@ -79,6 +79,13 @@ lib/icinga2/libremote.so %%PYTHON_SITELIBDIR%%/icinga2/utils/debug.pyc %%PYTHON_SITELIBDIR%%/icinga2/utils/netstring.py %%PYTHON_SITELIBDIR%%/icinga2/utils/netstring.pyc +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 sbin/icinga2 sbin/icinga2-disable-feature sbin/icinga2-enable-feature @@ -116,13 +123,6 @@ sbin/icinga2-list-objects %%DATADIR%%/pki/openssl.cnf %%DATADIR%%/pki/pkifuncs %%DATADIR%%/pki/vars -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