pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

php-baikal: fix problem with NetBSD iconv.



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Wed Nov 11 15:10:37 2015 +0100
Changeset:	1970c4795ea866180b39b79075c3d1e47e925d0a

Modified Files:
	php-baikal/Makefile
	php-baikal/distinfo
Added Files:
	php-baikal/patches/patch-Core_Frameworks_Flake_Util_Tools.php

Log Message:
php-baikal: fix problem with NetBSD iconv.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1970c4795ea866180b39b79075c3d1e47e925d0a

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

diffstat:
 php-baikal/Makefile                                       |  1 +
 php-baikal/distinfo                                       |  1 +
 .../patches/patch-Core_Frameworks_Flake_Util_Tools.php    | 15 +++++++++++++++
 3 files changed, 17 insertions(+)

diffs:
diff --git a/php-baikal/Makefile b/php-baikal/Makefile
index fdd1028..ad42859 100644
--- a/php-baikal/Makefile
+++ b/php-baikal/Makefile
@@ -50,6 +50,7 @@ FILES_SUBST+=	WWWGRP=${APACHE_GROUP} WWWOWN=${APACHE_USER} \
 
 do-install:
 	${RM} -f ${WRKSRC}/*orig
+	${RM} -f ${WRKSRC}/*/*/*/*/*orig
 	cd ${WRKSRC} && pax -rw -pmp * \
 		${DESTDIR}${PREFIX}/${BAIKALDIR}
 
diff --git a/php-baikal/distinfo b/php-baikal/distinfo
index 3c215b8..a3e8516 100644
--- a/php-baikal/distinfo
+++ b/php-baikal/distinfo
@@ -4,3 +4,4 @@ SHA1 (baikal-regular-0.2.7.tgz) = 01eabcf0229ddffc0542f4e2a349754e778abbea
 RMD160 (baikal-regular-0.2.7.tgz) = 4b88ce29a2f75ce7ad2d2e48c730f39c9826592d
 SHA512 (baikal-regular-0.2.7.tgz) = 261e34eda6e85e38f9478e04f68fdea09ea12203a11b47aaf1a446e33333a9d8d1d9663f4a36da1cfd2adf776ba3f4be459b2639cc1a23e64e8584e47632bb8f
 Size (baikal-regular-0.2.7.tgz) = 2273699 bytes
+SHA1 (patch-Core_Frameworks_Flake_Util_Tools.php) = 2ac6a23cd1bfaab9e47a4faea28e26659d7cdaf5
diff --git a/php-baikal/patches/patch-Core_Frameworks_Flake_Util_Tools.php b/php-baikal/patches/patch-Core_Frameworks_Flake_Util_Tools.php
new file mode 100644
index 0000000..7839adc
--- /dev/null
+++ b/php-baikal/patches/patch-Core_Frameworks_Flake_Util_Tools.php
@@ -0,0 +1,15 @@
+$NetBSD$
+
+'//TRANSLIT' is only supported by GNU iconv.
+
+--- Core/Frameworks/Flake/Util/Tools.php.orig	2014-02-03 20:46:11.000000000 +0000
++++ Core/Frameworks/Flake/Util/Tools.php
+@@ -493,7 +493,7 @@ TEST;
+ 		$sString = strtr($sString, ' -+_\'', $space . $space . $space . $space . $space); // convert spaces
+ 		
+ 		if(function_exists("iconv")) {
+-			$sString = iconv('UTF-8', 'ASCII//TRANSLIT', $sString);
++			$sString = iconv('UTF-8', 'ASCII', $sString);
+ 		}
+ 		
+ 		$sString = strtolower($sString);


Home | Main Index | Thread Index | Old Index