Attachment 174732 Details for Bug 212660 – v1

[patch] v1

icinga2.diff (text/plain), 2.44 KB, created by Mathieu Arnold on 2016-09-13 15:56:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Arnold

Created: 2016-09-13 15:56:28 UTC

Size: 2.44 KB

patch

obsolete

>diff --git Mk/Uses/perl5.mk Mk/Uses/perl5.mk
>index 8d3b0b7..98eee07 100644
>--- Mk/Uses/perl5.mk
>+++ Mk/Uses/perl5.mk
>@@ -214,7 +214,7 @@ BUILD_DEPENDS+=	p5-Module-Build-Tiny>=0.039:devel/p5-Module-Build-Tiny
> CONFIGURE_ARGS+=--create_packlist 1
> .endif
> .elif ${_USE_PERL5:Mconfigure}
>-CONFIGURE_ARGS+=INSTALLDIRS="site"
>+CONFIGURE_ARGS+=INSTALLDIRS="site" NOECHO=""
> .endif # modbuild
> 
> .if ${_USE_PERL5:Mconfigure}
>diff --git net-mgmt/icinga2/Makefile net-mgmt/icinga2/Makefile
>index 670b298..b36a4ee 100644
>--- net-mgmt/icinga2/Makefile
>+++ net-mgmt/icinga2/Makefile
>@@ -3,7 +3,7 @@
> PORTNAME=	icinga2
> DISTVERSIONPREFIX=	v
> DISTVERSION=	2.5.3
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	net-mgmt
> 
> MAINTAINER=	lme@FreeBSD.org
>@@ -110,5 +110,9 @@ pre-install:
> post-install:
> 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/newsyslog/
> 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-newsyslog ${STAGEDIR}${EXAMPLESDIR}/newsyslog/${PORTNAME}
>+	${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles
>+	(cd ${WRKSRC}/tools/syntax/vim && ${COPYTREE_SHARE} . \
>+		${STAGEDIR}${PREFIX}/share/vim/vimfiles)
>+
> 
> .include <bsd.port.mk>
>diff --git net-mgmt/icinga2/pkg-plist net-mgmt/icinga2/pkg-plist
>index ae301a9..d4f378b 100644
>--- net-mgmt/icinga2/pkg-plist
>+++ net-mgmt/icinga2/pkg-plist
>@@ -126,6 +126,8 @@ sbin/icinga2
> %%DATADIR%%/include/plugins-contrib.d/vmware.conf
> %%DATADIR%%/include/plugins-contrib.d/web.conf
> %%DATADIR%%/include/windows-plugins
>+share/vim/vimfiles/ftdetect/icinga2.vim
>+share/vim/vimfiles/syntax/icinga2.vim
> @dir %%ETCDIR%%/pki
> @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/cache/icinga2
> @dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api/log
>diff --git net-mgmt/icingaweb2/Makefile net-mgmt/icingaweb2/Makefile
>index ece6de8..bfdf793 100644
>--- net-mgmt/icingaweb2/Makefile
>+++ net-mgmt/icingaweb2/Makefile
>@@ -3,6 +3,7 @@
> PORTNAME=	icingaweb2
> DISTVERSIONPREFIX=	v
> DISTVERSION=	2.3.4
>+PORTREVISION=	1
> CATEGORIES=	net-mgmt www
> 
> MAINTAINER=	lme@FreeBSD.org
>@@ -29,13 +30,17 @@ SUB_LIST=	WWWDIR=${WWWDIR} \
> PLIST_SUB=	WWWOWN=${WWWOWN} \
> 		WWWGRP=${WWWGRP}
> 
>-OPTIONS_DEFINE=		NLS LDAP MYSQL PGSQL
>+OPTIONS_DEFINE=		NLS LDAP MYSQL PGSQL PDF
> OPTIONS_DEFAULT=	LDAP MYSQL PGSQL
> 
>+PDF_DESC=	Export graphs as PDF
>+
> NLS_USES=	gettext
>+NLS_USE=	php=intl
> PGSQL_USE=	PHP=pdo_pgsql
> MYSQL_USE=	PHP=pdo_mysql
> LDAP_USE=	PHP=ldap
>+PDF_RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:graphics/pecl-imagick
> 
> do-install:
> 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/bash_completion.d/

Actions: View | Diff

Attachments on bug 212660: 174732 | 174733