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

- Stage support [1]

Browse Source 
- Clean up pkg-plist a bit [1]
- Use modern LIB_DEPENDS

PR:		ports/188037
Submitted by:	Danilo G. Baio <dbaio@bsd.com.br>
Approved by:	maintainer timeout (<pakhom706@gmail.com> , 3 weeks)
This commit is contained in:
Rene Ladan 2014-04-22 18:31:13 +00:00
parent edff1225fa
commit 71afc9d4e8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=351870
7 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net-mgmt/zabbix22-agent/Makefile
View File

@ -13,6 +13,5 @@ OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
OPTIONS_DEFINE= IPV6
OPTIONS_DEFAULT= IPV6
NO_STAGE= yes
.include <bsd.port.options.mk>
.include "${MASTERDIR}/Makefile"

5
net-mgmt/zabbix22-frontend/Makefile
View File

@ -20,7 +20,6 @@ OPTIONS_DEFINE= MYSQL MYSQLI PGSQL SQLITE ORACLE
OPTIONS_DEFAULT= MYSQL MYSQLI
MYSQLI_DESC= MySQLI backend
NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MMYSQL}
@ -45,7 +44,7 @@ CONFIGURE_ARGS+= --with-oracle
.endif
do-install:
@${INSTALL} -d ${WWWDIR}
@cd ${WRKSRC}/frontends/php/ && ${COPYTREE_SHARE} . ${WWWDIR}
@${INSTALL} -d ${STAGEDIR}${WWWDIR}
@cd ${WRKSRC}/frontends/php/ && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
.include "${MASTERDIR}/Makefile"

1
net-mgmt/zabbix22-proxy/Makefile
View File

@ -6,5 +6,4 @@ PKGNAMESUFFIX= -proxy
MASTERDIR= ${.CURDIR}/../zabbix22-server
NO_STAGE= yes
.include "${MASTERDIR}/Makefile"

31
net-mgmt/zabbix22-server/Makefile
View File

@ -27,11 +27,8 @@ ZABBIX_BUILD= ${PKGNAMESUFFIX:S/^-//}
.if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings
.if ${ZABBIX_BUILD} != "agent"
MAN8+= zabbix_${ZABBIX_BUILD}.8
USE_RC_SUBR= zabbix_${ZABBIX_BUILD}
.else
MAN1+= zabbix_get.1 zabbix_sender.1
MAN8+= zabbix_${ZABBIX_BUILD}d.8
USE_RC_SUBR= zabbix_${ZABBIX_BUILD}d
.endif
@ -63,8 +60,8 @@ CONFIGURE_ARGS+= --enable-${ZABBIX_BUILD} \
--with-iconv=${ICONV_PREFIX}
.if ${ZABBIX_BUILD} != "agent"
LIB_DEPENDS= netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
execinfo:${PORTSDIR}/devel/libexecinfo
LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp \
libexecinfo.so:${PORTSDIR}/devel/libexecinfo
SUB_FILES= pkg-message
@ -92,7 +89,6 @@ OPTIONS_SINGLE= DB ODBC
OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE
OPTIONS_SINGLE_ODBC= IODBC UNIXODBC
NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MMYSQL}
@ -119,7 +115,7 @@ CONFIGURE_ARGS+= --with-oracle
.endif
.if ${PORT_OPTIONS:MCURL}
LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl
CONFIGURE_ARGS+= --with-libcurl
.endif
@ -129,12 +125,12 @@ CONFIGURE_ARGS+= --with-ldap
.endif
.if ${PORT_OPTIONS:MIPMI}
LIB_DEPENDS+= OpenIPMI:${PORTSDIR}/sysutils/openipmi
LIB_DEPENDS+= libOpenIPMI.so:${PORTSDIR}/sysutils/openipmi
CONFIGURE_ARGS+= --with-openipmi
.endif
.if ${PORT_OPTIONS:MJABBER}
LIB_DEPENDS+= iksemel:${PORTSDIR}/textproc/iksemel
LIB_DEPENDS+= libiksemel.so:${PORTSDIR}/textproc/iksemel
CONFIGURE_ARGS+= --with-jabber
.endif
@ -143,17 +139,17 @@ RUN_DEPENDS+= fping:${PORTSDIR}/net/fping
.endif
.if ${PORT_OPTIONS:MSSH}
LIB_DEPENDS+= ssh2:${PORTSDIR}/security/libssh2
LIB_DEPENDS+= libssh2.so:${PORTSDIR}/security/libssh2
CONFIGURE_ARGS+= --with-ssh2
.endif
.if ${PORT_OPTIONS:MIODBC}
LIB_DEPENDS+= iodbc:${PORTSDIR}/databases/libiodbc
LIB_DEPENDS+= libiodbc.so:${PORTSDIR}/databases/libiodbc
CONFIGURE_ARGS+= --with-iodbc
.endif
.if ${PORT_OPTIONS:MUNIXODBC}
LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC
LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC
CONFIGURE_ARGS+= --with-unixodbc
.endif
.endif # if ${ZABBIX_BUILD} != "agent"
@ -177,7 +173,7 @@ PLIST_SUB+= JAVAGW="@comment "
.endif
.if ${PORT_OPTIONS:MLIBXML2}
LIB_DEPENDS+= xml2:${PORTSDIR}/textproc/libxml2
LIB_DEPENDS+= libxml2.so:${PORTSDIR}/textproc/libxml2
CONFIGURE_ARGS+= --with-libxml2
.endif
@ -203,14 +199,13 @@ post-patch:
post-install:
.if defined(WITH_JAVAGW)
@${MV} ${PREFIX}/sbin/zabbix_java/settings.sh ${PREFIX}/sbin/zabbix_java/settings.sh.sample
@${MV} ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh.sample
.endif
.if ${ZABBIX_BUILD} != "agent"
@${MKDIR} "${DATADIR}/${ZABBIX_BUILD}/database"
@cd ${WRKSRC}/upgrades/ && ${COPYTREE_SHARE} dbpatches ${DATADIR}/${ZABBIX_BUILD}/upgrades/
@cd ${WRKSRC}/database/ && ${COPYTREE_SHARE} "ibm_db2 mysql oracle postgresql sqlite3" ${DATADIR}/${ZABBIX_BUILD}/database/
@${CAT} ${PKGMESSAGE}
@${MKDIR} "${STAGEDIR}${DATADIR}/${ZABBIX_BUILD}/database"
@cd ${WRKSRC}/upgrades/ && ${COPYTREE_SHARE} dbpatches ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD}/upgrades/
@cd ${WRKSRC}/database/ && ${COPYTREE_SHARE} "ibm_db2 mysql oracle postgresql sqlite3" ${STAGEDIR}${DATADIR}/${ZABBIX_BUILD}/database/
.endif
.endif # if ${ZABBIX_BUILD} != "frontend"

1
net-mgmt/zabbix22-server/pkg-plist
View File

@ -1,4 +1,5 @@
%%ETCDIR%%/zabbix_%%ZABBIX_BUILD%%.conf.sample
man/man8/zabbix_%%ZABBIX_BUILD%%.8.gz
sbin/zabbix_%%ZABBIX_BUILD%%
%%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/data.sql
%%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql/schema.sql

3
net-mgmt/zabbix22-server/pkg-plist.agent
View File

@ -7,3 +7,6 @@ sbin/zabbix_agentd
@dirrmtry %%ETCDIR%%/zabbix_agentd.conf.d
@dirrmtry %%ETCDIR%%/zabbix_agent.conf.d
@dirrmtry %%ETCDIR%%
man/man1/zabbix_get.1.gz
man/man1/zabbix_sender.1.gz
man/man8/zabbix_%%ZABBIX_BUILD%%d.8.gz

20
net-mgmt/zabbix22-server/pkg-plist.frontend
View File

@ -820,7 +820,7 @@
@dirrm %%WWWDIR%%/audio
@dirrm %%WWWDIR%%/include/views/js
@dirrm %%WWWDIR%%/include/views
@dirrm %%WWWDIR%%/include/classes/graphdraw/
@dirrm %%WWWDIR%%/include/classes/graphdraw
@dirrm %%WWWDIR%%/include/classes/import/formatters
@dirrm %%WWWDIR%%/include/classes/import/readers
@dirrm %%WWWDIR%%/include/classes/import/importers
@ -846,7 +846,7 @@
@dirrm %%WWWDIR%%/include/classes/validators/host
@dirrm %%WWWDIR%%/include/classes/validators/string
@dirrm %%WWWDIR%%/include/classes/validators/object
@dirrm %%WWWDIR%%/include/classes/validators/
@dirrm %%WWWDIR%%/include/classes/validators
@dirrm %%WWWDIR%%/include/classes
@dirrm %%WWWDIR%%/include
@dirrm %%WWWDIR%%/api/rpc
@ -913,14 +913,14 @@
@dirrm %%WWWDIR%%/locale/tr
@dirrm %%WWWDIR%%/locale/sk/LC_MESSAGES
@dirrm %%WWWDIR%%/locale/sk
@dirrm %%WWWDIR%%/locale/en_US/LC_MESSAGES/
@dirrm %%WWWDIR%%/locale/en_US/
@dirrm %%WWWDIR%%/locale/bg/LC_MESSAGES/
@dirrm %%WWWDIR%%/locale/bg/
@dirrm %%WWWDIR%%/locale/lt/LC_MESSAGES/
@dirrm %%WWWDIR%%/locale/lt/
@dirrm %%WWWDIR%%/locale/ro/LC_MESSAGES/
@dirrm %%WWWDIR%%/locale/ro/
@dirrm %%WWWDIR%%/locale/en_US/LC_MESSAGES
@dirrm %%WWWDIR%%/locale/en_US
@dirrm %%WWWDIR%%/locale/bg/LC_MESSAGES
@dirrm %%WWWDIR%%/locale/bg
@dirrm %%WWWDIR%%/locale/lt/LC_MESSAGES
@dirrm %%WWWDIR%%/locale/lt
@dirrm %%WWWDIR%%/locale/ro/LC_MESSAGES
@dirrm %%WWWDIR%%/locale/ro
@dirrm %%WWWDIR%%/locale
@dirrm %%WWWDIR%%/conf
@dirrm %%WWWDIR%%/js/jquery