diff options
author | pav <pav@FreeBSD.org> | 2004-04-10 23:39:16 +0800 |
---|---|---|
committer | pav <pav@FreeBSD.org> | 2004-04-10 23:39:16 +0800 |
commit | f7d8bb7959bcaeeba516807357f12e07ace680a7 (patch) | |
tree | 15dc884045880e2df2716c8498b19e06d66291e8 /net-mgmt | |
parent | 5f81ff0ecf62da34e2e47d7c7e1536e28bffc9a4 (diff) | |
download | freebsd-ports-gnome-f7d8bb7959bcaeeba516807357f12e07ace680a7.tar.gz freebsd-ports-gnome-f7d8bb7959bcaeeba516807357f12e07ace680a7.tar.zst freebsd-ports-gnome-f7d8bb7959bcaeeba516807357f12e07ace680a7.zip |
- Update to 1.0
- Fix OPTIONS usage
- Fix net-snmp configure argument
- Fix problem with building zabbix-agent
PR: ports/64325, ports/65313
Submitted by: Sergey Akifyev <asa@gascom.ru> (maintainer)
Diffstat (limited to 'net-mgmt')
-rw-r--r-- | net-mgmt/zabbix/Makefile | 28 | ||||
-rw-r--r-- | net-mgmt/zabbix/distinfo | 4 | ||||
-rw-r--r-- | net-mgmt/zabbix2/Makefile | 28 | ||||
-rw-r--r-- | net-mgmt/zabbix2/distinfo | 4 |
4 files changed, 32 insertions, 32 deletions
diff --git a/net-mgmt/zabbix/Makefile b/net-mgmt/zabbix/Makefile index 817af102041a..85a6be806e0b 100644 --- a/net-mgmt/zabbix/Makefile +++ b/net-mgmt/zabbix/Makefile @@ -6,21 +6,19 @@ # PORTNAME= zabbix -PORTVERSION= 1.0b14 +PORTVERSION= 1.0 +PORTEPOCH= 1 CATEGORIES?= net-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -DISTNAME= ${PORTNAME}-${PORTVERSION:S|b|beta|} MAINTAINER= asa@gascom.ru COMMENT= Very advanced network monitoring system -NOT_FOR_ARCHS= amd64 - .ifndef(ZABBIX_AGENT_ONLY) -OPTIONS= PGSQL "Use a PostgreSQL backend" Off \ - MYSQL "Use a MySQL backend" On \ - FPING "Use fping for pinging hosts" On +OPTIONS= PGSQL "Use a PostgreSQL backend" off \ + MYSQL "Use a MySQL backend" on \ + FPING "Use fping for pinging hosts" on .endif .include <bsd.port.pre.mk> @@ -34,25 +32,27 @@ LIB_DEPENDS= netsnmp.6:${PORTSDIR}/net-mgmt/net-snmp RUN_DEPENDS= php:${PORTSDIR}/lang/php4-nms .endif # ZABBIX_AGENT_ONLY -.ifdef(WITH_FPING) +.ifndef(WITHOUT_FPING) RUN_DEPENDS+= ${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping .endif +.ifndef(ZABBIX_AGENT_ONLY) .ifndef(WITH_PGSQL) -. ifndef(WITH_MYSQL) -IGNORE= You should configure to use either a MySQL or PostgreSQL backend. -. endif +.ifdef(WITHOUT_MYSQL) +IGNORE= You should configure to use either a MySQL or PostgreSQL backend +.endif +.endif .endif .ifdef(WITH_PGSQL) CONFIGURE_ARGS+=--with-pgsql LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql-client .endif -.ifdef(WITH_MYSQL) +.ifndef(WITHOUT_MYSQL) USE_MYSQL= yes CONFIGURE_ARGS= --with-mysql .endif -CONFIGURE_ARGS+=--with-netsnmp +CONFIGURE_ARGS+=--with-net-snmp PKGMESSAGE= ${WRKDIR}/pkg-message USE_REINPLACE= yes @@ -81,7 +81,7 @@ pre-patch: .ifndef(ZABBIX_AGENT_ONLY) post-patch: @${REINPLACE_CMD} 's|%LOCALBASE%|${LOCALBASE}|' ${WRKSRC}/src/zabbix_sucker/zabbix_sucker.c -.ifndef WITH_FPING +.ifdef WITHOUT_FPING @${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/misc/conf/zabbix_suckerd.conf .endif .endif # ZABBIX_AGENT_ONLY diff --git a/net-mgmt/zabbix/distinfo b/net-mgmt/zabbix/distinfo index 53a8d0475edb..7134e9c4f47a 100644 --- a/net-mgmt/zabbix/distinfo +++ b/net-mgmt/zabbix/distinfo @@ -1,2 +1,2 @@ -MD5 (zabbix-1.0beta14.tar.gz) = 0ac320c6cd99f801d8cb7923ca790419 -SIZE (zabbix-1.0beta14.tar.gz) = 1845306 +MD5 (zabbix-1.0.tar.gz) = e83a3b92f13942081ed2f3fe3f3084d8 +SIZE (zabbix-1.0.tar.gz) = 1847471 diff --git a/net-mgmt/zabbix2/Makefile b/net-mgmt/zabbix2/Makefile index 817af102041a..85a6be806e0b 100644 --- a/net-mgmt/zabbix2/Makefile +++ b/net-mgmt/zabbix2/Makefile @@ -6,21 +6,19 @@ # PORTNAME= zabbix -PORTVERSION= 1.0b14 +PORTVERSION= 1.0 +PORTEPOCH= 1 CATEGORIES?= net-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -DISTNAME= ${PORTNAME}-${PORTVERSION:S|b|beta|} MAINTAINER= asa@gascom.ru COMMENT= Very advanced network monitoring system -NOT_FOR_ARCHS= amd64 - .ifndef(ZABBIX_AGENT_ONLY) -OPTIONS= PGSQL "Use a PostgreSQL backend" Off \ - MYSQL "Use a MySQL backend" On \ - FPING "Use fping for pinging hosts" On +OPTIONS= PGSQL "Use a PostgreSQL backend" off \ + MYSQL "Use a MySQL backend" on \ + FPING "Use fping for pinging hosts" on .endif .include <bsd.port.pre.mk> @@ -34,25 +32,27 @@ LIB_DEPENDS= netsnmp.6:${PORTSDIR}/net-mgmt/net-snmp RUN_DEPENDS= php:${PORTSDIR}/lang/php4-nms .endif # ZABBIX_AGENT_ONLY -.ifdef(WITH_FPING) +.ifndef(WITHOUT_FPING) RUN_DEPENDS+= ${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping .endif +.ifndef(ZABBIX_AGENT_ONLY) .ifndef(WITH_PGSQL) -. ifndef(WITH_MYSQL) -IGNORE= You should configure to use either a MySQL or PostgreSQL backend. -. endif +.ifdef(WITHOUT_MYSQL) +IGNORE= You should configure to use either a MySQL or PostgreSQL backend +.endif +.endif .endif .ifdef(WITH_PGSQL) CONFIGURE_ARGS+=--with-pgsql LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql-client .endif -.ifdef(WITH_MYSQL) +.ifndef(WITHOUT_MYSQL) USE_MYSQL= yes CONFIGURE_ARGS= --with-mysql .endif -CONFIGURE_ARGS+=--with-netsnmp +CONFIGURE_ARGS+=--with-net-snmp PKGMESSAGE= ${WRKDIR}/pkg-message USE_REINPLACE= yes @@ -81,7 +81,7 @@ pre-patch: .ifndef(ZABBIX_AGENT_ONLY) post-patch: @${REINPLACE_CMD} 's|%LOCALBASE%|${LOCALBASE}|' ${WRKSRC}/src/zabbix_sucker/zabbix_sucker.c -.ifndef WITH_FPING +.ifdef WITHOUT_FPING @${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/misc/conf/zabbix_suckerd.conf .endif .endif # ZABBIX_AGENT_ONLY diff --git a/net-mgmt/zabbix2/distinfo b/net-mgmt/zabbix2/distinfo index 53a8d0475edb..7134e9c4f47a 100644 --- a/net-mgmt/zabbix2/distinfo +++ b/net-mgmt/zabbix2/distinfo @@ -1,2 +1,2 @@ -MD5 (zabbix-1.0beta14.tar.gz) = 0ac320c6cd99f801d8cb7923ca790419 -SIZE (zabbix-1.0beta14.tar.gz) = 1845306 +MD5 (zabbix-1.0.tar.gz) = e83a3b92f13942081ed2f3fe3f3084d8 +SIZE (zabbix-1.0.tar.gz) = 1847471 |