summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/Makefile10
-rw-r--r--devel/php73-gettext/Makefile9
-rw-r--r--devel/php73-intl/Makefile14
-rw-r--r--devel/php73-intl/files/patch-icu68213
-rw-r--r--devel/php73-intl/files/patch-icu7038
-rw-r--r--devel/php73-json/Makefile9
-rw-r--r--devel/php73-pcntl/Makefile9
-rw-r--r--devel/php73-readline/Makefile9
-rw-r--r--devel/php73-readline/files/patch-config.m430
-rw-r--r--devel/php73-readline/files/patch-readline_cli.c13
-rw-r--r--devel/php73-shmop/Makefile9
-rw-r--r--devel/php73-sysvmsg/Makefile9
-rw-r--r--devel/php73-sysvsem/Makefile9
-rw-r--r--devel/php73-sysvshm/Makefile9
-rw-r--r--devel/php73-tokenizer/Makefile9
15 files changed, 0 insertions, 399 deletions
diff --git a/devel/Makefile b/devel/Makefile
index 524aeaa39ddc..815450176479 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -4017,16 +4017,6 @@
SUBDIR += php-ice37
SUBDIR += php-libawl
SUBDIR += php-maxminddb
- SUBDIR += php73-gettext
- SUBDIR += php73-intl
- SUBDIR += php73-json
- SUBDIR += php73-pcntl
- SUBDIR += php73-readline
- SUBDIR += php73-shmop
- SUBDIR += php73-sysvmsg
- SUBDIR += php73-sysvsem
- SUBDIR += php73-sysvshm
- SUBDIR += php73-tokenizer
SUBDIR += php74-ffi
SUBDIR += php74-gettext
SUBDIR += php74-intl
diff --git a/devel/php73-gettext/Makefile b/devel/php73-gettext/Makefile
deleted file mode 100644
index b7806acc0bf3..000000000000
--- a/devel/php73-gettext/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= devel
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -gettext
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/php73-intl/Makefile b/devel/php73-intl/Makefile
deleted file mode 100644
index 07497cbab4af..000000000000
--- a/devel/php73-intl/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-CATEGORIES= devel
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -intl
-
-USES= compiler:c++11-lib
-USE_CXXSTD= gnu++11
-
-CPPFLAGS+= -DU_USING_ICU_NAMESPACE=1
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/php73-intl/files/patch-icu68 b/devel/php73-intl/files/patch-icu68
deleted file mode 100644
index 4462157b964f..000000000000
--- a/devel/php73-intl/files/patch-icu68
+++ /dev/null
@@ -1,213 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-ext/intl/breakiterator/codepointiterator_internal.cpp:60:53: error: use of undeclared identifier 'FALSE'
- this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
- ^
-ext/intl/breakiterator/codepointiterator_internal.cpp:60:60: error: use of undeclared identifier 'TRUE'
- this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
- ^
-ext/intl/breakiterator/codepointiterator_internal.cpp:80:10: error: use of undeclared identifier 'FALSE'
- return FALSE;
- ^
-ext/intl/breakiterator/codepointiterator_internal.cpp:87:10: error: use of undeclared identifier 'FALSE'
- return FALSE;
- ^
-ext/intl/breakiterator/codepointiterator_internal.cpp:90:9: error: use of undeclared identifier 'TRUE'
- return TRUE;
- ^
-ext/intl/breakiterator/codepointiterator_internal.cpp:111:42: error: use of undeclared identifier 'FALSE'
- return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
- ^
-ext/intl/breakiterator/codepointiterator_internal.cpp:111:49: error: use of undeclared identifier 'TRUE'
- return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
- ^
-ext/intl/breakiterator/codepointiterator_internal.cpp:130:47: error: use of undeclared identifier 'FALSE'
- this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
- ^
-ext/intl/breakiterator/codepointiterator_internal.cpp:130:54: error: use of undeclared identifier 'TRUE'
- this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
- ^
-ext/intl/breakiterator/codepointiterator_internal.cpp:282:48: error: use of undeclared identifier 'FALSE'
- this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
- ^
-ext/intl/breakiterator/codepointiterator_internal.cpp:282:55: error: use of undeclared identifier 'TRUE'
- this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
- ^
-ext/intl/collator/collator_sort.c:349:26: error: use of undeclared identifier 'TRUE'
- collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
- ^
-ext/intl/collator/collator_sort.c:543:26: error: use of undeclared identifier 'FALSE'
- collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
- ^
-ext/intl/dateformat/dateformat_attr.c:91:36: error: use of undeclared identifier 'FALSE'
- zend_bool is_pattern_localized =FALSE;
- ^
-ext/intl/dateformat/dateformat_attr.c:134:36: error: use of undeclared identifier 'FALSE'
- zend_bool is_pattern_localized =FALSE;
- ^
-ext/intl/dateformat/dateformat_attr.c:230:25: error: use of undeclared identifier 'FALSE'
- zend_bool isLenient = FALSE;
- ^
-ext/intl/normalizer/normalizer_normalize.c:95:10: error: use of undeclared identifier 'FALSE'
- return FALSE;
- ^
-ext/intl/normalizer/normalizer_normalize.c:181:16: error: use of undeclared identifier 'FALSE'
- UBool uret = FALSE;
- ^
-ext/intl/timezone/timezone_class.cpp:324:21: error: use of undeclared identifier 'FALSE'
- tz->getOffset(now, FALSE, rawOffset, dstOffset, uec);
- ^
-ext/intl/timezone/timezone_methods.cpp:94:57: error: use of undeclared identifier 'FALSE'
- tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL,
- ^
-
---- breakiterator/codepointiterator_internal.cpp.orig 2020-09-29 08:33:05 UTC
-+++ breakiterator/codepointiterator_internal.cpp
-@@ -58,7 +58,7 @@ CodePointBreakIterator& CodePointBreakIterator::operat
- return *this;
- }
-
-- this->fText = utext_clone(this->fText, that.fText, FALSE, TRUE, &uec);
-+ this->fText = utext_clone(this->fText, that.fText, false, true, &uec);
-
- //don't bother copying the character iterator, getText() is deprecated
- clearCurrentCharIter();
-@@ -78,17 +78,17 @@ CodePointBreakIterator::~CodePointBreakIterator()
- UBool CodePointBreakIterator::operator==(const BreakIterator& that) const
- {
- if (typeid(*this) != typeid(that)) {
-- return FALSE;
-+ return false;
- }
-
- const CodePointBreakIterator& that2 =
- static_cast<const CodePointBreakIterator&>(that);
-
- if (!utext_equals(this->fText, that2.fText)) {
-- return FALSE;
-+ return false;
- }
-
-- return TRUE;
-+ return true;
- }
-
- CodePointBreakIterator* CodePointBreakIterator::clone(void) const
-@@ -109,7 +109,7 @@ CharacterIterator& CodePointBreakIterator::getText(voi
-
- UText *CodePointBreakIterator::getUText(UText *fillIn, UErrorCode &status) const
- {
-- return utext_clone(fillIn, this->fText, FALSE, TRUE, &status);
-+ return utext_clone(fillIn, this->fText, false, true, &status);
- }
-
- void CodePointBreakIterator::setText(const UnicodeString &text)
-@@ -128,7 +128,7 @@ void CodePointBreakIterator::setText(UText *text, UErr
- return;
- }
-
-- this->fText = utext_clone(this->fText, text, FALSE, TRUE, &status);
-+ this->fText = utext_clone(this->fText, text, false, true, &status);
-
- clearCurrentCharIter();
- }
-@@ -280,7 +280,7 @@ CodePointBreakIterator &CodePointBreakIterator::refres
- }
-
- int64_t pos = utext_getNativeIndex(this->fText);
-- this->fText = utext_clone(this->fText, input, FALSE, TRUE, &status);
-+ this->fText = utext_clone(this->fText, input, false, true, &status);
- if (U_FAILURE(status)) {
- return *this;
- }
---- collator/collator_sort.c.orig 2020-09-29 08:33:05 UTC
-+++ collator/collator_sort.c
-@@ -346,7 +346,7 @@ static void collator_sort_internal( int renumber, INTE
- */
- PHP_FUNCTION( collator_sort )
- {
-- collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
-+ collator_sort_internal( true, INTERNAL_FUNCTION_PARAM_PASSTHRU );
- }
- /* }}} */
-
-@@ -540,7 +540,7 @@ PHP_FUNCTION( collator_sort_with_sort_keys )
- */
- PHP_FUNCTION( collator_asort )
- {
-- collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
-+ collator_sort_internal( false, INTERNAL_FUNCTION_PARAM_PASSTHRU );
- }
- /* }}} */
-
---- dateformat/dateformat_attr.c.orig 2020-09-29 08:33:05 UTC
-+++ dateformat/dateformat_attr.c
-@@ -88,7 +88,7 @@ PHP_FUNCTION( datefmt_get_pattern )
- UChar value_buf[64];
- uint32_t length = USIZE( value_buf );
- UChar* value = value_buf;
-- zend_bool is_pattern_localized =FALSE;
-+ zend_bool is_pattern_localized = false;
-
- DATE_FORMAT_METHOD_INIT_VARS;
-
-@@ -131,7 +131,7 @@ PHP_FUNCTION( datefmt_set_pattern )
- size_t value_len = 0;
- int32_t slength = 0;
- UChar* svalue = NULL;
-- zend_bool is_pattern_localized =FALSE;
-+ zend_bool is_pattern_localized = false;
-
-
- DATE_FORMAT_METHOD_INIT_VARS;
-@@ -227,7 +227,7 @@ PHP_FUNCTION( datefmt_is_lenient )
- */
- PHP_FUNCTION( datefmt_set_lenient )
- {
-- zend_bool isLenient = FALSE;
-+ zend_bool isLenient = false;
-
- DATE_FORMAT_METHOD_INIT_VARS;
-
---- normalizer/normalizer_normalize.c.orig 2020-09-29 08:33:05 UTC
-+++ normalizer/normalizer_normalize.c
-@@ -92,7 +92,7 @@ static UBool intl_is_normalized(zend_long form, const
- const UNormalizer2 *norm = intl_get_normalizer(form, err);
-
- if(U_FAILURE(*err)) {
-- return FALSE;
-+ return false;
- }
-
- return unorm2_isNormalized(norm, uinput, uinput_len, err);
-@@ -263,7 +263,7 @@ PHP_FUNCTION( normalizer_is_normalized )
- int uinput_len = 0;
- UErrorCode status = U_ZERO_ERROR;
-
-- UBool uret = FALSE;
-+ UBool uret = false;
-
- intl_error_reset( NULL );
-
---- timezone/timezone_class.cpp.orig 2020-09-29 08:33:05 UTC
-+++ timezone/timezone_class.cpp
-@@ -322,7 +322,7 @@ static HashTable *TimeZone_get_debug_info(zval *object
-
- int32_t rawOffset, dstOffset;
- UDate now = Calendar::getNow();
-- tz->getOffset(now, FALSE, rawOffset, dstOffset, uec);
-+ tz->getOffset(now, false, rawOffset, dstOffset, uec);
- if (U_FAILURE(uec)) {
- return debug_info;
- }
---- timezone/timezone_methods.cpp.orig 2020-09-29 08:33:05 UTC
-+++ timezone/timezone_methods.cpp
-@@ -95,7 +95,7 @@ U_CFUNC PHP_FUNCTION(intltz_from_date_time_zone)
- RETURN_NULL();
- }
-
-- tz = timezone_convert_datetimezone(tzobj->type, tzobj, FALSE, NULL,
-+ tz = timezone_convert_datetimezone(tzobj->type, tzobj, false, NULL,
- "intltz_from_date_time_zone");
- if (tz == NULL) {
- RETURN_NULL();
diff --git a/devel/php73-intl/files/patch-icu70 b/devel/php73-intl/files/patch-icu70
deleted file mode 100644
index a46cefcf5555..000000000000
--- a/devel/php73-intl/files/patch-icu70
+++ /dev/null
@@ -1,38 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/633438f8da99
-
-In file included from breakiterator/breakiterator_class.cpp:23:
-breakiterator/codepointiterator_internal.h:42:17: error: virtual function 'operator==' has a different return type ('UBool' (aka 'signed char')) than the function it overrides (which has return type 'bool')
- virtual UBool operator==(const BreakIterator& that) const;
- ~~~~~ ^
-/usr/local/include/unicode/brkiter.h:127:18: note: overridden virtual function is here
- virtual bool operator==(const BreakIterator&) const = 0;
- ~~~~ ^
-
---- breakiterator/codepointiterator_internal.cpp.orig 2021-09-21 10:24:05 UTC
-+++ breakiterator/codepointiterator_internal.cpp
-@@ -75,7 +75,11 @@ CodePointBreakIterator::~CodePointBreakIterator()
- clearCurrentCharIter();
- }
-
-+#if U_ICU_VERSION_MAJOR_NUM < 70
- UBool CodePointBreakIterator::operator==(const BreakIterator& that) const
-+#else
-+bool CodePointBreakIterator::operator==(const BreakIterator& that) const
-+#endif
- {
- if (typeid(*this) != typeid(that)) {
- return FALSE;
---- breakiterator/codepointiterator_internal.h.orig 2021-09-21 10:24:05 UTC
-+++ breakiterator/codepointiterator_internal.h
-@@ -39,7 +39,11 @@ namespace PHP {
-
- virtual ~CodePointBreakIterator();
-
-+#if U_ICU_VERSION_MAJOR_NUM < 70
- virtual UBool operator==(const BreakIterator& that) const;
-+#else
-+ virtual bool operator==(const BreakIterator& that) const;
-+#endif
-
- virtual CodePointBreakIterator* clone(void) const;
-
diff --git a/devel/php73-json/Makefile b/devel/php73-json/Makefile
deleted file mode 100644
index 73e75b5917da..000000000000
--- a/devel/php73-json/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= devel
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -json
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/php73-pcntl/Makefile b/devel/php73-pcntl/Makefile
deleted file mode 100644
index 4eb3579bae01..000000000000
--- a/devel/php73-pcntl/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= devel
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -pcntl
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/php73-readline/Makefile b/devel/php73-readline/Makefile
deleted file mode 100644
index 372ce69ce3a4..000000000000
--- a/devel/php73-readline/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= devel
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -readline
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/php73-readline/files/patch-config.m4 b/devel/php73-readline/files/patch-config.m4
deleted file mode 100644
index bfd025a54387..000000000000
--- a/devel/php73-readline/files/patch-config.m4
+++ /dev/null
@@ -1,30 +0,0 @@
---- config.m4.orig 2019-02-05 13:10:04 UTC
-+++ config.m4
-@@ -3,13 +3,8 @@ dnl config.m4 for extension readline
- PHP_ARG_WITH(libedit,for libedit readline replacement,
- [ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)])
-
--if test "$PHP_LIBEDIT" = "no"; then
- PHP_ARG_WITH(readline,for readline support,
- [ --with-readline[=DIR] Include readline support (CLI/CGI only)])
--else
-- dnl "register" the --with-readline option to preven invalid "unknown configure option" warning
-- php_with_readline=no
--fi
-
- if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
- for i in $PHP_READLINE /usr/local /usr; do
-@@ -72,6 +67,13 @@ if test "$PHP_READLINE" && test "$PHP_RE
- -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
- ])
-
-+ PHP_CHECK_LIBRARY(readline, rl_completion_matches,
-+ [
-+ AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1, [ ])
-+ ],[],[
-+ -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
-+ ])
-+
- AC_DEFINE(HAVE_LIBREADLINE, 1, [ ])
-
- elif test "$PHP_LIBEDIT" != "no"; then
diff --git a/devel/php73-readline/files/patch-readline_cli.c b/devel/php73-readline/files/patch-readline_cli.c
deleted file mode 100644
index 02f55974f9b0..000000000000
--- a/devel/php73-readline/files/patch-readline_cli.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- readline_cli.c.orig 2012-03-02 16:40:26.000000000 +0100
-+++ readline_cli.c 2012-03-02 16:40:43.000000000 +0100
-@@ -19,6 +19,10 @@
-
- /* $Id: readline_cli.c 321634 2012-01-01 13:15:04Z felipe $ */
-
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "php.h"
-
- #ifndef HAVE_RL_COMPLETION_MATCHES
diff --git a/devel/php73-shmop/Makefile b/devel/php73-shmop/Makefile
deleted file mode 100644
index 0af3ff88494d..000000000000
--- a/devel/php73-shmop/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= devel
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -shmop
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/php73-sysvmsg/Makefile b/devel/php73-sysvmsg/Makefile
deleted file mode 100644
index 415a21cdefde..000000000000
--- a/devel/php73-sysvmsg/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= devel
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -sysvmsg
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/php73-sysvsem/Makefile b/devel/php73-sysvsem/Makefile
deleted file mode 100644
index 1b5a51933b04..000000000000
--- a/devel/php73-sysvsem/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= devel
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -sysvsem
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/php73-sysvshm/Makefile b/devel/php73-sysvshm/Makefile
deleted file mode 100644
index 733068477157..000000000000
--- a/devel/php73-sysvshm/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= devel
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -sysvshm
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/php73-tokenizer/Makefile b/devel/php73-tokenizer/Makefile
deleted file mode 100644
index 98f928683915..000000000000
--- a/devel/php73-tokenizer/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES= devel
-
-MASTERDIR= ${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX= -tokenizer
-
-TEST_TARGET= test
-
-.include "${MASTERDIR}/Makefile"