From owner-svn-ports-head@freebsd.org Thu Aug 25 19:23:09 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 816E7BC62ED; Thu, 25 Aug 2016 19:23:09 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 3A4EE1FA0; Thu, 25 Aug 2016 19:23:09 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7PJN8bU019029; Thu, 25 Aug 2016 19:23:08 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7PJN89T019028; Thu, 25 Aug 2016 19:23:08 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201608251923.u7PJN89T019028@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Thu, 25 Aug 2016 19:23:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420876 - 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.22 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: Thu, 25 Aug 2016 19:23:09 -0000 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@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} \