aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrm <rm@FreeBSD.org>2013-09-23 22:26:59 +0800
committerrm <rm@FreeBSD.org>2013-09-23 22:26:59 +0800
commitb2ed3028fe7548e5ffdfa5fba85d7fc8118950b4 (patch)
tree5f7adef9b01fb50e23d85bb57b338dadf316f250
parentf2126a8f66da2d967c548cf9741d3a5148450ff4 (diff)
downloadfreebsd-ports-gnome-b2ed3028fe7548e5ffdfa5fba85d7fc8118950b4.tar.gz
freebsd-ports-gnome-b2ed3028fe7548e5ffdfa5fba85d7fc8118950b4.tar.zst
freebsd-ports-gnome-b2ed3028fe7548e5ffdfa5fba85d7fc8118950b4.zip
- fix packing list with JAVAGW option enabled
PR: 181825 Reported by: Ari Maniatis <ari@ish.com.au> Approved by: maintainer timeout (>2 weeks)
-rw-r--r--net-mgmt/zabbix2-server/Makefile2
-rw-r--r--net-mgmt/zabbix2-server/pkg-plist2
2 files changed, 2 insertions, 2 deletions
diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile
index b04a476acc3e..edec37d6398c 100644
--- a/net-mgmt/zabbix2-server/Makefile
+++ b/net-mgmt/zabbix2-server/Makefile
@@ -49,7 +49,7 @@ PLIST_SUB+= SERVER=""
PLIST_SUB+= SERVER="@comment "
.endif
-PLIST_SUB+= ZABBIX_BUILD=${ZABBIX_BUILD}
+PLIST_SUB+= ZABBIX_BUILD=${ZABBIX_BUILD} PORTVERSION=${PORTVERSION}
SUB_LIST= ZABBIX_BUILD=${ZABBIX_BUILD} ZABBIX_REQUIRE=${ZABBIX_REQUIRE}
MAKE_ARGS+= ARCH=freebsd
diff --git a/net-mgmt/zabbix2-server/pkg-plist b/net-mgmt/zabbix2-server/pkg-plist
index 373d579206c6..7ca9a33fc70a 100644
--- a/net-mgmt/zabbix2-server/pkg-plist
+++ b/net-mgmt/zabbix2-server/pkg-plist
@@ -40,7 +40,7 @@ sbin/zabbix_%%ZABBIX_BUILD%%
%%JAVAGW%%%%ZABBIX_JAVA%%/lib/slf4j-api-1.6.1.jar
%%JAVAGW%%%%ZABBIX_JAVA%%/settings.sh
%%JAVAGW%%%%ZABBIX_JAVA%%/startup.sh
-%%JAVAGW%%%%ZABBIX_JAVA%%/bin/zabbix-java-gateway-2.0.4.jar
+%%JAVAGW%%%%ZABBIX_JAVA%%/bin/zabbix-java-gateway-%%PORTVERSION%%.jar
%%JAVAGW%%@dirrmtry %%ZABBIX_JAVA%%/lib
%%JAVAGW%%@dirrmtry %%ZABBIX_JAVA%%/bin
%%JAVAGW%%@dirrmtry %%ZABBIX_JAVA%%