kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 1.2 release and add support for php 5.4.

Browse source
This commit is contained in:
Alex Dupre 2013-05-27 12:16:19 +00:00
parent 83dd768d5f
commit 1117ddbeea
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=319219
4 changed files with 15 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
converters/pecl-fribidi/Makefile
View file

@ -1,13 +1,8 @@
# New ports collection makefile for: pecl-fribidi
# Date created: 9 Jul 2004
# Whom: Alex Dupre <ale@FreeBSD.org>
#
# Created by: Alex Dupre <ale@FreeBSD.org>
# $FreeBSD$
#
PORTNAME= fribidi
PORTVERSION= 1.0
PORTREVISION= 1
PORTVERSION= 1.2
CATEGORIES= converters pear
MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-
@ -21,8 +16,6 @@ LIB_DEPENDS= fribidi.3:${PORTSDIR}/converters/fribidi
USE_PHP= yes
USE_PHPEXT= yes
DEFAULT_PHP_VER=53
IGNORE_WITH_PHP=5
CONFIGURE_ARGS= --with-fribidi=${LOCALBASE}

4
converters/pecl-fribidi/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (PECL/fribidi-1.0.tgz) = db63e9028d4b62dca59dd003334df87072735be926525979ee4d2c831eb76bac
SIZE (PECL/fribidi-1.0.tgz) = 5241
SHA256 (PECL/fribidi-1.2.tgz) = 6849836124a5f40d6106acf3ec44673a49b2fa4c31d4deae4f34bed10e83e910
SIZE (PECL/fribidi-1.2.tgz) = 7375

11
converters/pecl-fribidi/files/patch-config.m4 Normal file
View file

@ -0,0 +1,11 @@
--- config.m4.orig 2013-05-27 14:05:52.000000000 +0200
+++ config.m4 2013-05-27 14:06:16.000000000 +0200
@@ -15,7 +15,7 @@
if test "$PHP_FRIBIDI" = "yes"; then
FRIBIDI_PKG_CONFIG_CMD="$FRIBIDI_PKG_CONFIG fribidi"
else
- FRIBIDI_PKG_CONFIG_CMD="$FRIBIDI_PKG_CONFIG $PHP_FRIBIDI/lib/pkgconfig/fribidi.pc"
+ FRIBIDI_PKG_CONFIG_CMD="$FRIBIDI_PKG_CONFIG $PHP_FRIBIDI/libdata/pkgconfig/fribidi.pc"
fi
dnl check for fribidi version

80
converters/pecl-fribidi/files/patch-fribidi.c
View file

@ -1,80 +0,0 @@
--- fribidi.c.orig 2003-04-08 13:03:25.000000000 +0200
+++ fribidi.c 2009-09-21 09:51:54.000000000 +0200
@@ -32,15 +32,14 @@
#include <fribidi/fribidi.h>
/* The fribidi guys dont believe in BC */
-/*#ifndef FRIBIDI_CHARSET_UTF8
+#ifndef FRIBIDI_CHARSET_UTF8
#define FRIBIDI_CHARSET_UTF8 FRIBIDI_CHAR_SET_UTF8
#define FRIBIDI_CHARSET_ISO8859_6 FRIBIDI_CHAR_SET_ISO8859_6
#define FRIBIDI_CHARSET_ISO8859_8 FRIBIDI_CHAR_SET_ISO8859_8
#define FRIBIDI_CHARSET_CP1255 FRIBIDI_CHAR_SET_CP1255
#define FRIBIDI_CHARSET_CP1256 FRIBIDI_CHAR_SET_CP1256
-#define FRIBIDI_CHARSET_ISIRI_3342 FRIBIDI_CHAR_SET_ISIRI_3342
#define FRIBIDI_CHARSET_CAP_RTL FRIBIDI_CHAR_SET_CAP_RTL
-#endif*/
+#endif
function_entry fribidi_functions[] = {
PHP_FE(fribidi_log2vis, NULL)
@@ -76,7 +75,6 @@
REGISTER_LONG_CONSTANT("FRIBIDI_CHARSET_8859_8", FRIBIDI_CHARSET_ISO8859_8, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FRIBIDI_CHARSET_CP1255", FRIBIDI_CHARSET_CP1255, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FRIBIDI_CHARSET_CP1256", FRIBIDI_CHARSET_CP1256, CONST_CS | CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("FRIBIDI_CHARSET_ISIRI_3342", FRIBIDI_CHARSET_ISIRI_3342, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("FRIBIDI_CHARSET_CAP_RTL", FRIBIDI_CHARSET_CAP_RTL, CONST_CS | CONST_PERSISTENT);
/* Directions */
@@ -125,7 +123,6 @@
| FRIBIDI_CHARSET_8859_8 |
| FRIBIDI_CHARSET_CP1255 |
| FRIBIDI_CHARSET_CP1256 |
-| FRIBIDI_CHARSET_ISIRI_3342 |
| FRIBIDI_CHARSET_CAP_RTL |
| |
| Output: on success: The visual string. |
@@ -193,7 +190,6 @@
case FRIBIDI_CHARSET_ISO8859_8:
case FRIBIDI_CHARSET_CP1255:
case FRIBIDI_CHARSET_CP1256:
- case FRIBIDI_CHARSET_ISIRI_3342:
case FRIBIDI_CHARSET_CAP_RTL:
len = fribidi_charset_to_unicode(Z_LVAL_PP(charset), in_string, len, u_logical_str);
break;
@@ -212,11 +208,7 @@
out_string = (char *) emalloc(sizeof(char)*alloc_len);
-#if FRIBIDI_MAJOR_VERSION == 0 && FRIBIDI_MINOR_VERSION <= 10
fribidi_log2vis(u_logical_str, len, &base_dir, u_visual_str, position_L_to_V_list, position_V_to_L_list, embedding_level_list);
-#else
- fribidi_log2vis(NULL, u_logical_str, len, &base_dir, u_visual_str, position_L_to_V_list, position_V_to_L_list, embedding_level_list);
-#endif
/* convert back to original char set */
switch(Z_LVAL_PP(charset)) {
@@ -225,7 +217,6 @@
case FRIBIDI_CHARSET_ISO8859_8:
case FRIBIDI_CHARSET_CP1255:
case FRIBIDI_CHARSET_CP1256:
- case FRIBIDI_CHARSET_ISIRI_3342:
case FRIBIDI_CHARSET_CAP_RTL:
fribidi_unicode_to_charset(Z_LVAL_PP(charset), u_visual_str, len, out_string);
break;
@@ -270,7 +261,6 @@
case FRIBIDI_CHARSET_ISO8859_8:
case FRIBIDI_CHARSET_CP1255:
case FRIBIDI_CHARSET_CP1256:
- case FRIBIDI_CHARSET_ISIRI_3342:
case FRIBIDI_CHARSET_CAP_RTL:
array_init(return_value);
@@ -308,7 +298,6 @@
add_index_string(return_value, FRIBIDI_CHARSET_ISO8859_8, "FRIBIDI_CHARSET_8859_8", 1);
add_index_string(return_value, FRIBIDI_CHARSET_CP1255, "FRIBIDI_CHARSET_CP1255", 1);
add_index_string(return_value, FRIBIDI_CHARSET_CP1256, "FRIBIDI_CHARSET_CP1256", 1);
- add_index_string(return_value, FRIBIDI_CHARSET_ISIRI_3342, "FRIBIDI_CHARSET_ISIRI_3342", 1);
}
/* }}} */