Date: Tue, 26 Jan 2016 05:22:26 +0000 (UTC) From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r407264 - head/net-mgmt/netxms Message-ID: <201601260522.u0Q5MQcm085878@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bofh Date: Tue Jan 26 05:22:25 2016 New Revision: 407264 URL: https://svnweb.freebsd.org/changeset/ports/407264 Log: net-mgmt/netxms: Fix dependencies - Skip using bundled dependencies - In particular, fix build when expat port is installed, in which case bundled expat is not built and plist becomes broken - Likewise, fix unhandled curl dependency - Simplify options handling and fix plist PR: 206099 Submitted by: amdmi3 Modified: head/net-mgmt/netxms/Makefile head/net-mgmt/netxms/pkg-plist Modified: head/net-mgmt/netxms/Makefile ============================================================================== --- head/net-mgmt/netxms/Makefile Tue Jan 26 04:52:09 2016 (r407263) +++ head/net-mgmt/netxms/Makefile Tue Jan 26 05:22:25 2016 (r407264) @@ -3,7 +3,7 @@ PORTNAME= netxms PORTVERSION= 1.2.17 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt MASTER_SITES= http://www.netxms.org/download/ \ http://www.netxms.org/download/archive/ @@ -14,18 +14,23 @@ COMMENT= Network monitoring system LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ + libexpat.so:${PORTSDIR}/textproc/expat2 \ + libjansson.so:${PORTSDIR}/devel/jansson \ + libtre.so:${PORTSDIR}/textproc/libtre + PORTSCOUT= limit:^1\. OPTIONS_DEFINE= SERVER CLIENT AGENT OPTIONS_DEFAULT= CLIENT AGENT -SERVER_ENABLED_MODULES= MYSQL -SERVER_DISABLED_MODULES= PGSQL SQLITE ODBC OPTIONS_SINGLE= SERVER -OPTIONS_SINGLE_SERVER= ${SERVER_ENABLED_MODULES} ${SERVER_DISABLED_MODULES} +OPTIONS_SINGLE_SERVER= MYSQL PGSQL SQLITE ODBC OPTIONS_SUB= yes + SERVER_DESC= Install NetXMS server & agent CLIENT_DESC= Install NetXMS client AGENT_DESC= Install NetXMS agent + CLIENT_CONFIGURE_ON= --with-client AGENT_CONFIGURE_ON= --with-agent SERVER_CONFIGURE_ON= --with-server @@ -41,9 +46,7 @@ ODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR} USE_OPENSSL= yes USES= gmake iconv libtool perl5 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-silent-rules \ - --with-internal-libjansson \ - --with-internal-libtre +CONFIGURE_ARGS= --disable-silent-rules USE_LDCONFIG= yes INSTALL_TARGET= install-strip Modified: head/net-mgmt/netxms/pkg-plist ============================================================================== --- head/net-mgmt/netxms/pkg-plist Tue Jan 26 04:52:09 2016 (r407263) +++ head/net-mgmt/netxms/pkg-plist Tue Jan 26 05:22:25 2016 (r407264) @@ -24,18 +24,12 @@ lib/libnetxms.so lib/libnetxms.so.1 lib/libnetxms.so.1.0.0 -lib/libnxexpat.so -lib/libnxexpat.so.1 -lib/libnxexpat.so.1.0.0 -%%CLIENT%%lib/libnxtre.so -%%CLIENT%%lib/libnxtre.so.5 %%NXCP%%lib/libnxsqlite.so %%NXCP%%lib/libnxsqlite.so.1 %%AGENT%%lib/libnxsqlite.so.1.0.0 %%NXCP%%lib/libnxdb.so %%NXCP%%lib/libnxdb.so.1 %%AGENT%%lib/libnxdb.so.1.0.0 -%%AGENT%%lib/libnxtre.so.5.0.0 %%AGENT%%lib/netxms/devemu.nsm %%NXCP%%lib/libappagent.so %%NXCP%%lib/libappagent.so.1 @@ -46,9 +40,7 @@ lib/libnxexpat.so.1.0.0 %%SERVER%%lib/libnsm_filemgr.so %%NXCP%%lib/libnsm_portcheck.so %%AGENT%%lib/libnsm_devemu.so -%%AGENT%%lib/libnxjansson.so -%%AGENT%%lib/libnxjansson.so.4 -%%AGENT%%lib/libnxjansson.so.4.6.0 +%%NXCP%%lib/libnsm_netsvc.so %%NXCP%%lib/libnxsd.so %%NXCP%%lib/libnxsd.so.1 %%AGENT%%lib/libnxsd.so.1.0.0 @@ -92,6 +84,9 @@ lib/libnxexpat.so.1.0.0 %%SERVER%%lib/libnxsms_nxagent.so %%SERVER%%lib/libnxsms_nxagent.so.1 %%SERVER%%lib/libnxsms_nxagent.so.1.0.0 +%%SERVER%%lib/libnxsms_websms.so +%%SERVER%%lib/libnxsms_websms.so.1 +%%SERVER%%lib/libnxsms_websms.so.1.0.0 %%SERVER%%lib/libnxsnmp.so %%SERVER%%lib/libnxsnmp.so.1 %%SERVER%%lib/libnxsnmp.so.1.0.0 @@ -101,7 +96,9 @@ lib/libnxexpat.so.1.0.0 %%NXCP%%lib/netxms/dbquery.nsm %%NXCP%%lib/netxms/ecs.nsm %%NXCP%%lib/netxms/freebsd.nsm +%%SERVER%%lib/netxms/jira.hdlink %%NXCP%%lib/netxms/logwatch.nsm +%%NXCP%%lib/netxms/netsvc.nsm %%NXCP%%lib/netxms/ping.nsm %%NXCP%%lib/netxms/portcheck.nsm %%NXCP%%lib/netxms/sms.nsm @@ -595,3 +592,5 @@ lib/libnxexpat.so.1.0.0 %%SERVER%%%%DATADIR%%/sql/dbschema_oracle.sql %%SERVER%%%%DATADIR%%/sql/dbschema_pgsql.sql %%SERVER%%%%DATADIR%%/sql/dbschema_sqlite.sql +@owner +@group
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601260522.u0Q5MQcm085878>