diff options
| -rw-r--r-- | MOVED | 1 | ||||
| -rw-r--r-- | databases/Makefile | 2 | ||||
| -rw-r--r-- | databases/libzbxpgsql/distinfo | 3 | ||||
| -rw-r--r-- | databases/libzbxpgsql/pkg-plist | 2 | ||||
| -rw-r--r-- | databases/zabbix3-libzbxpgsql/Makefile (renamed from databases/libzbxpgsql/Makefile) | 26 | ||||
| -rw-r--r-- | databases/zabbix3-libzbxpgsql/distinfo | 3 | ||||
| -rw-r--r-- | databases/zabbix3-libzbxpgsql/files/patch-src_libzbxpgsql.c (renamed from databases/libzbxpgsql/files/patch-src_libzbxpgsql.c) | 0 | ||||
| -rw-r--r-- | databases/zabbix3-libzbxpgsql/pkg-descr (renamed from databases/libzbxpgsql/pkg-descr) | 2 | ||||
| -rw-r--r-- | databases/zabbix3-libzbxpgsql/pkg-message (renamed from databases/libzbxpgsql/pkg-message) | 2 | ||||
| -rw-r--r-- | databases/zabbix3-libzbxpgsql/pkg-plist | 4 |
10 files changed, 28 insertions, 17 deletions
@@ -9523,3 +9523,4 @@ biology/biojava||2017-08-23|Has expired: Broken for more than 6 months 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 diff --git a/databases/Makefile b/databases/Makefile index 28a31db57445..6ec65af144be 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -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> diff --git a/databases/libzbxpgsql/distinfo b/databases/libzbxpgsql/distinfo deleted file mode 100644 index c2aedf235b2f..000000000000 --- a/databases/libzbxpgsql/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1471426354 -SHA256 (libzbxpgsql-1.0.0.tar.gz) = fd934f24ccfc5e9f4542860700b817477c9b45c85783b50a8e33ec4f8d01b68e -SIZE (libzbxpgsql-1.0.0.tar.gz) = 346344 diff --git a/databases/libzbxpgsql/pkg-plist b/databases/libzbxpgsql/pkg-plist deleted file mode 100644 index 05b5204cca2f..000000000000 --- a/databases/libzbxpgsql/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -lib/libzbxpgsql.so -@sample share/examples/libzbxpgsql/template_postgresql_server.xml.sample diff --git a/databases/libzbxpgsql/Makefile b/databases/zabbix3-libzbxpgsql/Makefile index e2efe1759c21..62d1eaeca0b9 100644 --- a/databases/libzbxpgsql/Makefile +++ b/databases/zabbix3-libzbxpgsql/Makefile @@ -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> diff --git a/databases/zabbix3-libzbxpgsql/distinfo b/databases/zabbix3-libzbxpgsql/distinfo new file mode 100644 index 000000000000..269563ce15d3 --- /dev/null +++ b/databases/zabbix3-libzbxpgsql/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1503755196 +SHA256 (cavaliercoder-libzbxpgsql-v1.1.0_GH0.tar.gz) = 50acc4364241253a013058daf76c4184cc522104f78005d3c4d5e7e09d77571a +SIZE (cavaliercoder-libzbxpgsql-v1.1.0_GH0.tar.gz) = 61106 diff --git a/databases/libzbxpgsql/files/patch-src_libzbxpgsql.c b/databases/zabbix3-libzbxpgsql/files/patch-src_libzbxpgsql.c index e1ae90077e39..e1ae90077e39 100644 --- a/databases/libzbxpgsql/files/patch-src_libzbxpgsql.c +++ b/databases/zabbix3-libzbxpgsql/files/patch-src_libzbxpgsql.c diff --git a/databases/libzbxpgsql/pkg-descr b/databases/zabbix3-libzbxpgsql/pkg-descr index 9df2997c40c5..0b6a261aae10 100644 --- a/databases/libzbxpgsql/pkg-descr +++ b/databases/zabbix3-libzbxpgsql/pkg-descr @@ -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/ diff --git a/databases/libzbxpgsql/pkg-message b/databases/zabbix3-libzbxpgsql/pkg-message index d906dcaf5853..23d85feb7007 100644 --- a/databases/libzbxpgsql/pkg-message +++ b/databases/zabbix3-libzbxpgsql/pkg-message @@ -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. diff --git a/databases/zabbix3-libzbxpgsql/pkg-plist b/databases/zabbix3-libzbxpgsql/pkg-plist new file mode 100644 index 000000000000..765ec35e2459 --- /dev/null +++ b/databases/zabbix3-libzbxpgsql/pkg-plist @@ -0,0 +1,4 @@ +lib/libzbxpgsql.so +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Template_PostgreSQL_Server_2.0.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Template_PostgreSQL_Server_2.4.xml +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Template_PostgreSQL_Server_3.0.xml |