CVS commit: [pkgsrc-2017Q2] pkgsrc/sysutils

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon Jul 10 19:52:29 UTC 2017

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

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.2.1 pkgsrc/sysutils/zabbix/distinfo
cvs rdiff -u -r1.2 -r1.2.2.1 pkgsrc/sysutils/zabbix-frontend/Makefile
cvs rdiff -u -r0 -r1.1.2.2 \
    pkgsrc/sysutils/zabbix/patches/patch-frontends_php_locale_add__new__language.sh \
    pkgsrc/sysutils/zabbix/patches/patch-frontends_php_locale_make__mo.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/zabbix/distinfo
diff -u pkgsrc/sysutils/zabbix/distinfo:1.1 pkgsrc/sysutils/zabbix/distinfo:1.1.2.1
--- pkgsrc/sysutils/zabbix/distinfo:1.1 Sun May 21 17:30:03 2017
+++ pkgsrc/sysutils/zabbix/distinfo     Mon Jul 10 19:52:29 2017
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.1 2017/05/21 17:30:03 adam Exp $
+$NetBSD: distinfo,v 1.1.2.1 2017/07/10 19:52:29 bsiegert Exp $
 
 SHA1 (zabbix-3.2.6.tar.gz) = f85c9e3ea38926ea026cdb403e9f443c4812d697
 RMD160 (zabbix-3.2.6.tar.gz) = b62c7c793f674535f923df73bbe3f7b9679c22cd
 SHA512 (zabbix-3.2.6.tar.gz) = 48e70a7e33ec8c29967f099d27f240b2e8b02554b43a47387d02b5450367efcb0d2f1c60557194f6b1d4a9755d2c9c69a478627e57624521152b1c1ea0264844
 Size (zabbix-3.2.6.tar.gz) = 16008047 bytes
+SHA1 (patch-frontends_php_locale_add__new__language.sh) = c187e2b4ae8dd9e409f5c32469cb7b0f02647d8b
+SHA1 (patch-frontends_php_locale_make__mo.sh) = 2f0aaa63e80fcd5d4fa8c507fd764f80070b7864
 SHA1 (patch-src_zabbix__agent_Makefile.in) = a591c3e831eb34dc10cb5b1078891b5cad53b756
 SHA1 (patch-src_zabbix__proxy_Makefile.in) = 535eccd707a8947903fbec41028b127a3bbbeffc
 SHA1 (patch-src_zabbix__server_Makefile.in) = d297b8c4a940867d0a3eaff7bcb3b178a87dfd49

Index: pkgsrc/sysutils/zabbix-frontend/Makefile
diff -u pkgsrc/sysutils/zabbix-frontend/Makefile:1.2 pkgsrc/sysutils/zabbix-frontend/Makefile:1.2.2.1
--- pkgsrc/sysutils/zabbix-frontend/Makefile:1.2        Tue Jun  6 09:12:59 2017
+++ pkgsrc/sysutils/zabbix-frontend/Makefile    Mon Jul 10 19:52:29 2017
@@ -1,14 +1,19 @@
-# $NetBSD: Makefile,v 1.2 2017/06/06 09:12:59 adam Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2017/07/10 19:52:29 bsiegert Exp $
 
 .include "../../sysutils/zabbix/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/-/-frontend-/}
+PKGREVISION=   1
 COMMENT=       Zabbix PHP frontend
 
 USE_TOOLS+=            pax
-NO_CONFIGURE=          yes
 NO_BUILD=              yes
 
+do-configure:
+       ${DO_NADA}
+
+REPLACE_SH+=   ${WRKSRC}/frontends/php/locale/*.sh
+
 .include "../../mk/bsd.prefs.mk"
 
 BUILD_DEFS+=           APACHE_GROUP APACHE_USER
@@ -29,6 +34,7 @@ DEPENDS+=     ${PHP_PKG_PREFIX}-sysvsem>=5.4
 INSTALLATION_DIRS+=    share/zabbix/frontend
 
 do-install:
+       rm -f ${WRKSRC}/frontends/php/locale/*.orig
        cd ${WRKSRC}/frontends; ${PAX} -rw php ${DESTDIR}${PREFIX}/share/zabbix/
 
 .include "../../lang/php/phpversion.mk"

Added files:

Index: pkgsrc/sysutils/zabbix/patches/patch-frontends_php_locale_add__new__language.sh
diff -u /dev/null pkgsrc/sysutils/zabbix/patches/patch-frontends_php_locale_add__new__language.sh:1.1.2.2
--- /dev/null   Mon Jul 10 19:52:29 2017
+++ pkgsrc/sysutils/zabbix/patches/patch-frontends_php_locale_add__new__language.sh     Mon Jul 10 19:52:29 2017
@@ -0,0 +1,13 @@
+$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
+ }
Index: pkgsrc/sysutils/zabbix/patches/patch-frontends_php_locale_make__mo.sh
diff -u /dev/null pkgsrc/sysutils/zabbix/patches/patch-frontends_php_locale_make__mo.sh:1.1.2.2
--- /dev/null   Mon Jul 10 19:52:29 2017
+++ pkgsrc/sysutils/zabbix/patches/patch-frontends_php_locale_make__mo.sh       Mon Jul 10 19:52:29 2017
@@ -0,0 +1,12 @@
+$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