- Fix library dependencies and pkg-message for slave ports

- Fix dependencies in rc scripts

PR:		ports/141717
Submitted by:	Jim Riggs <ports@christianserving.org> (maintainer)

6 files changed, 28 insertions, 18 deletions

diff --git a/net-mgmt/zabbix-server/Makefile b/net-mgmt/zabbix-server/Makefile
index 220c7e2ff5a7..d8a86df74956 100644
--- a/net-mgmt/zabbix-server/Makefile
+++ b/net-mgmt/zabbix-server/Makefile
@@ -24,11 +24,6 @@ CONFLICTS+=	${PORTNAME}-1.[0-6]*
 ZABBIX_BUILD=	${PKGNAMESUFFIX:S/^-//}
 
 .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings
-LIB_DEPENDS=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
-		curl:${PORTSDIR}/ftp/curl
-
-SUB_FILES=	pkg-message
-
 .if ${ZABBIX_BUILD} != "agent"
 MAN8=		${PORTNAME}_${ZABBIX_BUILD}.8
 USE_RC_SUBR=	${PORTNAME}_${ZABBIX_BUILD}
@@ -43,13 +38,20 @@ USERS=		zabbix
 GROUPS=		zabbix
 
 PLIST_SUB=	ZABBIX_BUILD=${ZABBIX_BUILD}
-SUB_LIST=	ZABBIX_BUILD=${ZABBIX_BUILD}
+SUB_LIST=	ZABBIX_BUILD=${ZABBIX_BUILD} ZABBIX_REQUIRE=${ZABBIX_REQUIRE}
 
 MAKE_ARGS+=	ARCH=freebsd
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--enable-${ZABBIX_BUILD} --with-net-snmp
+CONFIGURE_ARGS+=	--enable-${ZABBIX_BUILD}
 
 .if ${ZABBIX_BUILD} != "agent"
+LIB_DEPENDS=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
+		curl:${PORTSDIR}/ftp/curl
+
+SUB_FILES=	pkg-message
+
+CONFIGURE_ARGS+=	--with-net-snmp
+
 OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
 OPTIONS=	MYSQL "Use MySQL backend" on \
 		PGSQL "Use PostgreSQL backend" off \
@@ -62,12 +64,15 @@ OPTIONS=	MYSQL "Use MySQL backend" on \
 .include <bsd.port.options.mk>
 
 .ifndef WITHOUT_MYSQL
+ZABBIX_REQUIRE=	" mysql"
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=	--with-mysql
 .elifdef WITH_PGSQL
+ZABBIX_REQUIRE=	" postgresql"
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=	--with-pgsql
 .elifdef WITH_SQLITE
+ZABBIX_REQUIRE=
 USE_SQLITE=	yes
 CONFIGURE_ARGS+=	--with-sqlite3
 .else
diff --git a/net-mgmt/zabbix-server/files/zabbix_proxy.in b/net-mgmt/zabbix-server/files/zabbix_proxy.in
index 14ab46b8a2a1..3d53faeb206c 100644
--- a/net-mgmt/zabbix-server/files/zabbix_proxy.in
+++ b/net-mgmt/zabbix-server/files/zabbix_proxy.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # PROVIDE: zabbix_proxy
-# REQUIRE: DAEMON
+# REQUIRE: DAEMON%%ZABBIX_REQUIRE%%
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf to
diff --git a/net-mgmt/zabbix-server/files/zabbix_server.in b/net-mgmt/zabbix-server/files/zabbix_server.in
index b8c5bc324f44..5b2e85d1a354 100644
--- a/net-mgmt/zabbix-server/files/zabbix_server.in
+++ b/net-mgmt/zabbix-server/files/zabbix_server.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # PROVIDE: zabbix_server
-# REQUIRE: DAEMON
+# REQUIRE: DAEMON%%ZABBIX_REQUIRE%%
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf to
diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile
index 220c7e2ff5a7..d8a86df74956 100644
--- a/net-mgmt/zabbix2-server/Makefile
+++ b/net-mgmt/zabbix2-server/Makefile
@@ -24,11 +24,6 @@ CONFLICTS+=	${PORTNAME}-1.[0-6]*
 ZABBIX_BUILD=	${PKGNAMESUFFIX:S/^-//}
 
 .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings
-LIB_DEPENDS=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
-		curl:${PORTSDIR}/ftp/curl
-
-SUB_FILES=	pkg-message
-
 .if ${ZABBIX_BUILD} != "agent"
 MAN8=		${PORTNAME}_${ZABBIX_BUILD}.8
 USE_RC_SUBR=	${PORTNAME}_${ZABBIX_BUILD}
@@ -43,13 +38,20 @@ USERS=		zabbix
 GROUPS=		zabbix
 
 PLIST_SUB=	ZABBIX_BUILD=${ZABBIX_BUILD}
-SUB_LIST=	ZABBIX_BUILD=${ZABBIX_BUILD}
+SUB_LIST=	ZABBIX_BUILD=${ZABBIX_BUILD} ZABBIX_REQUIRE=${ZABBIX_REQUIRE}
 
 MAKE_ARGS+=	ARCH=freebsd
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--enable-${ZABBIX_BUILD} --with-net-snmp
+CONFIGURE_ARGS+=	--enable-${ZABBIX_BUILD}
 
 .if ${ZABBIX_BUILD} != "agent"
+LIB_DEPENDS=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
+		curl:${PORTSDIR}/ftp/curl
+
+SUB_FILES=	pkg-message
+
+CONFIGURE_ARGS+=	--with-net-snmp
+
 OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
 OPTIONS=	MYSQL "Use MySQL backend" on \
 		PGSQL "Use PostgreSQL backend" off \
@@ -62,12 +64,15 @@ OPTIONS=	MYSQL "Use MySQL backend" on \
 .include <bsd.port.options.mk>
 
 .ifndef WITHOUT_MYSQL
+ZABBIX_REQUIRE=	" mysql"
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=	--with-mysql
 .elifdef WITH_PGSQL
+ZABBIX_REQUIRE=	" postgresql"
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=	--with-pgsql
 .elifdef WITH_SQLITE
+ZABBIX_REQUIRE=
 USE_SQLITE=	yes
 CONFIGURE_ARGS+=	--with-sqlite3
 .else
diff --git a/net-mgmt/zabbix2-server/files/zabbix_proxy.in b/net-mgmt/zabbix2-server/files/zabbix_proxy.in
index 14ab46b8a2a1..3d53faeb206c 100644
--- a/net-mgmt/zabbix2-server/files/zabbix_proxy.in
+++ b/net-mgmt/zabbix2-server/files/zabbix_proxy.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # PROVIDE: zabbix_proxy
-# REQUIRE: DAEMON
+# REQUIRE: DAEMON%%ZABBIX_REQUIRE%%
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf to
diff --git a/net-mgmt/zabbix2-server/files/zabbix_server.in b/net-mgmt/zabbix2-server/files/zabbix_server.in
index b8c5bc324f44..5b2e85d1a354 100644
--- a/net-mgmt/zabbix2-server/files/zabbix_server.in
+++ b/net-mgmt/zabbix2-server/files/zabbix_server.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # PROVIDE: zabbix_server
-# REQUIRE: DAEMON
+# REQUIRE: DAEMON%%ZABBIX_REQUIRE%%
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf to