Attachment 228555 Details for Bug 259037 – pgsql.patch

[patch] pgsql.patch

pgsql.patch (text/plain), 5.05 KB, created by Tomoyuki Sakurai on 2021-10-10 08:26:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomoyuki Sakurai

Created: 2021-10-10 08:26:55 UTC

Size: 5.05 KB

patch

obsolete

>diff --git a/net-mgmt/zabbix54-agent/Makefile b/net-mgmt/zabbix54-agent/Makefile
>index 3a726f2..8bc7926 100644
>--- a/net-mgmt/zabbix54-agent/Makefile
>+++ b/net-mgmt/zabbix54-agent/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	zabbix54
> CATEGORIES=	net-mgmt
>-PKGNAMESUFFIX=	-agent
> 
> MASTERDIR=	${.CURDIR}/../${PORTNAME}-server
> PLIST=		${PKGDIR}/pkg-plist.agent
>@@ -8,4 +7,6 @@ PLIST=		${PKGDIR}/pkg-plist.agent
> OPTIONS_DEFINE=		CURL IPV6 MODBUS
> OPTIONS_DEFAULT=	CURL OPENSSL
> 
>+ZABBIX_BUILD=	agent
>+
> .include "${MASTERDIR}/Makefile"
>diff --git a/net-mgmt/zabbix54-frontend/Makefile b/net-mgmt/zabbix54-frontend/Makefile
>index b70eaac..bb79013 100644
>--- a/net-mgmt/zabbix54-frontend/Makefile
>+++ b/net-mgmt/zabbix54-frontend/Makefile
>@@ -1,10 +1,10 @@
> PORTNAME=	zabbix54
> PORTREVISION=	0
> CATEGORIES=	net-mgmt
>-PKGNAMESUFFIX=	-frontend
> 
> MASTERDIR=	${.CURDIR}/../${PORTNAME}-server
> 
>+ZABBIX_BUILD=	frontend
> NO_BUILD=	yes
> NO_ARCH=	yes
> PATCHDIR=
>diff --git a/net-mgmt/zabbix54-java/Makefile b/net-mgmt/zabbix54-java/Makefile
>index b7f294d..7ebc6f4 100644
>--- a/net-mgmt/zabbix54-java/Makefile
>+++ b/net-mgmt/zabbix54-java/Makefile
>@@ -1,7 +1,6 @@
> PORTNAME=	zabbix54
> PORTREVISION=	0
> CATEGORIES=	net-mgmt
>-PKGNAMESUFFIX=	-java
> 
> MASTERDIR=	${.CURDIR}/../${PORTNAME}-server
> PLIST=		${PKGDIR}/pkg-plist.java
>@@ -9,5 +8,6 @@ PLIST=		${PKGDIR}/pkg-plist.java
> OPTIONS_DEFINE=		IPV6
> 
> USE_JAVA=	yes
>+ZABBIX_BUILD=	java
> 
> .include "${MASTERDIR}/Makefile"
>diff --git a/net-mgmt/zabbix54-proxy/Makefile b/net-mgmt/zabbix54-proxy/Makefile
>index 3f9eb0e..b91dc91 100644
>--- a/net-mgmt/zabbix54-proxy/Makefile
>+++ b/net-mgmt/zabbix54-proxy/Makefile
>@@ -1,9 +1,8 @@
> PORTNAME=	zabbix54
> CATEGORIES=	net-mgmt
>-PKGNAMESUFFIX=	-proxy
> 
> MASTERDIR=	${.CURDIR}/../${PORTNAME}-server
> 
>-OPTIONS_SINGLE_DB=	MYSQL PGSQL SQLITE ORACLE
>+ZABBIX_BUILD=	proxy
> 
> .include "${MASTERDIR}/Makefile"
>diff --git a/net-mgmt/zabbix54-server/Makefile b/net-mgmt/zabbix54-server/Makefile
>index 510ac3c..ce05ca8 100644
>--- a/net-mgmt/zabbix54-server/Makefile
>+++ b/net-mgmt/zabbix54-server/Makefile
>@@ -2,25 +2,69 @@ PORTNAME=	zabbix54
> DISTVERSION=	5.4.5
> CATEGORIES=	net-mgmt
> MASTER_SITES=	https://cdn.zabbix.com/zabbix/sources/stable/${DISTVERSION:R}/
>-PKGNAMESUFFIX?=	-server
>+PKGNAMESUFFIX=	-${ZABBIX_BUILD}
> DISTNAME=	zabbix-${DISTVERSION}
> 
> MAINTAINER=	otis@FreeBSD.org
>-COMMENT=	Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//})
>+COMMENT=	Enterprise-class open source distributed monitoring (${ZABBIX_BUILD})
> 
> LICENSE=	GPLv2+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS=	libpcre.so:devel/pcre
> 
>-CONFLICTS_INSTALL=	zabbix[0-46-9][0-9]${PKGNAMESUFFIX} \
>-		zabbix5[0-35-9]${PKGNAMESUFFIX} \
>-		zabbix[0-9]${PKGNAMESUFFIX}
>-
>-ZABBIX_BUILD=	${PKGNAMESUFFIX:S/^-//}
>+CONFLICTS_INSTALL=	zabbix[0-9][0-9]-${ZABBIX_BUILD} \
>+		zabbix[0-9]-${ZABBIX_BUILD}
>+USES=	#
>+FLAVORS=	#
>+FLAVOR=	#
>+ZABBIX_BUILD?=	server
> 
> .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings
> .if ${ZABBIX_BUILD} != "agent"
>+
>+USES+=		pkgconfig iconv
>+
>+FLAVORS+=	mysql pgsql
>+FLAVOR?=	${FLAVORS:[1]}
>+
>+.if ${ZABBIX_BUILD} == "proxy"
>+FLAVORS=	mysql pgsql sqlite3
>+.endif
>+
>+.if ${ZABBIX_BUILD} == "proxy"
>+mysql_PKGNAMESUFFIX=	-${ZABBIX_BUILD}-${FLAVOR}
>+pgsql_PKGNAMESUFFIX=	-${ZABBIX_BUILD}-${FLAVOR}
>+sqlite3_PKGNAMESUFFIX=	-${ZABBIX_BUILD}-${FLAVOR}
>+.else
>+mysql_PKGNAMESUFFIX=	-${ZABBIX_BUILD}-${FLAVOR}
>+pgsql_PKGNAMESUFFIX=	-${ZABBIX_BUILD}-${FLAVOR}
>+.endif # .if ${ZABBIX_BUILD} == "proxy"
>+
>+.for F in ${FLAVORS}
>+.if ${F} != ${FLAVOR}
>+CONFLICTS_INSTALL+= zabbix5[0-9]-${ZABBIX_BUILD}-${F}
>+.endif # .if ${F} != ${FLAVOR}
>+.endfor
>+
>+.if ${FLAVOR} == "pgsql"
>+CONFIGURE_ARGS+=	--with-postgresql
>+.else
>+CONFIGURE_ARGS+=	--with-${FLAVOR}
>+.endif # .if ${FLAVOR} == "pgsql"
>+
>+.if ${FLAVOR} == "mysql"
>+USES+=	compiler:c11 mysql
>+.endif
>+
>+.if ${FLAVOR} == "pgsql"
>+USES+=	pgsql
>+.endif
>+
>+.if ${FLAVOR} == "sqlite3"
>+USES+=	sqlite
>+.endif
>+
> CONFIGURE_ARGS+=	--with-libevent=${LOCALBASE} --cache-file=${WRKSRC}/config.cache
> LIB_DEPENDS+=	libevent.so:devel/libevent
> USE_RC_SUBR=	zabbix_${ZABBIX_BUILD}
>@@ -28,8 +72,6 @@ USE_RC_SUBR=	zabbix_${ZABBIX_BUILD}
> USE_RC_SUBR=	zabbix_${ZABBIX_BUILD}d
> .endif
> 
>-USES=		pkgconfig iconv
>-
> USERS=		zabbix
> GROUPS=		zabbix
> 
>@@ -68,7 +110,7 @@ CONFIGURE_ARGS+=	--with-net-snmp
> 
> OPTIONS_DEFINE=		IPV6 FPING CURL LDAP IPMI SSH NMAP LIBXML2 UNIXODBC
> 
>-OPTIONS_DEFAULT=	FPING CURL UNIXODBC MYSQL OPENSSL
>+OPTIONS_DEFAULT=	FPING CURL UNIXODBC OPENSSL
> OPTIONS_SUB=		yes
> 
> FPING_DESC=		Build/install fping for ping checks
>@@ -79,21 +121,9 @@ SSH_DESC=		Support for SSH-based checks
> UNIXODBC_DESC=		Support for database checks via ODBC
> LIBXML2_DESC=		Support for libxml2 (required by monitoring VMware)
> 
>-OPTIONS_SINGLE=		DB SSL
>-OPTIONS_SINGLE_DB?=	MYSQL PGSQL ORACLE
>+OPTIONS_SINGLE=		SSL
> OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS
> 
>-MYSQL_CONFIGURE_WITH=	mysql
>-MYSQL_USES+=		compiler:c11 mysql
>-
>-PGSQL_CONFIGURE_WITH=	postgresql
>-PGSQL_USES+=		pgsql
>-
>-SQLITE_CONFIGURE_WITH=	sqlite3
>-SQLITE_USES+=		sqlite:3
>-
>-ORACLE_CONFIGURE_WITH=	oracle
>-
> LDAP_CONFIGURE_WITH=	ldap
> LDAP_USE=		OPENLDAP=yes
>

Actions: View | Diff

Attachments on bug 259037: 228555 | 230166