diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2004-01-15 23:21:54 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2004-01-15 23:21:54 +0000 |
| commit | a4e3939c4509edd25600a0f351aaacb8ee94144d (patch) | |
| tree | 83273338f7081d1e465147c58a2fdba6215d42c6 /net-mgmt | |
| parent | * Upgrade lang/ghc to 6.2. (diff) | |
- Update to 1.0 beta13
- Makefile cleanup
PR: ports/61360
Submitted by: Sergey Akifyev <asa@gascom.ru> (maintainer)
Notes
Notes:
svn path=/head/; revision=98233
Diffstat (limited to 'net-mgmt')
| -rw-r--r-- | net-mgmt/zabbix/Makefile | 23 | ||||
| -rw-r--r-- | net-mgmt/zabbix/distinfo | 2 | ||||
| -rw-r--r-- | net-mgmt/zabbix/pkg-plist | 17 | ||||
| -rw-r--r-- | net-mgmt/zabbix2/Makefile | 23 | ||||
| -rw-r--r-- | net-mgmt/zabbix2/distinfo | 2 | ||||
| -rw-r--r-- | net-mgmt/zabbix2/pkg-plist | 17 |
6 files changed, 66 insertions, 18 deletions
diff --git a/net-mgmt/zabbix/Makefile b/net-mgmt/zabbix/Makefile index 243df141af5e..1bfa3af0a94f 100644 --- a/net-mgmt/zabbix/Makefile +++ b/net-mgmt/zabbix/Makefile @@ -6,8 +6,7 @@ # PORTNAME= zabbix -PORTVERSION= 1.0b12 -PORTREVISION= 2 +PORTVERSION= 1.0b13 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -20,18 +19,21 @@ COMMENT= Very advanced network monitoring system PKGNAMESUFFIX= -agent PLIST= ${MASTERDIR}/pkg-plist.agent PKGMESSAGE= nonexistent -.else +.else # ZABBIX_AGENT_ONLY LIB_DEPENDS= netsnmp.6:${PORTSDIR}/net/net-snmp -RUN_DEPENDS= php:${PORTSDIR}/lang/php4-nms \ - fping:${PORTSDIR}/net/fping +RUN_DEPENDS= php:${PORTSDIR}/lang/php4-nms + +.ifndef(WITHOUT_FPING) +RUN_DEPENDS+= fping:${PORTSDIR}/net/fping +.endif USE_MYSQL= yes CONFIGURE_ARGS= --with-mysql --with-net-snmp PKGMESSAGE= ${WRKDIR}/pkg-message -.endif +.endif # ZABBIX_AGENT_ONLY -USE_RC_SUBR= yes USE_REINPLACE= yes +USE_RC_SUBR= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include @@ -53,8 +55,13 @@ pre-patch: @${SED} ${SCRIPT_REGEX} ${PKGDIR}/scripts/zabbix-agent.sh.sample > \ ${WRKDIR}/zabbix-agent.sh.sample +.ifndef(ZABBIX_AGENT_ONLY) post-patch: @${REINPLACE_CMD} 's|%LOCALBASE%|${LOCALBASE}|' ${WRKSRC}/src/zabbix_sucker/zabbix_sucker.c +.ifdef WITHOUT_FPING + @${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/misc/conf/zabbix_suckerd.conf +.endif +.endif # ZABBIX_AGENT_ONLY do-install: .for FILE in ${ZABBIX_BINARIES} @@ -83,7 +90,7 @@ do-install: ${PREFIX}/etc/rc.d ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .ifndef(ZABBIX_AGENT_ONLY) - ${CAT} ${PKGMESSAGE} + @${CAT} ${PKGMESSAGE} .endif .include <bsd.port.mk> diff --git a/net-mgmt/zabbix/distinfo b/net-mgmt/zabbix/distinfo index 64830fb86ce3..713d13a9a9ed 100644 --- a/net-mgmt/zabbix/distinfo +++ b/net-mgmt/zabbix/distinfo @@ -1 +1 @@ -MD5 (zabbix-1.0beta12.tar.gz) = 8b8827272231de93cd9b93731a8369dd +MD5 (zabbix-1.0beta13.tar.gz) = 9299feaa14ff5f9c6218e15a560270ab diff --git a/net-mgmt/zabbix/pkg-plist b/net-mgmt/zabbix/pkg-plist index 9dbeb42e936c..c5bfd3a76dae 100644 --- a/net-mgmt/zabbix/pkg-plist +++ b/net-mgmt/zabbix/pkg-plist @@ -58,12 +58,23 @@ bin/zabbix_trapperd %%DATADIR%%/php/trends.php %%DATADIR%%/php/triggers.php %%DATADIR%%/php/users.php +%%DATADIR%%/php/images/sysmaps/old/Notebook.png +%%DATADIR%%/php/images/sysmaps/old/Hub.png +%%DATADIR%%/php/images/sysmaps/old/Printer.png +%%DATADIR%%/php/images/sysmaps/old/Router.png +%%DATADIR%%/php/images/sysmaps/old/Server.png +%%DATADIR%%/php/images/sysmaps/old/Workstation.png %%DATADIR%%/php/images/sysmaps/Notebook.png %%DATADIR%%/php/images/sysmaps/Hub.png %%DATADIR%%/php/images/sysmaps/Printer.png %%DATADIR%%/php/images/sysmaps/Router.png %%DATADIR%%/php/images/sysmaps/Server.png %%DATADIR%%/php/images/sysmaps/Workstation.png +%%DATADIR%%/php/images/sysmaps/README +%%DATADIR%%/php/images/sysmaps/Phone.png +%%DATADIR%%/php/images/sysmaps/Battery.png +%%DATADIR%%/php/images/sysmaps/Network.png +%%DATADIR%%/php/images/sysmaps/Satellite.png %%DATADIR%%/php/include/.htaccess %%DATADIR%%/php/include/classes.inc.php %%DATADIR%%/php/include/config.inc.php @@ -109,8 +120,11 @@ bin/zabbix_trapperd %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/postgresql/patch.sql %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/mysql/patch.sql %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/postgresql/patch.sql +%%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/mysql/patch.sql +%%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/postgresql/patch.sql @dirrm etc/zabbix @dirrm %%DATADIR%%/php/audio +@dirrm %%DATADIR%%/php/images/sysmaps/old @dirrm %%DATADIR%%/php/images/sysmaps @dirrm %%DATADIR%%/php/images @dirrm %%DATADIR%%/php/include @@ -173,6 +187,9 @@ bin/zabbix_trapperd @dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/mysql @dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/postgresql @dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11 +@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/mysql +@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/postgresql +@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13 @dirrm %%DATADIR%%/dbpatches @dirrm %%DATADIR%% @exec ln -sf %D/etc/zabbix /etc/zabbix diff --git a/net-mgmt/zabbix2/Makefile b/net-mgmt/zabbix2/Makefile index 243df141af5e..1bfa3af0a94f 100644 --- a/net-mgmt/zabbix2/Makefile +++ b/net-mgmt/zabbix2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= zabbix -PORTVERSION= 1.0b12 -PORTREVISION= 2 +PORTVERSION= 1.0b13 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -20,18 +19,21 @@ COMMENT= Very advanced network monitoring system PKGNAMESUFFIX= -agent PLIST= ${MASTERDIR}/pkg-plist.agent PKGMESSAGE= nonexistent -.else +.else # ZABBIX_AGENT_ONLY LIB_DEPENDS= netsnmp.6:${PORTSDIR}/net/net-snmp -RUN_DEPENDS= php:${PORTSDIR}/lang/php4-nms \ - fping:${PORTSDIR}/net/fping +RUN_DEPENDS= php:${PORTSDIR}/lang/php4-nms + +.ifndef(WITHOUT_FPING) +RUN_DEPENDS+= fping:${PORTSDIR}/net/fping +.endif USE_MYSQL= yes CONFIGURE_ARGS= --with-mysql --with-net-snmp PKGMESSAGE= ${WRKDIR}/pkg-message -.endif +.endif # ZABBIX_AGENT_ONLY -USE_RC_SUBR= yes USE_REINPLACE= yes +USE_RC_SUBR= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include @@ -53,8 +55,13 @@ pre-patch: @${SED} ${SCRIPT_REGEX} ${PKGDIR}/scripts/zabbix-agent.sh.sample > \ ${WRKDIR}/zabbix-agent.sh.sample +.ifndef(ZABBIX_AGENT_ONLY) post-patch: @${REINPLACE_CMD} 's|%LOCALBASE%|${LOCALBASE}|' ${WRKSRC}/src/zabbix_sucker/zabbix_sucker.c +.ifdef WITHOUT_FPING + @${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/misc/conf/zabbix_suckerd.conf +.endif +.endif # ZABBIX_AGENT_ONLY do-install: .for FILE in ${ZABBIX_BINARIES} @@ -83,7 +90,7 @@ do-install: ${PREFIX}/etc/rc.d ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .ifndef(ZABBIX_AGENT_ONLY) - ${CAT} ${PKGMESSAGE} + @${CAT} ${PKGMESSAGE} .endif .include <bsd.port.mk> diff --git a/net-mgmt/zabbix2/distinfo b/net-mgmt/zabbix2/distinfo index 64830fb86ce3..713d13a9a9ed 100644 --- a/net-mgmt/zabbix2/distinfo +++ b/net-mgmt/zabbix2/distinfo @@ -1 +1 @@ -MD5 (zabbix-1.0beta12.tar.gz) = 8b8827272231de93cd9b93731a8369dd +MD5 (zabbix-1.0beta13.tar.gz) = 9299feaa14ff5f9c6218e15a560270ab diff --git a/net-mgmt/zabbix2/pkg-plist b/net-mgmt/zabbix2/pkg-plist index 9dbeb42e936c..c5bfd3a76dae 100644 --- a/net-mgmt/zabbix2/pkg-plist +++ b/net-mgmt/zabbix2/pkg-plist @@ -58,12 +58,23 @@ bin/zabbix_trapperd %%DATADIR%%/php/trends.php %%DATADIR%%/php/triggers.php %%DATADIR%%/php/users.php +%%DATADIR%%/php/images/sysmaps/old/Notebook.png +%%DATADIR%%/php/images/sysmaps/old/Hub.png +%%DATADIR%%/php/images/sysmaps/old/Printer.png +%%DATADIR%%/php/images/sysmaps/old/Router.png +%%DATADIR%%/php/images/sysmaps/old/Server.png +%%DATADIR%%/php/images/sysmaps/old/Workstation.png %%DATADIR%%/php/images/sysmaps/Notebook.png %%DATADIR%%/php/images/sysmaps/Hub.png %%DATADIR%%/php/images/sysmaps/Printer.png %%DATADIR%%/php/images/sysmaps/Router.png %%DATADIR%%/php/images/sysmaps/Server.png %%DATADIR%%/php/images/sysmaps/Workstation.png +%%DATADIR%%/php/images/sysmaps/README +%%DATADIR%%/php/images/sysmaps/Phone.png +%%DATADIR%%/php/images/sysmaps/Battery.png +%%DATADIR%%/php/images/sysmaps/Network.png +%%DATADIR%%/php/images/sysmaps/Satellite.png %%DATADIR%%/php/include/.htaccess %%DATADIR%%/php/include/classes.inc.php %%DATADIR%%/php/include/config.inc.php @@ -109,8 +120,11 @@ bin/zabbix_trapperd %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/postgresql/patch.sql %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/mysql/patch.sql %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/postgresql/patch.sql +%%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/mysql/patch.sql +%%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/postgresql/patch.sql @dirrm etc/zabbix @dirrm %%DATADIR%%/php/audio +@dirrm %%DATADIR%%/php/images/sysmaps/old @dirrm %%DATADIR%%/php/images/sysmaps @dirrm %%DATADIR%%/php/images @dirrm %%DATADIR%%/php/include @@ -173,6 +187,9 @@ bin/zabbix_trapperd @dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/mysql @dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/postgresql @dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11 +@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/mysql +@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/postgresql +@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13 @dirrm %%DATADIR%%/dbpatches @dirrm %%DATADIR%% @exec ln -sf %D/etc/zabbix /etc/zabbix |