Mon Jul 10 19:52:29 2017 UTC ()
Pullup ticket #5502 - requested by joerg
sysutils/zabbix-frontend: build fix

Revisions pulled up:
- sysutils/zabbix-frontend/Makefile                             1.3
- sysutils/zabbix/distinfo                                      1.2
- sysutils/zabbix/patches/patch-frontends_php_locale_add__new__language.sh 1.1
- sysutils/zabbix/patches/patch-frontends_php_locale_make__mo.sh 1.1

---
   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Mon Jul  3 13:04:01 UTC 2017

   Modified Files:
   	pkgsrc/sysutils/zabbix: distinfo
   	pkgsrc/sysutils/zabbix-frontend: Makefile
   Added Files:
   	pkgsrc/sysutils/zabbix/patches:
   	    patch-frontends_php_locale_add__new__language.sh
   	    patch-frontends_php_locale_make__mo.sh

   Log Message:
   Fix bash scripts to use a normal shell.


(bsiegert)
diff -r1.1 -r1.1.2.1 pkgsrc/sysutils/zabbix/distinfo
diff -r1.2 -r1.2.2.1 pkgsrc/sysutils/zabbix-frontend/Makefile
diff -r0 -r1.1.2.2 pkgsrc/sysutils/zabbix/patches/patch-frontends_php_locale_add__new__language.sh
diff -r0 -r1.1.2.2 pkgsrc/sysutils/zabbix/patches/patch-frontends_php_locale_make__mo.sh
cvs diff -r1.1 -r1.1.2.1 pkgsrc/sysutils/zabbix/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/zabbix/distinfo 2017/05/21 17:30:03 1.1
+++ pkgsrc/sysutils/zabbix/distinfo 2017/07/10 19:52:29 1.1.2.1
@@ -1,9 +1,11 @@ @@ -1,9 +1,11 @@
1$NetBSD: distinfo,v 1.1 2017/05/21 17:30:03 adam Exp $ 1$NetBSD: distinfo,v 1.1.2.1 2017/07/10 19:52:29 bsiegert Exp $
2 2
3SHA1 (zabbix-3.2.6.tar.gz) = f85c9e3ea38926ea026cdb403e9f443c4812d697 3SHA1 (zabbix-3.2.6.tar.gz) = f85c9e3ea38926ea026cdb403e9f443c4812d697
4RMD160 (zabbix-3.2.6.tar.gz) = b62c7c793f674535f923df73bbe3f7b9679c22cd 4RMD160 (zabbix-3.2.6.tar.gz) = b62c7c793f674535f923df73bbe3f7b9679c22cd
5SHA512 (zabbix-3.2.6.tar.gz) = 48e70a7e33ec8c29967f099d27f240b2e8b02554b43a47387d02b5450367efcb0d2f1c60557194f6b1d4a9755d2c9c69a478627e57624521152b1c1ea0264844 5SHA512 (zabbix-3.2.6.tar.gz) = 48e70a7e33ec8c29967f099d27f240b2e8b02554b43a47387d02b5450367efcb0d2f1c60557194f6b1d4a9755d2c9c69a478627e57624521152b1c1ea0264844
6Size (zabbix-3.2.6.tar.gz) = 16008047 bytes 6Size (zabbix-3.2.6.tar.gz) = 16008047 bytes
 7SHA1 (patch-frontends_php_locale_add__new__language.sh) = c187e2b4ae8dd9e409f5c32469cb7b0f02647d8b
 8SHA1 (patch-frontends_php_locale_make__mo.sh) = 2f0aaa63e80fcd5d4fa8c507fd764f80070b7864
7SHA1 (patch-src_zabbix__agent_Makefile.in) = a591c3e831eb34dc10cb5b1078891b5cad53b756 9SHA1 (patch-src_zabbix__agent_Makefile.in) = a591c3e831eb34dc10cb5b1078891b5cad53b756
8SHA1 (patch-src_zabbix__proxy_Makefile.in) = 535eccd707a8947903fbec41028b127a3bbbeffc 10SHA1 (patch-src_zabbix__proxy_Makefile.in) = 535eccd707a8947903fbec41028b127a3bbbeffc
9SHA1 (patch-src_zabbix__server_Makefile.in) = d297b8c4a940867d0a3eaff7bcb3b178a87dfd49 11SHA1 (patch-src_zabbix__server_Makefile.in) = d297b8c4a940867d0a3eaff7bcb3b178a87dfd49
cvs diff -r1.2 -r1.2.2.1 pkgsrc/sysutils/zabbix-frontend/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/zabbix-frontend/Makefile 2017/06/06 09:12:59 1.2
+++ pkgsrc/sysutils/zabbix-frontend/Makefile 2017/07/10 19:52:29 1.2.2.1
@@ -1,35 +1,41 @@ @@ -1,35 +1,41 @@
1# $NetBSD: Makefile,v 1.2 2017/06/06 09:12:59 adam Exp $ 1# $NetBSD: Makefile,v 1.2.2.1 2017/07/10 19:52:29 bsiegert Exp $
2 2
3.include "../../sysutils/zabbix/Makefile.common" 3.include "../../sysutils/zabbix/Makefile.common"
4 4
5PKGNAME= ${DISTNAME:S/-/-frontend-/} 5PKGNAME= ${DISTNAME:S/-/-frontend-/}
 6PKGREVISION= 1
6COMMENT= Zabbix PHP frontend 7COMMENT= Zabbix PHP frontend
7 8
8USE_TOOLS+= pax 9USE_TOOLS+= pax
9NO_CONFIGURE= yes 
10NO_BUILD= yes 10NO_BUILD= yes
11 11
 12do-configure:
 13 ${DO_NADA}
 14
 15REPLACE_SH+= ${WRKSRC}/frontends/php/locale/*.sh
 16
12.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
13 18
14BUILD_DEFS+= APACHE_GROUP APACHE_USER 19BUILD_DEFS+= APACHE_GROUP APACHE_USER
15PKG_GROUPS_VARS+= ${APACHE_GROUP} 20PKG_GROUPS_VARS+= ${APACHE_GROUP}
16PKG_USERS_VARS= ${APACHE_USER} 21PKG_USERS_VARS= ${APACHE_USER}
17 22
18DEPENDS+= ${PHP_PKG_PREFIX}-bcmath>=5.4.0:../../math/php-bcmath 23DEPENDS+= ${PHP_PKG_PREFIX}-bcmath>=5.4.0:../../math/php-bcmath
19DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.4.0:../../graphics/php-gd 24DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.4.0:../../graphics/php-gd
20DEPENDS+= ${PHP_PKG_PREFIX}-gettext>=5.4.0:../../devel/php-gettext 25DEPENDS+= ${PHP_PKG_PREFIX}-gettext>=5.4.0:../../devel/php-gettext
21DEPENDS+= ${PHP_PKG_PREFIX}-json>=5.4.0:../../textproc/php-json 26DEPENDS+= ${PHP_PKG_PREFIX}-json>=5.4.0:../../textproc/php-json
22DEPENDS+= ${PHP_PKG_PREFIX}-ldap>=5.4.0:../../databases/php-ldap 27DEPENDS+= ${PHP_PKG_PREFIX}-ldap>=5.4.0:../../databases/php-ldap
23DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.4.0:../../converters/php-mbstring 28DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.4.0:../../converters/php-mbstring
24DEPENDS+= ${PHP_PKG_PREFIX}-mysqli>=5.4.0:../../databases/php-mysqli 29DEPENDS+= ${PHP_PKG_PREFIX}-mysqli>=5.4.0:../../databases/php-mysqli
25DEPENDS+= ${PHP_PKG_PREFIX}-pgsql>=5.4.0:../../databases/php-pgsql 30DEPENDS+= ${PHP_PKG_PREFIX}-pgsql>=5.4.0:../../databases/php-pgsql
26DEPENDS+= ${PHP_PKG_PREFIX}-sockets>=5.4.0:../../net/php-sockets 31DEPENDS+= ${PHP_PKG_PREFIX}-sockets>=5.4.0:../../net/php-sockets
27DEPENDS+= ${PHP_PKG_PREFIX}-sysvsem>=5.4.0:../../devel/php-sysvsem 32DEPENDS+= ${PHP_PKG_PREFIX}-sysvsem>=5.4.0:../../devel/php-sysvsem
28 33
29INSTALLATION_DIRS+= share/zabbix/frontend 34INSTALLATION_DIRS+= share/zabbix/frontend
30 35
31do-install: 36do-install:
 37 rm -f ${WRKSRC}/frontends/php/locale/*.orig
32 cd ${WRKSRC}/frontends; ${PAX} -rw php ${DESTDIR}${PREFIX}/share/zabbix/ 38 cd ${WRKSRC}/frontends; ${PAX} -rw php ${DESTDIR}${PREFIX}/share/zabbix/
33 39
34.include "../../lang/php/phpversion.mk" 40.include "../../lang/php/phpversion.mk"
35.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/sysutils/zabbix/patches/patch-frontends_php_locale_add__new__language.sh
$NetBSD: patch-frontends_php_locale_add__new__language.sh,v 1.1.2.2 2017/07/10 19:52:29 bsiegert Exp $

--- frontends/php/locale/add_new_language.sh.orig	2017-05-05 14:50:32.000000000 +0000
+++ frontends/php/locale/add_new_language.sh
@@ -2,7 +2,7 @@
 
 messagetemplate=frontend.pot
 
-[[ $1 ]] || {
+[ -n "$1" ] || {
 	echo "Specify language code"
 	exit 1
 }
File Added: pkgsrc/sysutils/zabbix/patches/patch-frontends_php_locale_make__mo.sh
$NetBSD: patch-frontends_php_locale_make__mo.sh,v 1.1.2.2 2017/07/10 19:52:29 bsiegert Exp $

--- frontends/php/locale/make_mo.sh.orig	2017-05-05 14:50:27.000000000 +0000
+++ frontends/php/locale/make_mo.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-while read pofile; do
+find $(dirname $0) -type f ! -wholename '*/.svn*' -name '*.po' | while read pofile; do
         msgfmt --use-fuzzy -c -o ${pofile%po}mo $pofile
-done < <(find $(dirname $0) -type f ! -wholename '*/.svn*' -name '*.po')
+done