From 96025cafd359016691231066f5edd39a633ca915 Mon Sep 17 00:00:00 2001 From: Torsten Zuehlsdorff Date: Thu, 16 Nov 2017 17:12:24 +0000 Subject: [PATCH] PHP 7.2: Remove bad repocopies. Reported by: adamw --- devel/php72-intl/php71-intl/Makefile | 9 ---- devel/php72-json/php71-json/Makefile | 9 ---- devel/php72-pcntl/php71-pcntl/Makefile | 9 ---- devel/php72-readline/php71-readline/Makefile | 9 ---- .../php71-readline/files/patch-config.m4 | 38 ----------------- .../php71-readline/files/patch-readline_cli.c | 13 ------ devel/php72-shmop/php71-shmop/Makefile | 9 ---- devel/php72-sysvmsg/php71-sysvmsg/Makefile | 9 ---- devel/php72-sysvsem/php71-sysvsem/Makefile | 9 ---- devel/php72-sysvshm/php71-sysvshm/Makefile | 9 ---- .../php72-tokenizer/php71-tokenizer/Makefile | 9 ---- ftp/php72-curl/php71-curl/Makefile | 9 ---- ftp/php72-ftp/php71-ftp/Makefile | 13 ------ graphics/php72-exif/php71-exif/Makefile | 9 ---- graphics/php72-gd/php71-gd/Makefile | 9 ---- mail/php72-imap/php71-imap/Makefile | 9 ---- .../php71-imap/files/patch-config.m4 | 42 ------------------- math/php72-bcmath/php71-bcmath/Makefile | 9 ---- math/php72-gmp/php71-gmp/Makefile | 9 ---- misc/php72-calendar/php71-calendar/Makefile | 9 ---- net-mgmt/php72-snmp/php71-snmp/Makefile | 9 ---- net/php72-ldap/php71-ldap/Makefile | 9 ---- net/php72-soap/php71-soap/Makefile | 9 ---- net/php72-sockets/php71-sockets/Makefile | 9 ---- net/php72-xmlrpc/php71-xmlrpc/Makefile | 9 ---- .../php71-xmlrpc/files/patch-config.m4 | 23 ---------- security/php72-filter/php71-filter/Makefile | 9 ---- .../php71-filter/files/patch-config.m4 | 10 ----- security/php72-hash/php71-hash/Makefile | 9 ---- security/php72-openssl/php71-openssl/Makefile | 9 ---- .../php72-fileinfo/php71-fileinfo/Makefile | 9 ---- .../php71-fileinfo/files/patch-config.m4 | 21 ---------- sysutils/php72-posix/php71-posix/Makefile | 9 ---- .../php71-posix/files/patch-posix.c | 38 ----------------- textproc/php72-ctype/php71-ctype/Makefile | 9 ---- textproc/php72-dom/php71-dom/Makefile | 9 ---- textproc/php72-enchant/php71-enchant/Makefile | 9 ---- 37 files changed, 459 deletions(-) delete mode 100644 devel/php72-intl/php71-intl/Makefile delete mode 100644 devel/php72-json/php71-json/Makefile delete mode 100644 devel/php72-pcntl/php71-pcntl/Makefile delete mode 100644 devel/php72-readline/php71-readline/Makefile delete mode 100644 devel/php72-readline/php71-readline/files/patch-config.m4 delete mode 100644 devel/php72-readline/php71-readline/files/patch-readline_cli.c delete mode 100644 devel/php72-shmop/php71-shmop/Makefile delete mode 100644 devel/php72-sysvmsg/php71-sysvmsg/Makefile delete mode 100644 devel/php72-sysvsem/php71-sysvsem/Makefile delete mode 100644 devel/php72-sysvshm/php71-sysvshm/Makefile delete mode 100644 devel/php72-tokenizer/php71-tokenizer/Makefile delete mode 100644 ftp/php72-curl/php71-curl/Makefile delete mode 100644 ftp/php72-ftp/php71-ftp/Makefile delete mode 100644 graphics/php72-exif/php71-exif/Makefile delete mode 100644 graphics/php72-gd/php71-gd/Makefile delete mode 100644 mail/php72-imap/php71-imap/Makefile delete mode 100644 mail/php72-imap/php71-imap/files/patch-config.m4 delete mode 100644 math/php72-bcmath/php71-bcmath/Makefile delete mode 100644 math/php72-gmp/php71-gmp/Makefile delete mode 100644 misc/php72-calendar/php71-calendar/Makefile delete mode 100644 net-mgmt/php72-snmp/php71-snmp/Makefile delete mode 100644 net/php72-ldap/php71-ldap/Makefile delete mode 100644 net/php72-soap/php71-soap/Makefile delete mode 100644 net/php72-sockets/php71-sockets/Makefile delete mode 100644 net/php72-xmlrpc/php71-xmlrpc/Makefile delete mode 100644 net/php72-xmlrpc/php71-xmlrpc/files/patch-config.m4 delete mode 100644 security/php72-filter/php71-filter/Makefile delete mode 100644 security/php72-filter/php71-filter/files/patch-config.m4 delete mode 100644 security/php72-hash/php71-hash/Makefile delete mode 100644 security/php72-openssl/php71-openssl/Makefile delete mode 100644 sysutils/php72-fileinfo/php71-fileinfo/Makefile delete mode 100644 sysutils/php72-fileinfo/php71-fileinfo/files/patch-config.m4 delete mode 100644 sysutils/php72-posix/php71-posix/Makefile delete mode 100644 sysutils/php72-posix/php71-posix/files/patch-posix.c delete mode 100644 textproc/php72-ctype/php71-ctype/Makefile delete mode 100644 textproc/php72-dom/php71-dom/Makefile delete mode 100644 textproc/php72-enchant/php71-enchant/Makefile diff --git a/devel/php72-intl/php71-intl/Makefile b/devel/php72-intl/php71-intl/Makefile deleted file mode 100644 index 3544627cd377..000000000000 --- a/devel/php72-intl/php71-intl/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -intl - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php72-json/php71-json/Makefile b/devel/php72-json/php71-json/Makefile deleted file mode 100644 index 5bf524943afd..000000000000 --- a/devel/php72-json/php71-json/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -json - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php72-pcntl/php71-pcntl/Makefile b/devel/php72-pcntl/php71-pcntl/Makefile deleted file mode 100644 index c19b222f6c48..000000000000 --- a/devel/php72-pcntl/php71-pcntl/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -pcntl - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php72-readline/php71-readline/Makefile b/devel/php72-readline/php71-readline/Makefile deleted file mode 100644 index e42513610a12..000000000000 --- a/devel/php72-readline/php71-readline/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -readline - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php72-readline/php71-readline/files/patch-config.m4 b/devel/php72-readline/php71-readline/files/patch-config.m4 deleted file mode 100644 index 5edf376bf0e2..000000000000 --- a/devel/php72-readline/php71-readline/files/patch-config.m4 +++ /dev/null @@ -1,38 +0,0 @@ ---- config.m4.orig 2013-08-20 06:46:43.000000000 +0200 -+++ config.m4 2013-08-27 16:01:29.000000000 +0200 -@@ -5,13 +5,8 @@ - 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 -@@ -67,6 +62,13 @@ - -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 -@@ -118,7 +120,6 @@ - fi - - if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then -- AC_CHECK_FUNCS([rl_completion_matches]) - PHP_NEW_EXTENSION(readline, readline.c readline_cli.c, $ext_shared, cli) - PHP_SUBST(READLINE_SHARED_LIBADD) - fi diff --git a/devel/php72-readline/php71-readline/files/patch-readline_cli.c b/devel/php72-readline/php71-readline/files/patch-readline_cli.c deleted file mode 100644 index 02f55974f9b0..000000000000 --- a/devel/php72-readline/php71-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/php72-shmop/php71-shmop/Makefile b/devel/php72-shmop/php71-shmop/Makefile deleted file mode 100644 index 8b3fba13ea76..000000000000 --- a/devel/php72-shmop/php71-shmop/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -shmop - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php72-sysvmsg/php71-sysvmsg/Makefile b/devel/php72-sysvmsg/php71-sysvmsg/Makefile deleted file mode 100644 index a48ebc656940..000000000000 --- a/devel/php72-sysvmsg/php71-sysvmsg/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -sysvmsg - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php72-sysvsem/php71-sysvsem/Makefile b/devel/php72-sysvsem/php71-sysvsem/Makefile deleted file mode 100644 index 27d9aeeb8aeb..000000000000 --- a/devel/php72-sysvsem/php71-sysvsem/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -sysvsem - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php72-sysvshm/php71-sysvshm/Makefile b/devel/php72-sysvshm/php71-sysvshm/Makefile deleted file mode 100644 index cea19b4e25d5..000000000000 --- a/devel/php72-sysvshm/php71-sysvshm/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -sysvshm - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php72-tokenizer/php71-tokenizer/Makefile b/devel/php72-tokenizer/php71-tokenizer/Makefile deleted file mode 100644 index 041e58293445..000000000000 --- a/devel/php72-tokenizer/php71-tokenizer/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -tokenizer - -.include "${MASTERDIR}/Makefile" diff --git a/ftp/php72-curl/php71-curl/Makefile b/ftp/php72-curl/php71-curl/Makefile deleted file mode 100644 index 61f26cd2bfbc..000000000000 --- a/ftp/php72-curl/php71-curl/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= ftp - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -curl - -.include "${MASTERDIR}/Makefile" diff --git a/ftp/php72-ftp/php71-ftp/Makefile b/ftp/php72-ftp/php71-ftp/Makefile deleted file mode 100644 index 15111ceec0e1..000000000000 --- a/ftp/php72-ftp/php71-ftp/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= ftp - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -ftp - -post-patch: - @${REINPLACE_CMD} s/HAVE_OPENSSL_EXT/__FreeBSD__/ \ - ${WRKSRC}/ftp.* ${WRKSRC}/php_ftp.* - -.include "${MASTERDIR}/Makefile" diff --git a/graphics/php72-exif/php71-exif/Makefile b/graphics/php72-exif/php71-exif/Makefile deleted file mode 100644 index cdec2198f850..000000000000 --- a/graphics/php72-exif/php71-exif/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= graphics - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -exif - -.include "${MASTERDIR}/Makefile" diff --git a/graphics/php72-gd/php71-gd/Makefile b/graphics/php72-gd/php71-gd/Makefile deleted file mode 100644 index e2108f99c317..000000000000 --- a/graphics/php72-gd/php71-gd/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= graphics - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -gd - -.include "${MASTERDIR}/Makefile" diff --git a/mail/php72-imap/php71-imap/Makefile b/mail/php72-imap/php71-imap/Makefile deleted file mode 100644 index 5eca0839451e..000000000000 --- a/mail/php72-imap/php71-imap/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= mail - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -imap - -.include "${MASTERDIR}/Makefile" diff --git a/mail/php72-imap/php71-imap/files/patch-config.m4 b/mail/php72-imap/php71-imap/files/patch-config.m4 deleted file mode 100644 index ab7120b2c8c8..000000000000 --- a/mail/php72-imap/php71-imap/files/patch-config.m4 +++ /dev/null @@ -1,42 +0,0 @@ ---- config.m4.orig 2010-02-07 14:06:54.000000000 +0100 -+++ config.m4 2010-03-08 11:56:24.000000000 +0100 -@@ -103,6 +103,8 @@ - PHP_ARG_WITH(imap-ssl,for IMAP SSL support, - [ --with-imap-ssl[=DIR] IMAP: Include SSL support. DIR is the OpenSSL install prefix], no, no) - -+PHP_ARG_WITH(pcre-dir, pcre install prefix, -+[ --with-pcre-dir IMAP: pcre install prefix], no, no) - - if test "$PHP_IMAP" != "no"; then - PHP_SUBST(IMAP_SHARED_LIBADD) -@@ -119,6 +121,30 @@ - fi - done - -+ dnl This is PECL build, check if bundled PCRE library is used -+ old_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=$INCLUDES -+ AC_EGREP_CPP(yes,[ -+#include
-+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) -+yes -+#endif -+ ],[ -+ PHP_PCRE_REGEX=yes -+ ],[ -+ AC_EGREP_CPP(yes,[ -+#include
-+#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 -+ ]) -+ ]) -+ - dnl Check for c-client version 2004 - AC_EGREP_HEADER(mail_fetch_overview_sequence, $IMAP_INC_DIR/mail.h, [ - AC_DEFINE(HAVE_IMAP2004,1,[ ]) diff --git a/math/php72-bcmath/php71-bcmath/Makefile b/math/php72-bcmath/php71-bcmath/Makefile deleted file mode 100644 index 8d0bdfa31457..000000000000 --- a/math/php72-bcmath/php71-bcmath/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= math - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -bcmath - -.include "${MASTERDIR}/Makefile" diff --git a/math/php72-gmp/php71-gmp/Makefile b/math/php72-gmp/php71-gmp/Makefile deleted file mode 100644 index 75463e34b782..000000000000 --- a/math/php72-gmp/php71-gmp/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= math - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -gmp - -.include "${MASTERDIR}/Makefile" diff --git a/misc/php72-calendar/php71-calendar/Makefile b/misc/php72-calendar/php71-calendar/Makefile deleted file mode 100644 index 646a8217d605..000000000000 --- a/misc/php72-calendar/php71-calendar/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= misc - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -calendar - -.include "${MASTERDIR}/Makefile" diff --git a/net-mgmt/php72-snmp/php71-snmp/Makefile b/net-mgmt/php72-snmp/php71-snmp/Makefile deleted file mode 100644 index d90d03d66c88..000000000000 --- a/net-mgmt/php72-snmp/php71-snmp/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= net-mgmt - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -snmp - -.include "${MASTERDIR}/Makefile" diff --git a/net/php72-ldap/php71-ldap/Makefile b/net/php72-ldap/php71-ldap/Makefile deleted file mode 100644 index 1edcb04d0de5..000000000000 --- a/net/php72-ldap/php71-ldap/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -ldap - -.include "${MASTERDIR}/Makefile" diff --git a/net/php72-soap/php71-soap/Makefile b/net/php72-soap/php71-soap/Makefile deleted file mode 100644 index 8f0142f7d728..000000000000 --- a/net/php72-soap/php71-soap/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -soap - -.include "${MASTERDIR}/Makefile" diff --git a/net/php72-sockets/php71-sockets/Makefile b/net/php72-sockets/php71-sockets/Makefile deleted file mode 100644 index 9284f2d9c7ae..000000000000 --- a/net/php72-sockets/php71-sockets/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -sockets - -.include "${MASTERDIR}/Makefile" diff --git a/net/php72-xmlrpc/php71-xmlrpc/Makefile b/net/php72-xmlrpc/php71-xmlrpc/Makefile deleted file mode 100644 index 961bb83a703c..000000000000 --- a/net/php72-xmlrpc/php71-xmlrpc/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -xmlrpc - -.include "${MASTERDIR}/Makefile" diff --git a/net/php72-xmlrpc/php71-xmlrpc/files/patch-config.m4 b/net/php72-xmlrpc/php71-xmlrpc/files/patch-config.m4 deleted file mode 100644 index d2dc85f26a48..000000000000 --- a/net/php72-xmlrpc/php71-xmlrpc/files/patch-config.m4 +++ /dev/null @@ -1,23 +0,0 @@ ---- config.m4.orig 2014-04-29 08:04:30.000000000 +0000 -+++ config.m4 2014-05-15 08:04:00.883004682 +0000 -@@ -61,11 +61,9 @@ if test "$PHP_XMLRPC" != "no"; then - fi - fi - -- dnl if iconv is shared or missing then we should build iconv ourselves -- if test "$PHP_ICONV_SHARED" = "yes" || test "$PHP_ICONV" = "no"; then -- - if test "$PHP_ICONV_DIR" != "no"; then - PHP_ICONV=$PHP_ICONV_DIR -+ PHP_ADD_INCLUDE($PHP_ICONV_DIR/include) - fi - - if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then -@@ -75,7 +73,6 @@ if test "$PHP_XMLRPC" != "no"; then - PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [ - AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library]) - ]) -- fi - fi - - if test "$PHP_XMLRPC" = "yes"; then diff --git a/security/php72-filter/php71-filter/Makefile b/security/php72-filter/php71-filter/Makefile deleted file mode 100644 index 8be3655c9d5e..000000000000 --- a/security/php72-filter/php71-filter/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= security - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -filter - -.include "${MASTERDIR}/Makefile" diff --git a/security/php72-filter/php71-filter/files/patch-config.m4 b/security/php72-filter/php71-filter/files/patch-config.m4 deleted file mode 100644 index ab64c6c9d5ad..000000000000 --- a/security/php72-filter/php71-filter/files/patch-config.m4 +++ /dev/null @@ -1,10 +0,0 @@ ---- config.m4.orig 2009-03-06 08:25:45.000000000 +0100 -+++ config.m4 2009-03-06 08:28:10.000000000 +0100 -@@ -32,6 +32,7 @@ - #endif - ],[ - PHP_PCRE_REGEX=pecl -+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include) - ],[ - PHP_PCRE_REGEX=no - ]) diff --git a/security/php72-hash/php71-hash/Makefile b/security/php72-hash/php71-hash/Makefile deleted file mode 100644 index ee41b199dc0b..000000000000 --- a/security/php72-hash/php71-hash/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= security - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -hash - -.include "${MASTERDIR}/Makefile" diff --git a/security/php72-openssl/php71-openssl/Makefile b/security/php72-openssl/php71-openssl/Makefile deleted file mode 100644 index d488d29c194b..000000000000 --- a/security/php72-openssl/php71-openssl/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= security - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -openssl - -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/php72-fileinfo/php71-fileinfo/Makefile b/sysutils/php72-fileinfo/php71-fileinfo/Makefile deleted file mode 100644 index 557d54063c63..000000000000 --- a/sysutils/php72-fileinfo/php71-fileinfo/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= sysutils - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -fileinfo - -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/php72-fileinfo/php71-fileinfo/files/patch-config.m4 b/sysutils/php72-fileinfo/php71-fileinfo/files/patch-config.m4 deleted file mode 100644 index 1348023ccf64..000000000000 --- a/sysutils/php72-fileinfo/php71-fileinfo/files/patch-config.m4 +++ /dev/null @@ -1,21 +0,0 @@ ---- config.m4.orig 2010-09-07 15:45:30.000000000 +0200 -+++ config.m4 2010-09-07 15:46:50.000000000 +0200 -@@ -4,6 +4,9 @@ - PHP_ARG_ENABLE(fileinfo, for fileinfo support, - [ --disable-fileinfo Disable fileinfo support], yes) - -+PHP_ARG_WITH(pcre-dir, pcre install prefix, -+[ --with-pcre-dir FILEINFO: pcre install prefix], no, no) -+ - if test "$PHP_FILEINFO" != "no"; then - - libmagic_sources=" \ -@@ -13,6 +16,8 @@ - libmagic/is_tar.c libmagic/magic.c libmagic/print.c \ - libmagic/readcdf.c libmagic/readelf.c libmagic/softmagic.c" - -+ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include) -+ - PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic) - PHP_ADD_BUILD_DIR($ext_builddir/libmagic) - diff --git a/sysutils/php72-posix/php71-posix/Makefile b/sysutils/php72-posix/php71-posix/Makefile deleted file mode 100644 index d2734136a02b..000000000000 --- a/sysutils/php72-posix/php71-posix/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= sysutils - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -posix - -.include "${MASTERDIR}/Makefile" diff --git a/sysutils/php72-posix/php71-posix/files/patch-posix.c b/sysutils/php72-posix/php71-posix/files/patch-posix.c deleted file mode 100644 index d2365b249569..000000000000 --- a/sysutils/php72-posix/php71-posix/files/patch-posix.c +++ /dev/null @@ -1,38 +0,0 @@ ---- posix.c.orig Fri Feb 23 00:40:39 2007 -+++ posix.c Sun May 13 17:52:27 2007 -@@ -838,7 +838,7 @@ - #if defined(ZTS) && defined(HAVE_GETGRNAM_R) && defined(_SC_GETGR_R_SIZE_MAX) - buflen = sysconf(_SC_GETGR_R_SIZE_MAX); - if (buflen < 1) { -- RETURN_FALSE; -+ buflen = 1024; - } - buf = emalloc(buflen); - g = &gbuf; -@@ -888,7 +888,7 @@ - - grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX); - if (grbuflen < 1) { -- RETURN_FALSE; -+ grbuflen = 1024; - } - - grbuf = emalloc(grbuflen); -@@ -955,7 +955,7 @@ - #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWNAM_R) - buflen = sysconf(_SC_GETPW_R_SIZE_MAX); - if (buflen < 1) { -- RETURN_FALSE; -+ buflen = 1024; - } - buf = emalloc(buflen); - pw = &pwbuf; -@@ -1004,7 +1004,7 @@ - #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWUID_R) - pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX); - if (pwbuflen < 1) { -- RETURN_FALSE; -+ pwbuflen = 1024; - } - pwbuf = emalloc(pwbuflen); - diff --git a/textproc/php72-ctype/php71-ctype/Makefile b/textproc/php72-ctype/php71-ctype/Makefile deleted file mode 100644 index e49199b94ce7..000000000000 --- a/textproc/php72-ctype/php71-ctype/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -ctype - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php72-dom/php71-dom/Makefile b/textproc/php72-dom/php71-dom/Makefile deleted file mode 100644 index dd695bee8d85..000000000000 --- a/textproc/php72-dom/php71-dom/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -dom - -.include "${MASTERDIR}/Makefile" diff --git a/textproc/php72-enchant/php71-enchant/Makefile b/textproc/php72-enchant/php71-enchant/Makefile deleted file mode 100644 index 877eacc520c1..000000000000 --- a/textproc/php72-enchant/php71-enchant/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= textproc - -MASTERDIR= ${.CURDIR}/../../lang/php71 - -PKGNAMESUFFIX= -enchant - -.include "${MASTERDIR}/Makefile"