diff options
| author | Sergey Matveychuk <sem@FreeBSD.org> | 2006-09-11 13:08:13 +0000 |
|---|---|---|
| committer | Sergey Matveychuk <sem@FreeBSD.org> | 2006-09-11 13:08:13 +0000 |
| commit | 9c42461dbaea74a31678a951d4e264487141fd0e (patch) | |
| tree | 87d2b8ae19fabbd86b7e13a0999b77c107ce24e7 /net-mgmt | |
| parent | Mark jakarta-tomcat5 as fixed since 5.0.30,5 regarding minor XSS issue. (diff) | |
- When ZABBIX_AGENT_ONLY defined, two REINPLACE_CMD patches are missed.
Reported by: Vladimir Alexeyeff (wom@RusNET)
Notes
Notes:
svn path=/head/; revision=172779
Diffstat (limited to 'net-mgmt')
| -rw-r--r-- | net-mgmt/zabbix/Makefile | 5 | ||||
| -rw-r--r-- | net-mgmt/zabbix2/Makefile | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/net-mgmt/zabbix/Makefile b/net-mgmt/zabbix/Makefile index bfd49d66a7d9..f0180326c3de 100644 --- a/net-mgmt/zabbix/Makefile +++ b/net-mgmt/zabbix/Makefile @@ -7,6 +7,7 @@ PORTNAME= zabbix PORTVERSION= 1.1.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES?= net-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -76,11 +77,11 @@ ZABBIX_BINARIES+= zabbix_server/zabbix_server ZABBIX_CONFIGS+= zabbix_server.conf .endif -.ifndef(ZABBIX_AGENT_ONLY) post-patch: - @${REINPLACE_CMD} 's|%LOCALBASE%|${LOCALBASE}|;s|%PREFIX%|${PREFIX}|' ${WRKSRC}/src/zabbix_server/server.c @${REINPLACE_CMD} 's|%PREFIX%|${PREFIX}|' ${WRKSRC}/src/zabbix_agent/zabbix_agent.c @${REINPLACE_CMD} 's|%PREFIX%|${PREFIX}|' ${WRKSRC}/src/zabbix_agent/zabbix_agentd.c +.ifndef(ZABBIX_AGENT_ONLY) + @${REINPLACE_CMD} 's|%LOCALBASE%|${LOCALBASE}|;s|%PREFIX%|${PREFIX}|' ${WRKSRC}/src/zabbix_server/server.c .ifdef WITHOUT_FPING @${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/misc/conf/zabbix_server.conf .endif diff --git a/net-mgmt/zabbix2/Makefile b/net-mgmt/zabbix2/Makefile index bfd49d66a7d9..f0180326c3de 100644 --- a/net-mgmt/zabbix2/Makefile +++ b/net-mgmt/zabbix2/Makefile @@ -7,6 +7,7 @@ PORTNAME= zabbix PORTVERSION= 1.1.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES?= net-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -76,11 +77,11 @@ ZABBIX_BINARIES+= zabbix_server/zabbix_server ZABBIX_CONFIGS+= zabbix_server.conf .endif -.ifndef(ZABBIX_AGENT_ONLY) post-patch: - @${REINPLACE_CMD} 's|%LOCALBASE%|${LOCALBASE}|;s|%PREFIX%|${PREFIX}|' ${WRKSRC}/src/zabbix_server/server.c @${REINPLACE_CMD} 's|%PREFIX%|${PREFIX}|' ${WRKSRC}/src/zabbix_agent/zabbix_agent.c @${REINPLACE_CMD} 's|%PREFIX%|${PREFIX}|' ${WRKSRC}/src/zabbix_agent/zabbix_agentd.c +.ifndef(ZABBIX_AGENT_ONLY) + @${REINPLACE_CMD} 's|%LOCALBASE%|${LOCALBASE}|;s|%PREFIX%|${PREFIX}|' ${WRKSRC}/src/zabbix_server/server.c .ifdef WITHOUT_FPING @${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/misc/conf/zabbix_server.conf .endif |