diff options
Diffstat (limited to 'converters')
-rw-r--r-- | converters/Makefile | 3 | ||||
-rw-r--r-- | converters/php71-iconv/Makefile | 11 | ||||
-rw-r--r-- | converters/php71-mbstring/Makefile | 11 | ||||
-rw-r--r-- | converters/php71-mbstring/files/patch-config.m4 | 51 | ||||
-rw-r--r-- | converters/php71-recode/Makefile | 11 |
5 files changed, 0 insertions, 87 deletions
diff --git a/converters/Makefile b/converters/Makefile index 2958a52259ff..bc12808b3cb6 100644 --- a/converters/Makefile +++ b/converters/Makefile @@ -139,9 +139,6 @@ SUBDIR += pear-Services_JSON SUBDIR += pecl-igbinary SUBDIR += php-bsdconv - SUBDIR += php71-iconv - SUBDIR += php71-mbstring - SUBDIR += php71-recode SUBDIR += php72-iconv SUBDIR += php72-mbstring SUBDIR += php72-recode diff --git a/converters/php71-iconv/Makefile b/converters/php71-iconv/Makefile deleted file mode 100644 index bc64697b0458..000000000000 --- a/converters/php71-iconv/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= converters - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -iconv - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/converters/php71-mbstring/Makefile b/converters/php71-mbstring/Makefile deleted file mode 100644 index 3bb35c966931..000000000000 --- a/converters/php71-mbstring/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= converters - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -mbstring - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" diff --git a/converters/php71-mbstring/files/patch-config.m4 b/converters/php71-mbstring/files/patch-config.m4 deleted file mode 100644 index 3e299951c999..000000000000 --- a/converters/php71-mbstring/files/patch-config.m4 +++ /dev/null @@ -1,51 +0,0 @@ ---- config.m4.orig 2018-11-10 15:21:47.103604000 +0100 -+++ config.m4 2018-11-10 15:24:23.615118000 +0100 -@@ -42,6 +42,30 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [ - PHP_ADD_INCLUDE([$ext_srcdir/$dir]) - PHP_ADD_INCLUDE([$ext_builddir/$dir]) - done -+ -+ dnl This is PECL build, check if bundled PCRE library is used -+ old_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=$INCLUDES -+ AC_EGREP_CPP(yes,[ -+#include <main/php_config.h> -+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) -+yes -+#endif -+ ],[ -+ PHP_PCRE_REGEX=yes -+ ],[ -+ AC_EGREP_CPP(yes,[ -+#include <main/php_config.h> -+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) -+yes -+#endif -+ ],[ -+ PHP_PCRE_REGEX=pecl -+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include) -+ ],[ -+ PHP_PCRE_REGEX=no -+ ]) -+ ]) - - if test "$ext_shared" = "no"; then - PHP_ADD_SOURCES(PHP_EXT_DIR(mbstring), $PHP_MBSTRING_BASE_SOURCES) -@@ -85,7 +109,6 @@ AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [ - int foo(int x, ...) { - va_list va; - va_start(va, x); -- va_arg(va, int); - va_arg(va, char *); - va_arg(va, double); - return 0; -@@ -367,6 +390,9 @@ PHP_ARG_WITH(onig, [for external oniguru - [ --with-onig[=DIR] MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix. - If DIR is not set, the bundled oniguruma will be used], no, no) - -+PHP_ARG_WITH(pcre-dir, pcre install prefix, -+[ --with-pcre-dir MBSTRING: pcre install prefix], no, no) -+ - if test "$PHP_MBSTRING" != "no"; then - AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support]) - diff --git a/converters/php71-recode/Makefile b/converters/php71-recode/Makefile deleted file mode 100644 index eba1fe298b84..000000000000 --- a/converters/php71-recode/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= converters - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -recode - -TEST_TARGET= test - -.include "${MASTERDIR}/Makefile" |