Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Jul 2015 10:28:31 +0000 (UTC)
From:      Lars Engels <lme@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r392867 - branches/2015Q3/net-mgmt/icinga2
Message-ID:  <201507251028.t6PASVM2068000@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: lme
Date: Sat Jul 25 10:28:30 2015
New Revision: 392867
URL: https://svnweb.freebsd.org/changeset/ports/392867

Log:
  MFH: r392076
  
  - Fix typo in plist [1]
  - Install libdb_ido.so conditionally
  
  Noticed by:	pi [1]
  Approved by:	portmgr (delphij)

Modified:
  branches/2015Q3/net-mgmt/icinga2/Makefile
  branches/2015Q3/net-mgmt/icinga2/pkg-plist
Directory Properties:
  branches/2015Q3/   (props changed)

Modified: branches/2015Q3/net-mgmt/icinga2/Makefile
==============================================================================
--- branches/2015Q3/net-mgmt/icinga2/Makefile	Sat Jul 25 10:27:19 2015	(r392866)
+++ branches/2015Q3/net-mgmt/icinga2/Makefile	Sat Jul 25 10:28:30 2015	(r392867)
@@ -73,6 +73,13 @@ PGSQL_USES=	pgsql
 OPTIONS_SUB=	yes
 
 .include <bsd.port.options.mk>
+
+.if ! ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MPGSQL}
+PLIST_SUB+=	DBBACKEND="@comment "
+.else
+PLIST_SUB+=	DBBACKEND=""
+.endif
+
 .if ${OSVERSION} < 1000033
 BUILD_DEPENDS+=	flex>=2.5.31:${PORTSDIR}/textproc/flex
 CMAKE_ARGS+=	-DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex

Modified: branches/2015Q3/net-mgmt/icinga2/pkg-plist
==============================================================================
--- branches/2015Q3/net-mgmt/icinga2/pkg-plist	Sat Jul 25 10:27:19 2015	(r392866)
+++ branches/2015Q3/net-mgmt/icinga2/pkg-plist	Sat Jul 25 10:28:30 2015	(r392867)
@@ -42,7 +42,7 @@ lib/icinga2/libchecker.so
 lib/icinga2/libcli.so
 lib/icinga2/libcompat.so
 lib/icinga2/libconfig.so
-%%MYSQL%%%%PGSQL%%llib/icinga2/libdb_ido.so
+%%DBBACKEND%%lib/icinga2/libdb_ido.so
 %%MYSQL%%lib/icinga2/libdb_ido_mysql.so
 %%PGSQL%%lib/icinga2/libdb_ido_pgsql.so
 lib/icinga2/libexecvpe.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507251028.t6PASVM2068000>