Date: Sat, 26 Aug 2017 18:14:55 +0000 (UTC) From: "Danilo G. Baio" <dbaio@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r448779 - in head: . databases databases/libzbxpgsql databases/zabbix3-libzbxpgsql Message-ID: <201708261814.v7QIEtQT095306@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbaio Date: Sat Aug 26 18:14:55 2017 New Revision: 448779 URL: https://svnweb.freebsd.org/changeset/ports/448779 Log: databases/libzbxpgsql: Update to 1.1.0, Rename to databases/zabbix3-libzbxpgsql Rename to allow multiple version of libzbxpgsql to coexist, each one uses a different zabbix-agent version. Add CONFLICTS in preparation for multiple versions as well. PR: 221798 Submitted by: Martin Waschbüsch <martin@waschbuesch.de> (maintainer) Added: head/databases/zabbix3-libzbxpgsql/ - copied from r448778, head/databases/libzbxpgsql/ Deleted: head/databases/libzbxpgsql/ Modified: head/MOVED head/databases/Makefile head/databases/zabbix3-libzbxpgsql/Makefile head/databases/zabbix3-libzbxpgsql/distinfo head/databases/zabbix3-libzbxpgsql/pkg-descr head/databases/zabbix3-libzbxpgsql/pkg-message head/databases/zabbix3-libzbxpgsql/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Sat Aug 26 18:00:42 2017 (r448778) +++ head/MOVED Sat Aug 26 18:14:55 2017 (r448779) @@ -9523,3 +9523,4 @@ biology/biojava||2017-08-23|Has expired: Broken for mo games/xroach||2017-08-23|Has expired: Broken for more than 6 months java/intellij-pycharm|devel/pycharm-ce|2017-08-23|Renamed to reflect upstream name. Use a more appropriate origin (devel for development tools, IDE) www/pyweblib|www/py-pyweblib|2017-08-25|Rename to comply with PyPI scheme +databases/libzbxpgsql|databases/zabbix3-libzbxpgsql|2017-08-26|Rename to allow multiple versions of libzbxpgsql to coexist Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Sat Aug 26 18:00:42 2017 (r448778) +++ head/databases/Makefile Sat Aug 26 18:14:55 2017 (r448779) @@ -159,7 +159,6 @@ SUBDIR += libpbl SUBDIR += libpqtypes SUBDIR += libsdb - SUBDIR += libzbxpgsql SUBDIR += libzdb SUBDIR += linux-c6-sqlite3 SUBDIR += linux-c7-sqlite3 @@ -1043,6 +1042,7 @@ SUBDIR += xapian-core10 SUBDIR += xapian-core12 SUBDIR += xtrabackup + SUBDIR += zabbix3-libzbxpgsql SUBDIR += zodb3 .include <bsd.port.subdir.mk> Modified: head/databases/zabbix3-libzbxpgsql/Makefile ============================================================================== --- head/databases/libzbxpgsql/Makefile Sat Aug 26 18:00:42 2017 (r448778) +++ head/databases/zabbix3-libzbxpgsql/Makefile Sat Aug 26 18:14:55 2017 (r448779) @@ -2,29 +2,41 @@ # $FreeBSD$ PORTNAME= libzbxpgsql -PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTVERSION= 1.1.0 +DISTVERSIONPREFIX= v CATEGORIES= databases -MASTER_SITES= http://s3.cavaliercoder.com/libzbxpgsql/ +PKGNAMEPREFIX= zabbix3- MAINTAINER= martin@waschbuesch.de COMMENT= Zabbix agent module for comprehensive monitoring of PostgreSQL servers -LICENSE= GPLv2 +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${NONEXISTENT}:net-mgmt/zabbix3-agent:patch -RUN_DEPENDS= ${LOCALBASE}/sbin/zabbix_agentd:net-mgmt/zabbix3-agent +BUILD_DEPENDS= ${NONEXISTENT}:net-mgmt/${PKGNAMEPREFIX}agent:patch +RUN_DEPENDS= zabbix_agentd:net-mgmt/${PKGNAMEPREFIX}agent +LIB_DEPENDS= libconfig.so:devel/libconfig +CONFLICTS= zabbix[0-9][0-9]-libzbxpgsql + USES= autoreconf gmake libtool pgsql + +USE_GITHUB= yes +GH_ACCOUNT= cavaliercoder + GNU_CONFIGURE= yes GET_ZBX_WRKSRC= cd ${.CURDIR:H:H}/net-mgmt/zabbix3-agent && make -V WRKSRC CONFIGURE_ARGS= --with-zabbix=$$(${GET_ZBX_WRKSRC}) USE_LDCONFIG= yes +OPTIONS_DEFINE= EXAMPLES + do-install: ${INSTALL_LIB} ${WRKSRC}/src/.libs/libzbxpgsql.so ${STAGEDIR}${PREFIX}/lib/libzbxpgsql.so + +do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_MAN} ${WRKSRC}/template_postgresql_server.xml ${STAGEDIR}${EXAMPLESDIR}/template_postgresql_server.xml.sample + ${INSTALL_DATA} ${WRKSRC}/templates/*.xml ${STAGEDIR}${EXAMPLESDIR} .include <bsd.port.mk> Modified: head/databases/zabbix3-libzbxpgsql/distinfo ============================================================================== --- head/databases/libzbxpgsql/distinfo Sat Aug 26 18:00:42 2017 (r448778) +++ head/databases/zabbix3-libzbxpgsql/distinfo Sat Aug 26 18:14:55 2017 (r448779) @@ -1,3 +1,3 @@ -TIMESTAMP = 1471426354 -SHA256 (libzbxpgsql-1.0.0.tar.gz) = fd934f24ccfc5e9f4542860700b817477c9b45c85783b50a8e33ec4f8d01b68e -SIZE (libzbxpgsql-1.0.0.tar.gz) = 346344 +TIMESTAMP = 1503755196 +SHA256 (cavaliercoder-libzbxpgsql-v1.1.0_GH0.tar.gz) = 50acc4364241253a013058daf76c4184cc522104f78005d3c4d5e7e09d77571a +SIZE (cavaliercoder-libzbxpgsql-v1.1.0_GH0.tar.gz) = 61106 Modified: head/databases/zabbix3-libzbxpgsql/pkg-descr ============================================================================== --- head/databases/libzbxpgsql/pkg-descr Sat Aug 26 18:00:42 2017 (r448778) +++ head/databases/zabbix3-libzbxpgsql/pkg-descr Sat Aug 26 18:14:55 2017 (r448779) @@ -4,6 +4,4 @@ natively compiled Zabbix agent module, written in C. The module enables discovery and monitoring of tablespaces, databases, namespaces, tables, indexes, etc. -A preconfigured Zabbix Template is also included for your convenience. - WWW: http://cavaliercoder.com/libzbxpgsql/ Modified: head/databases/zabbix3-libzbxpgsql/pkg-message ============================================================================== --- head/databases/libzbxpgsql/pkg-message Sat Aug 26 18:00:42 2017 (r448778) +++ head/databases/zabbix3-libzbxpgsql/pkg-message Sat Aug 26 18:14:55 2017 (r448779) @@ -1,5 +1,3 @@ In order to enable the module, add libzbxpgsql.so to the LoadModule= line in zabbix_agentd.conf and restart the agent with service zabbix_agentd restart -A sample template has been placed in %%EXAMPLESDIR%% -It can be imported into zabbix and assigned to a host. Modified: head/databases/zabbix3-libzbxpgsql/pkg-plist ============================================================================== --- head/databases/libzbxpgsql/pkg-plist Sat Aug 26 18:00:42 2017 (r448778) +++ head/databases/zabbix3-libzbxpgsql/pkg-plist Sat Aug 26 18:14:55 2017 (r448779) @@ -1,2 +1,4 @@ lib/libzbxpgsql.so -@sample share/examples/libzbxpgsql/template_postgresql_server.xml.sample +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Template_PostgreSQL_Server_2.0.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Template_PostgreSQL_Server_2.4.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Template_PostgreSQL_Server_3.0.xml
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708261814.v7QIEtQT095306>