diff options
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/php83-enchant/Makefile | 5 | ||||
| -rw-r--r-- | textproc/php83-enchant/files/patch-enchant.c | 11 | ||||
| -rw-r--r-- | textproc/php83-simplexml/files/patch-config.m4 | 41 | ||||
| -rw-r--r-- | textproc/php83-xsl/Makefile | 5 | ||||
| -rw-r--r-- | textproc/php83-xsl/files/patch-php__xsl.h | 11 |
5 files changed, 10 insertions, 63 deletions
diff --git a/textproc/php83-enchant/Makefile b/textproc/php83-enchant/Makefile index 1cd5744b4173..3788e2909afd 100644 --- a/textproc/php83-enchant/Makefile +++ b/textproc/php83-enchant/Makefile @@ -4,4 +4,9 @@ MASTERDIR= ${.CURDIR}/../../lang/php83 PKGNAMESUFFIX= -enchant +post-patch: + ${REINPLACE_CMD} -e \ + 's|#include "../spl/spl_exceptions.h"|#include "ext/spl/spl_exceptions.h"|g' \ + ${WRKSRC}/enchant.c + .include "${MASTERDIR}/Makefile" diff --git a/textproc/php83-enchant/files/patch-enchant.c b/textproc/php83-enchant/files/patch-enchant.c deleted file mode 100644 index b43d7930efde..000000000000 --- a/textproc/php83-enchant/files/patch-enchant.c +++ /dev/null @@ -1,11 +0,0 @@ ---- enchant.c.orig 2023-06-06 15:54:29 UTC -+++ enchant.c -@@ -23,7 +23,7 @@ - #include "php_ini.h" - #include "ext/standard/info.h" - #include "Zend/zend_exceptions.h" --#include "../spl/spl_exceptions.h" -+#include "ext/spl/spl_exceptions.h" - #include <enchant.h> - #include "php_enchant.h" - diff --git a/textproc/php83-simplexml/files/patch-config.m4 b/textproc/php83-simplexml/files/patch-config.m4 deleted file mode 100644 index 710e56e7b57c..000000000000 --- a/textproc/php83-simplexml/files/patch-config.m4 +++ /dev/null @@ -1,41 +0,0 @@ ---- config.m4.orig 2023-06-06 15:54:29 UTC -+++ config.m4 -@@ -4,7 +4,38 @@ PHP_ARG_ENABLE([simplexml], - [Disable SimpleXML support])], - [yes]) - -+PHP_ARG_ENABLE([pcre-dir], -+ [pcre install prefix], -+ [AS_HELP_STRING([--with-pcre-dir], -+ [SimpleXML: pcre install dir])], -+ [no], -+ [no]) -+ - if test "$PHP_SIMPLEXML" != "no"; then -+ -+ 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 "$PHP_LIBXML" = "no"; then - AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --with-libxml]) diff --git a/textproc/php83-xsl/Makefile b/textproc/php83-xsl/Makefile index f96e320bf41d..13cf30a12fa5 100644 --- a/textproc/php83-xsl/Makefile +++ b/textproc/php83-xsl/Makefile @@ -4,4 +4,9 @@ MASTERDIR= ${.CURDIR}/../../lang/php83 PKGNAMESUFFIX= -xsl +post-patch: + ${REINPLACE_CMD} -e \ + 's|#include "../dom/xml_common.h"|#include "ext/dom/xml_common.h"|g' \ + ${WRKSRC}/php_xsl.h + .include "${MASTERDIR}/Makefile" diff --git a/textproc/php83-xsl/files/patch-php__xsl.h b/textproc/php83-xsl/files/patch-php__xsl.h deleted file mode 100644 index 69f1140af49d..000000000000 --- a/textproc/php83-xsl/files/patch-php__xsl.h +++ /dev/null @@ -1,11 +0,0 @@ ---- php_xsl.h.orig 2020-10-16 22:10:29 UTC -+++ php_xsl.h -@@ -37,7 +37,7 @@ extern zend_module_entry xsl_module_entr - #include <libexslt/exsltconfig.h> - #endif - --#include "../dom/xml_common.h" -+#include "ext/dom/xml_common.h" - - #include <libxslt/extensions.h> - #include <libxml/xpathInternals.h> |