diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2013-05-09 06:05:49 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2013-05-09 06:05:49 +0800 |
| commit | 0f27aa89b3e4e326346333e93f7390a167d7f6e1 (patch) | |
| tree | c1d14b4e7088a7b336b53314af1e32354445a535 /net-mgmt | |
| parent | 87b8e8fba3ec93d7a1724a1ed3106016387559a3 (diff) | |
| download | freebsd-ports-gnome-0f27aa89b3e4e326346333e93f7390a167d7f6e1.tar.gz freebsd-ports-gnome-0f27aa89b3e4e326346333e93f7390a167d7f6e1.tar.zst freebsd-ports-gnome-0f27aa89b3e4e326346333e93f7390a167d7f6e1.zip | |
- Update to 2.0.6 [1]
- Fix zabbix2-proxy plist
- Fix PORTREVISION in master port
PR: ports/178182 [1]
Submitted by: Pakhom Golynga <pakhom706@gmail.com> (maintainer) [1]
Diffstat (limited to 'net-mgmt')
| -rw-r--r-- | net-mgmt/zabbix2-frontend/Makefile | 1 | ||||
| -rw-r--r-- | net-mgmt/zabbix2-server/Makefile | 10 | ||||
| -rw-r--r-- | net-mgmt/zabbix2-server/distinfo | 4 | ||||
| -rw-r--r-- | net-mgmt/zabbix2-server/pkg-plist | 4 |
4 files changed, 12 insertions, 7 deletions
diff --git a/net-mgmt/zabbix2-frontend/Makefile b/net-mgmt/zabbix2-frontend/Makefile index 2ed0bfd9ad79..b43597a8a4be 100644 --- a/net-mgmt/zabbix2-frontend/Makefile +++ b/net-mgmt/zabbix2-frontend/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= zabbix2 -PORTREVISION= 2 PKGNAMESUFFIX= -frontend MASTERDIR= ${.CURDIR}/../zabbix2-server diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile index af110e1e9c8e..79f286c94b76 100644 --- a/net-mgmt/zabbix2-server/Makefile +++ b/net-mgmt/zabbix2-server/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= zabbix2 -PORTVERSION= 2.0.5 +PORTVERSION= 2.0.6 +PORTREVISION?= 0 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server @@ -42,6 +43,12 @@ PLIST_SUB= PROXY="@comment " PLIST_SUB= PROXY="" .endif +.if ${ZABBIX_BUILD} == "server" +PLIST_SUB+= SERVER="" +.else +PLIST_SUB+= SERVER="@comment " +.endif + PLIST_SUB+= ZABBIX_BUILD=${ZABBIX_BUILD} SUB_LIST= ZABBIX_BUILD=${ZABBIX_BUILD} ZABBIX_REQUIRE=${ZABBIX_REQUIRE} @@ -158,7 +165,6 @@ PLIST_SUB+= JAVAGW="" PLIST_SUB+= JAVAGW="@comment " .endif - post-patch: @${GREP} -rl "/etc/zabbix" ${WRKSRC} \ | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g' diff --git a/net-mgmt/zabbix2-server/distinfo b/net-mgmt/zabbix2-server/distinfo index 05f3fa5d38c5..dec7f4d86e34 100644 --- a/net-mgmt/zabbix2-server/distinfo +++ b/net-mgmt/zabbix2-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (zabbix-2.0.5.tar.gz) = 9539abb848049195b6e8d24d23de40c26e07d3e5219ca890f4272a0d88cc640f -SIZE (zabbix-2.0.5.tar.gz) = 13352744 +SHA256 (zabbix-2.0.6.tar.gz) = 46dfa7e63d3d38991cddaa7455e70179dc3fbef658ccbdce8cc8ce8e73baedf8 +SIZE (zabbix-2.0.6.tar.gz) = 13402400 diff --git a/net-mgmt/zabbix2-server/pkg-plist b/net-mgmt/zabbix2-server/pkg-plist index c3a3273806c8..373d579206c6 100644 --- a/net-mgmt/zabbix2-server/pkg-plist +++ b/net-mgmt/zabbix2-server/pkg-plist @@ -67,9 +67,9 @@ sbin/zabbix_%%ZABBIX_BUILD%% @dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/database @dirrm %%DATADIR%%/%%ZABBIX_BUILD%% @dirrmtry %%DATADIR%% -@dirrmtry %%ETCDIR%%/zabbix/alertscripts +%%SERVER%%@dirrmtry %%ETCDIR%%/zabbix/alertscripts @dirrmtry %%ETCDIR%%/zabbix/externalscripts @dirrmtry %%ETCDIR%%/zabbix %%PROXY%%@dirrmtry %%ETCDIR%%/zabbix_proxy.conf.d -@dirrmtry %%ETCDIR%%/zabbix_server.conf.d +%%SERVER%%@dirrmtry %%ETCDIR%%/zabbix_server.conf.d @dirrmtry %%ETCDIR%% |