svn commit: r420876 - head/net-mgmt/icinga2

Lars Engels lme at FreeBSD.org
Thu Aug 25 19:23:09 UTC 2016


Author: lme
Date: Thu Aug 25 19:23:08 2016
New Revision: 420876
URL: https://svnweb.freebsd.org/changeset/ports/420876

Log:
  net-mgmt/icinga2:
  
  Remove bogus dependency on devel/libconfig. Some time ago I added this because
  the ports tree's Q/A check warned that the icinga2 binary is linked against libconfig.
  However this is a private library shipped with Icinga 2.
  With version 2.5.1 USES=ssl was added to the port's Makefile which added
  rpath=${LOCALBASE}/openssl when Icinga 2 gets built and {Open,Libre}SSL from ports
  was installed. The result was that ld picked up libconfig.so from the devel/libconfig
  port instead of Icinga 2's private library.
  To prevent this, the following CMAKE_ARGS were added:
  CMAKE_{EXE,MODULE,SHARED,STATIC}_LINKER_FLAGS=${PREFIX}/lib/icinga2
  
  At the moment only EXE_ and SHARED_ linker flags are really needed, to be prepared for
  future changes the other flags were also set.
  
  Thanks to mat and Gunnar Beutner (upstream developer) for the insights on the ports
  and Icinga 2's build system.
  
  - Re-add USES=ssl
  - Bump PORTREVSION

Modified:
  head/net-mgmt/icinga2/Makefile

Modified: head/net-mgmt/icinga2/Makefile
==============================================================================
--- head/net-mgmt/icinga2/Makefile	Thu Aug 25 19:14:59 2016	(r420875)
+++ head/net-mgmt/icinga2/Makefile	Thu Aug 25 19:23:08 2016	(r420876)
@@ -3,6 +3,7 @@
 PORTNAME=	icinga2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.3
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	lme at FreeBSD.org
@@ -11,8 +12,7 @@ COMMENT=	Monitoring and management syste
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
-		libyajl.so:devel/yajl \
-		libconfig.so:devel/libconfig
+		libyajl.so:devel/yajl
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 BROKEN_powerpc64=	Does not build
@@ -20,7 +20,7 @@ BROKEN_powerpc64=	Does not build
 USE_GITHUB=	yes
 GH_ACCOUNT=	icinga
 
-USES=		alias bison cmake execinfo libedit
+USES=		alias bison cmake execinfo libedit ssl
 USE_LDCONFIG=	yes
 
 USE_RC_SUBR=	${PORTNAME}
@@ -56,6 +56,10 @@ CMAKE_ARGS+=	-DICINGA2_USER=${ICINGA2USE
 		-DCMAKE_INSTALL_SYSCONFDIR=${PREFIX}/etc \
 		-DCMAKE_INSTALL_LOCALSTATEDIR=${LOCALSTATEDIR} \
 		-DCMAKE_INSTALL_MANDIR=${MANPREFIX}/man \
+		-DCMAKE_EXE_LINKER_FLAGS=${PREFIX}/lib/icinga2 \
+		-DCMAKE_MODULE_LINKER_FLAGS=${PREFIX}/lib/icinga2 \
+		-DCMAKE_SHARED_LINKER_FLAGS=${PREFIX}/lib/icinga2 \
+		-DCMAKE_STATIC_LINKER_FLAGS=${PREFIX}/lib/icinga2
 
 SUB_LIST=	ICINGA2LOGDIR=${ICINGA2LOGDIR} \
 		ICINGA2USER=${ICINGA2USER} \


More information about the svn-ports-all mailing list