mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

- Update to 1.4.2

Browse Source 
- Always link server against pthread libs when sqlite3 is selected
- Clean up a bit
This commit is contained in:
Andrew Pantyukhin 2007-08-27 18:35:50 +00:00
parent f7167b0964
commit 72450bee8c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=198397
14 changed files with 60 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
net-mgmt/zabbix-agent/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= zabbix
PORTVERSION= 1.4.1
PORTVERSION= 1.4.2
PORTEPOCH= 1
CATEGORIES= net-mgmt
MASTER_SITES= SF
@ -26,19 +26,18 @@ ZABBIX_CFG= agent agentd
ZABBIX_BINFILES=${ZABBIX_BIN:S|^|zabbix_|:C|.+|&/&|:S|agentd/|agent/|}
ZABBIX_CFGFILES=${ZABBIX_CFG:S|^|zabbix_|:S|$|.conf|}
PLIST_FILES= ${ZABBIX_BIN:S|^|bin/zabbix_|} \
${ZABBIX_CFG:S|^|etc/zabbix/zabbix_|:S|$|.conf.sample|}
${ZABBIX_CFG:S|^|%%ETCDIR%%/zabbix_|:S|$|.conf.sample|}
post-patch:
@${FIND} ${WRKSRC}/src/ -type f|${XARGS} \
${REINPLACE_CMD} -Ee 's|(/etc/zabbix)|${PREFIX}\1|;s|/usr/sbin|${LOCALBASE}/sbin|'
${REINPLACE_CMD} -e 's|/etc/zabbix|${ETCDIR}|;s|/usr/sbin|${LOCALBASE}/sbin|'
do-install:
@${ECHO_CMD} '@unexec rmdir %D/etc/zabbix 2>/dev/null || true' >> ${TMPPLIST}
@${ECHO_CMD} '@unexec rmdir %D/${ETCDIR_REL} 2>/dev/null || true' >> ${TMPPLIST}
@${INSTALL_PROGRAM} ${ZABBIX_BINFILES:S,^,${WRKSRC}/src/,} ${PREFIX}/bin/
@${INSTALL} -d ${PREFIX}/etc/zabbix/
.for FILE in ${ZABBIX_CFGFILES}
${INSTALL_DATA} ${WRKSRC}/misc/conf/${FILE} ${PREFIX}/etc/zabbix/${FILE}.sample
.endfor
${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
@${INSTALL} -d ${ETCDIR}/
@for i in ${ZABBIX_CFGFILES};do\
${INSTALL_DATA} ${WRKSRC}/misc/conf/$$i ${ETCDIR}/$$i.sample;done
@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
.include <bsd.port.mk>

6
net-mgmt/zabbix-agent/distinfo
View File

@ -1,3 +1,3 @@
MD5 (zabbix-1.4.1.tar.gz) = c9e9a12eeb3ae784075cb7899f200889
SHA256 (zabbix-1.4.1.tar.gz) = 631445f5a1a9b0852bb20644cfdf735d8e1ecdc04c4c0a9b394bfb3429a5a6dc
SIZE (zabbix-1.4.1.tar.gz) = 3246817
MD5 (zabbix-1.4.2.tar.gz) = 1a89f3b8b0925c6373379b4c5dd3138b
SHA256 (zabbix-1.4.2.tar.gz) = 8dd0455e8a723cc9f31f0d41e7fbefa4d72088727c470c918e29de94c71c99bd
SIZE (zabbix-1.4.2.tar.gz) = 3302530

3
net-mgmt/zabbix-agent/files/zabbix_agentd.in
View File

@ -11,7 +11,6 @@ load_rc_config $name
eval : \${${rcvar}='NO'}
command="%%PREFIX%%/bin/${name}"
required_files="%%PREFIX%%/etc/zabbix/${name}.conf"
required_files="%%ETCDIR%%/${name}.conf"
run_rc_command "$1"

24
net-mgmt/zabbix/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= zabbix
PORTVERSION= 1.4.1
PORTREVISION= 2
PORTVERSION= 1.4.2
PORTEPOCH= 1
CATEGORIES= net-mgmt
MASTER_SITES= SF
@ -65,18 +64,14 @@ IGNORE= zabbix needs a database backend
post-patch:
@${FIND} ${WRKSRC}/src/ -type f|${XARGS} \
${REINPLACE_CMD} -Ee 's|(/etc/zabbix)|${PREFIX}\1|;s|/usr/sbin|${LOCALBASE}/sbin|'
@${REINPLACE_CMD} -e '/test.*rf/s|-rf|-f|;/LDFLAGS/s|-static||' ${WRKSRC}/configure
@${REINPLACE_CMD} -i '' -e '/^SDI.*pg_connection_string/d' ${WRKSRC}/frontends/php/include/db.inc.php
${REINPLACE_CMD} -e 's|/etc/zabbix|${ETCDIR}|;s|/usr/sbin|${LOCALBASE}/sbin|'
@${REINPLACE_CMD} -e '/test.*rf/s|-rf|-f|;/LDFLAGS/s|-static||;\
/LIBS="-lnetsnmp/s|="|="-lcrypto |;s|-lsqlite3|-lsqlite3 ${PTHREAD_LIBS}|'\
${WRKSRC}/configure
.ifdef WITHOUT_FPING
@${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/misc/conf/zabbix_server.conf
.endif
pre-configure:
@if ldd ${LOCALBASE}/lib/libsqlite3.so 2>&- |${GREP} -q thr;then\
${REINPLACE_CMD} -e 's|-lsqlite3|-lsqlite3 ${PTHREAD_LIBS}|'\
${WRKSRC}/configure; fi
.if ${ARCH} == "amd64"
post-configure:
${ECHO_CMD} "#define HAVE_VA_COPY 1" >> ${WRKSRC}/include/config.h
@ -84,11 +79,12 @@ post-configure:
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/src/zabbix_server/zabbix_server ${PREFIX}/bin/
@${INSTALL} -d ${PREFIX}/etc/zabbix/ ${DATADIR}/create/
@${INSTALL} -d ${ETCDIR}/
@${INSTALL_DATA} ${WRKSRC}/misc/conf/zabbix_server.conf\
${PREFIX}/etc/zabbix/zabbix_server.conf.sample
@${CP} -Rf ${WRKSRC}/frontends/ ${WRKSRC}/upgrades/dbpatches ${DATADIR}/
@${CP} -Rf ${WRKSRC}/create/data ${WRKSRC}/create/schema ${DATADIR}/create/
${ETCDIR}/zabbix_server.conf.sample
@cd ${WRKSRC}/frontends/&&${COPYTREE_SHARE} . ${DATADIR}/
@cd ${WRKSRC}/upgrades/&&${COPYTREE_SHARE} dbpatches ${DATADIR}/
@cd ${WRKSRC}/create/&&${COPYTREE_SHARE} "data schema" ${DATADIR}/create/
@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
@${CAT} ${PKGMESSAGE}

6
net-mgmt/zabbix/distinfo
View File

@ -1,3 +1,3 @@
MD5 (zabbix-1.4.1.tar.gz) = c9e9a12eeb3ae784075cb7899f200889
SHA256 (zabbix-1.4.1.tar.gz) = 631445f5a1a9b0852bb20644cfdf735d8e1ecdc04c4c0a9b394bfb3429a5a6dc
SIZE (zabbix-1.4.1.tar.gz) = 3246817
MD5 (zabbix-1.4.2.tar.gz) = 1a89f3b8b0925c6373379b4c5dd3138b
SHA256 (zabbix-1.4.2.tar.gz) = 8dd0455e8a723cc9f31f0d41e7fbefa4d72088727c470c918e29de94c71c99bd
SIZE (zabbix-1.4.2.tar.gz) = 3302530

2
net-mgmt/zabbix/files/zabbix_server.sh.in
View File

@ -11,6 +11,6 @@ load_rc_config $name
eval : \${${rcvar}='NO'}
command="%%PREFIX%%/bin/${name}"
required_files="%%PREFIX%%/etc/zabbix/${name}.conf"
required_files="%%ETCDIR%%/${name}.conf"
run_rc_command "$1"

6
net-mgmt/zabbix/pkg-plist
View File

@ -1,5 +1,5 @@
bin/zabbix_server
etc/zabbix/zabbix_server.conf.sample
%%ETCDIR%%/zabbix_server.conf.sample
%%DATADIR%%/create/data/data.sql
%%DATADIR%%/create/data/images_mysql.sql
%%DATADIR%%/create/data/images_oracle.sql
@ -154,6 +154,7 @@ etc/zabbix/zabbix_server.conf.sample
%%DATADIR%%/php/include/images.inc.php
%%DATADIR%%/php/include/import.inc.php
%%DATADIR%%/php/include/items.inc.php
%%DATADIR%%/php/include/js.inc.php
%%DATADIR%%/php/include/locales/cn_zh.inc.php
%%DATADIR%%/php/include/locales/de_de.inc.php
%%DATADIR%%/php/include/locales/en_gb.inc.php
@ -186,6 +187,7 @@ etc/zabbix/zabbix_server.conf.sample
%%DATADIR%%/php/js/cookies.js
%%DATADIR%%/php/js/menu.js
%%DATADIR%%/php/js/services.js
%%DATADIR%%/php/js/showhint.js
%%DATADIR%%/php/js/tree.js
%%DATADIR%%/php/latest.php
%%DATADIR%%/php/map.php
@ -244,7 +246,7 @@ etc/zabbix/zabbix_server.conf.sample
@dirrm %%DATADIR%%/php/include/locales
@dirrm %%DATADIR%%/php/include
@dirrm %%DATADIR%%/php/js
@dirrmtry %%ETCDIR%%
@dirrmtry %%DATADIR%%/php/conf
@dirrmtry %%DATADIR%%/php
@dirrmtry %%DATADIR%%
@dirrmtry etc/zabbix

17
net-mgmt/zabbix2-agent/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= zabbix
PORTVERSION= 1.4.1
PORTVERSION= 1.4.2
PORTEPOCH= 1
CATEGORIES= net-mgmt
MASTER_SITES= SF
@ -26,19 +26,18 @@ ZABBIX_CFG= agent agentd
ZABBIX_BINFILES=${ZABBIX_BIN:S|^|zabbix_|:C|.+|&/&|:S|agentd/|agent/|}
ZABBIX_CFGFILES=${ZABBIX_CFG:S|^|zabbix_|:S|$|.conf|}
PLIST_FILES= ${ZABBIX_BIN:S|^|bin/zabbix_|} \
${ZABBIX_CFG:S|^|etc/zabbix/zabbix_|:S|$|.conf.sample|}
${ZABBIX_CFG:S|^|%%ETCDIR%%/zabbix_|:S|$|.conf.sample|}
post-patch:
@${FIND} ${WRKSRC}/src/ -type f|${XARGS} \
${REINPLACE_CMD} -Ee 's|(/etc/zabbix)|${PREFIX}\1|;s|/usr/sbin|${LOCALBASE}/sbin|'
${REINPLACE_CMD} -e 's|/etc/zabbix|${ETCDIR}|;s|/usr/sbin|${LOCALBASE}/sbin|'
do-install:
@${ECHO_CMD} '@unexec rmdir %D/etc/zabbix 2>/dev/null || true' >> ${TMPPLIST}
@${ECHO_CMD} '@unexec rmdir %D/${ETCDIR_REL} 2>/dev/null || true' >> ${TMPPLIST}
@${INSTALL_PROGRAM} ${ZABBIX_BINFILES:S,^,${WRKSRC}/src/,} ${PREFIX}/bin/
@${INSTALL} -d ${PREFIX}/etc/zabbix/
.for FILE in ${ZABBIX_CFGFILES}
${INSTALL_DATA} ${WRKSRC}/misc/conf/${FILE} ${PREFIX}/etc/zabbix/${FILE}.sample
.endfor
${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
@${INSTALL} -d ${ETCDIR}/
@for i in ${ZABBIX_CFGFILES};do\
${INSTALL_DATA} ${WRKSRC}/misc/conf/$$i ${ETCDIR}/$$i.sample;done
@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
.include <bsd.port.mk>

6
net-mgmt/zabbix2-agent/distinfo
View File

@ -1,3 +1,3 @@
MD5 (zabbix-1.4.1.tar.gz) = c9e9a12eeb3ae784075cb7899f200889
SHA256 (zabbix-1.4.1.tar.gz) = 631445f5a1a9b0852bb20644cfdf735d8e1ecdc04c4c0a9b394bfb3429a5a6dc
SIZE (zabbix-1.4.1.tar.gz) = 3246817
MD5 (zabbix-1.4.2.tar.gz) = 1a89f3b8b0925c6373379b4c5dd3138b
SHA256 (zabbix-1.4.2.tar.gz) = 8dd0455e8a723cc9f31f0d41e7fbefa4d72088727c470c918e29de94c71c99bd
SIZE (zabbix-1.4.2.tar.gz) = 3302530

3
net-mgmt/zabbix2-agent/files/zabbix_agentd.in
View File

@ -11,7 +11,6 @@ load_rc_config $name
eval : \${${rcvar}='NO'}
command="%%PREFIX%%/bin/${name}"
required_files="%%PREFIX%%/etc/zabbix/${name}.conf"
required_files="%%ETCDIR%%/${name}.conf"
run_rc_command "$1"

24
net-mgmt/zabbix2/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= zabbix
PORTVERSION= 1.4.1
PORTREVISION= 2
PORTVERSION= 1.4.2
PORTEPOCH= 1
CATEGORIES= net-mgmt
MASTER_SITES= SF
@ -65,18 +64,14 @@ IGNORE= zabbix needs a database backend
post-patch:
@${FIND} ${WRKSRC}/src/ -type f|${XARGS} \
${REINPLACE_CMD} -Ee 's|(/etc/zabbix)|${PREFIX}\1|;s|/usr/sbin|${LOCALBASE}/sbin|'
@${REINPLACE_CMD} -e '/test.*rf/s|-rf|-f|;/LDFLAGS/s|-static||' ${WRKSRC}/configure
@${REINPLACE_CMD} -i '' -e '/^SDI.*pg_connection_string/d' ${WRKSRC}/frontends/php/include/db.inc.php
${REINPLACE_CMD} -e 's|/etc/zabbix|${ETCDIR}|;s|/usr/sbin|${LOCALBASE}/sbin|'
@${REINPLACE_CMD} -e '/test.*rf/s|-rf|-f|;/LDFLAGS/s|-static||;\
/LIBS="-lnetsnmp/s|="|="-lcrypto |;s|-lsqlite3|-lsqlite3 ${PTHREAD_LIBS}|'\
${WRKSRC}/configure
.ifdef WITHOUT_FPING
@${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/misc/conf/zabbix_server.conf
.endif
pre-configure:
@if ldd ${LOCALBASE}/lib/libsqlite3.so 2>&- |${GREP} -q thr;then\
${REINPLACE_CMD} -e 's|-lsqlite3|-lsqlite3 ${PTHREAD_LIBS}|'\
${WRKSRC}/configure; fi
.if ${ARCH} == "amd64"
post-configure:
${ECHO_CMD} "#define HAVE_VA_COPY 1" >> ${WRKSRC}/include/config.h
@ -84,11 +79,12 @@ post-configure:
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/src/zabbix_server/zabbix_server ${PREFIX}/bin/
@${INSTALL} -d ${PREFIX}/etc/zabbix/ ${DATADIR}/create/
@${INSTALL} -d ${ETCDIR}/
@${INSTALL_DATA} ${WRKSRC}/misc/conf/zabbix_server.conf\
${PREFIX}/etc/zabbix/zabbix_server.conf.sample
@${CP} -Rf ${WRKSRC}/frontends/ ${WRKSRC}/upgrades/dbpatches ${DATADIR}/
@${CP} -Rf ${WRKSRC}/create/data ${WRKSRC}/create/schema ${DATADIR}/create/
${ETCDIR}/zabbix_server.conf.sample
@cd ${WRKSRC}/frontends/&&${COPYTREE_SHARE} . ${DATADIR}/
@cd ${WRKSRC}/upgrades/&&${COPYTREE_SHARE} dbpatches ${DATADIR}/
@cd ${WRKSRC}/create/&&${COPYTREE_SHARE} "data schema" ${DATADIR}/create/
@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
@${CAT} ${PKGMESSAGE}

6
net-mgmt/zabbix2/distinfo
View File

@ -1,3 +1,3 @@
MD5 (zabbix-1.4.1.tar.gz) = c9e9a12eeb3ae784075cb7899f200889
SHA256 (zabbix-1.4.1.tar.gz) = 631445f5a1a9b0852bb20644cfdf735d8e1ecdc04c4c0a9b394bfb3429a5a6dc
SIZE (zabbix-1.4.1.tar.gz) = 3246817
MD5 (zabbix-1.4.2.tar.gz) = 1a89f3b8b0925c6373379b4c5dd3138b
SHA256 (zabbix-1.4.2.tar.gz) = 8dd0455e8a723cc9f31f0d41e7fbefa4d72088727c470c918e29de94c71c99bd
SIZE (zabbix-1.4.2.tar.gz) = 3302530

2
net-mgmt/zabbix2/files/zabbix_server.sh.in
View File

@ -11,6 +11,6 @@ load_rc_config $name
eval : \${${rcvar}='NO'}
command="%%PREFIX%%/bin/${name}"
required_files="%%PREFIX%%/etc/zabbix/${name}.conf"
required_files="%%ETCDIR%%/${name}.conf"
run_rc_command "$1"

6
net-mgmt/zabbix2/pkg-plist
View File

@ -1,5 +1,5 @@
bin/zabbix_server
etc/zabbix/zabbix_server.conf.sample
%%ETCDIR%%/zabbix_server.conf.sample
%%DATADIR%%/create/data/data.sql
%%DATADIR%%/create/data/images_mysql.sql
%%DATADIR%%/create/data/images_oracle.sql
@ -154,6 +154,7 @@ etc/zabbix/zabbix_server.conf.sample
%%DATADIR%%/php/include/images.inc.php
%%DATADIR%%/php/include/import.inc.php
%%DATADIR%%/php/include/items.inc.php
%%DATADIR%%/php/include/js.inc.php
%%DATADIR%%/php/include/locales/cn_zh.inc.php
%%DATADIR%%/php/include/locales/de_de.inc.php
%%DATADIR%%/php/include/locales/en_gb.inc.php
@ -186,6 +187,7 @@ etc/zabbix/zabbix_server.conf.sample
%%DATADIR%%/php/js/cookies.js
%%DATADIR%%/php/js/menu.js
%%DATADIR%%/php/js/services.js
%%DATADIR%%/php/js/showhint.js
%%DATADIR%%/php/js/tree.js
%%DATADIR%%/php/latest.php
%%DATADIR%%/php/map.php
@ -244,7 +246,7 @@ etc/zabbix/zabbix_server.conf.sample
@dirrm %%DATADIR%%/php/include/locales
@dirrm %%DATADIR%%/php/include
@dirrm %%DATADIR%%/php/js
@dirrmtry %%ETCDIR%%
@dirrmtry %%DATADIR%%/php/conf
@dirrmtry %%DATADIR%%/php
@dirrmtry %%DATADIR%%
@dirrmtry etc/zabbix