Attachment 141289 Details for Bug 188037 – file.diff

[patch] file.diff

file.diff (text/plain), 4.48 KB, created by Danilo G. Baio on 2014-03-28 23:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Danilo G. Baio

Created: 2014-03-28 23:30:00 UTC

Size: 4.48 KB

patch

obsolete

>Index: zabbix22-agent/Makefile
>===================================================================
>--- zabbix22-agent/Makefile	(revision 349425)
>+++ zabbix22-agent/Makefile	(working copy)
>@@ -13,6 +13,5 @@
> OPTIONS_DEFINE=	IPV6
> OPTIONS_DEFAULT=	IPV6
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> .include "${MASTERDIR}/Makefile"
>Index: zabbix22-frontend/Makefile
>===================================================================
>--- zabbix22-frontend/Makefile	(revision 349425)
>+++ zabbix22-frontend/Makefile	(working copy)
>@@ -20,7 +20,6 @@
> OPTIONS_DEFAULT=	MYSQL MYSQLI
> MYSQLI_DESC=	MySQLI backend
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MMYSQL}
>@@ -45,7 +44,7 @@
> .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"
>Index: zabbix22-proxy/Makefile
>===================================================================
>--- zabbix22-proxy/Makefile	(revision 349425)
>+++ zabbix22-proxy/Makefile	(working copy)
>@@ -6,5 +6,4 @@
> 
> MASTERDIR=	${.CURDIR}/../zabbix22-server
> 
>-NO_STAGE=	yes
> .include "${MASTERDIR}/Makefile"
>Index: zabbix22-server/Makefile
>===================================================================
>--- zabbix22-server/Makefile	(revision 349425)
>+++ zabbix22-server/Makefile	(working copy)
>@@ -92,7 +92,6 @@
> OPTIONS_SINGLE_DB=	MYSQL PGSQL SQLITE ORACLE
> OPTIONS_SINGLE_ODBC=	IODBC UNIXODBC
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MMYSQL}
>@@ -203,14 +202,13 @@
> 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"
> 
>Index: zabbix22-server/pkg-plist
>===================================================================
>--- zabbix22-server/pkg-plist	(revision 349425)
>+++ zabbix22-server/pkg-plist	(working copy)
>@@ -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
>Index: zabbix22-server/pkg-plist.agent
>===================================================================
>--- zabbix22-server/pkg-plist.agent	(revision 349425)
>+++ zabbix22-server/pkg-plist.agent	(working copy)
>@@ -7,3 +7,6 @@
> @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
>Index: zabbix22-server/pkg-plist.frontend
>===================================================================
>--- zabbix22-server/pkg-plist.frontend	(revision 349425)
>+++ zabbix22-server/pkg-plist.frontend	(working copy)
>@@ -846,7 +846,8 @@
> @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/graphdraw
> @dirrm %%WWWDIR%%/include/classes
> @dirrm %%WWWDIR%%/include
> @dirrm %%WWWDIR%%/api/rpc
>@@ -921,6 +922,14 @@
> @dirrm %%WWWDIR%%/locale/lt/
> @dirrm %%WWWDIR%%/locale/ro/LC_MESSAGES/
> @dirrm %%WWWDIR%%/locale/ro/
>+@dirrm %%WWWDIR%%/locale/ro/LC_MESSAGES
>+@dirrm %%WWWDIR%%/locale/ro
>+@dirrm %%WWWDIR%%/locale/lt/LC_MESSAGES
>+@dirrm %%WWWDIR%%/locale/lt
>+@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
> @dirrm %%WWWDIR%%/conf
> @dirrm %%WWWDIR%%/js/jquery

Actions: View | Diff

Attachments on bug 188037: 141289