From 84f28d73a56392ab04bcfa80bb4fdb199ef862f7 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 11 Apr 2020 21:29:07 +0200
Subject: [PATCH] php: fix unwanted directory in installation.

---
 dev-lang/php/patches/php-5.6.33.patchset | 245 -----------------------
 dev-lang/php/php-5.6.33.recipe           | 112 -----------
 dev-lang/php/php-5.6.37.recipe           |   3 +-
 3 files changed, 2 insertions(+), 358 deletions(-)
 delete mode 100644 dev-lang/php/patches/php-5.6.33.patchset
 delete mode 100644 dev-lang/php/php-5.6.33.recipe

diff --git a/dev-lang/php/patches/php-5.6.33.patchset b/dev-lang/php/patches/php-5.6.33.patchset
deleted file mode 100644
index d1e5020ad..000000000
--- a/dev-lang/php/patches/php-5.6.33.patchset
+++ /dev/null
@@ -1,245 +0,0 @@
-From 089544e6c6fadc97801ca1ac5eee077985157467 Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@pulkomandy.tk>
-Date: Tue, 16 Jan 2018 21:32:56 +0100
-Subject: Import old patch: build system.
-
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 3db7438..4eaacc6 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -762,7 +762,7 @@ AC_DEFUN([PHP_REQUIRE_CXX],[
-   if test -z "$php_cxx_done"; then
-     AC_PROG_CXX
-     AC_PROG_CXXCPP
--    PHP_ADD_LIBRARY(stdc++)
-+    PHP_ADD_LIBRARY(stdc++.r4)
-     php_cxx_done=yes
-   fi
- ])
-diff --git a/aclocal.m4 b/aclocal.m4
-index 47f05b2..1d546e7 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -762,7 +762,7 @@ AC_DEFUN([PHP_REQUIRE_CXX],[
-   if test -z "$php_cxx_done"; then
-     AC_PROG_CXX
-     AC_PROG_CXXCPP
--    PHP_ADD_LIBRARY(stdc++)
-+    PHP_ADD_LIBRARY(stdc++.r4)
-     php_cxx_done=yes
-   fi
- ])
-diff --git a/ext/curl/config.m4 b/ext/curl/config.m4
-index 2f82c34..b6a09d9 100644
---- a/ext/curl/config.m4
-+++ b/ext/curl/config.m4
-@@ -10,8 +10,8 @@ if test "$PHP_CURL" != "no"; then
-     CURL_DIR=$PHP_CURL
-   else
-     AC_MSG_CHECKING(for cURL in default path)
--    for i in /usr/local /usr; do
--      if test -r $i/include/curl/easy.h; then
-+    for i in /usr/local /usr /system; do
-+      if test -r $i/develop/headers/curl/easy.h; then
-         CURL_DIR=$i
-         AC_MSG_RESULT(found in $i)
-         break
-@@ -22,7 +22,7 @@ if test "$PHP_CURL" != "no"; then
-   if test -z "$CURL_DIR"; then
-     AC_MSG_RESULT(not found)
-     AC_MSG_ERROR(Please reinstall the libcurl distribution -
--    easy.h should be in <curl-dir>/include/curl/)
-+    easy.h should be in <curl-dir>/develop/headers/curl/)
-   fi
- 
-   CURL_CONFIG="curl-config"
-diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
-index e643e52..517cf26 100644
---- a/ext/gd/config.m4
-+++ b/ext/gd/config.m4
-@@ -50,23 +50,23 @@ dnl
- 
- AC_DEFUN([PHP_GD_ZLIB],[
- 	if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then
--		if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then
-+		if test -f "$PHP_ZLIB_DIR/develop/headers/zlib/zlib.h"; then
- 			PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
--			PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib"
--		elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then
-+			PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/develop/headers/zlib"
-+		elif test -f "$PHP_ZLIB_DIR/develop/headers/zlib.h"; then
- 			PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
--			PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include"
-+			PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/develop/headers"
- 		else
- 			AC_MSG_ERROR([Can't find zlib headers under "$PHP_ZLIB_DIR"])
- 		fi
- 	else
--		for i in /usr/local /usr; do
--			if test -f "$i/include/zlib/zlib.h"; then
-+		for i in /usr/local /usr /system; do
-+			if test -f "$i/develop/headers/zlib/zlib.h"; then
- 				PHP_ZLIB_DIR="$i"
--				PHP_ZLIB_INCDIR="$i/include/zlib"
-+				PHP_ZLIB_INCDIR="$i/develop/headers/zlib"
- 			elif test -f "$i/include/zlib.h"; then
- 				PHP_ZLIB_DIR="$i"
--				PHP_ZLIB_INCDIR="$i/include"
-+				PHP_ZLIB_INCDIR="$i/develop/headers"
- 			fi
- 		done
- 	fi
-@@ -101,8 +101,8 @@ AC_DEFUN([PHP_GD_VPX],[
- AC_DEFUN([PHP_GD_JPEG],[
-   if test "$PHP_JPEG_DIR" != "no"; then
- 
--    for i in $PHP_JPEG_DIR /usr/local /usr; do
--      test -f $i/include/jpeglib.h && GD_JPEG_DIR=$i && break
-+    for i in $PHP_JPEG_DIR /usr/local /usr /system; do
-+      test -f $i/develop/headers/jpeglib.h && GD_JPEG_DIR=$i && break
-     done
- 
-     if test -z "$GD_JPEG_DIR"; then
-@@ -126,8 +126,8 @@ AC_DEFUN([PHP_GD_JPEG],[
- AC_DEFUN([PHP_GD_PNG],[
-   if test "$PHP_PNG_DIR" != "no"; then
- 
--    for i in $PHP_PNG_DIR /usr/local /usr; do
--      test -f $i/include/png.h && GD_PNG_DIR=$i && break
-+    for i in $PHP_PNG_DIR /usr/local /usr /system; do
-+      test -f $i/develop/headers/png.h && GD_PNG_DIR=$i && break
-     done
- 
-     if test -z "$GD_PNG_DIR"; then
-diff --git a/ext/zip/config.m4 b/ext/zip/config.m4
-index 845d446..3113459 100644
---- a/ext/zip/config.m4
-+++ b/ext/zip/config.m4
-@@ -20,23 +20,23 @@ if test "$PHP_ZIP" != "no"; then
- 
-   dnl libzip, depends on zlib
-   if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then
--    if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then
-+    if test -f "$PHP_ZLIB_DIR/develop/headers/zlib/zlib.h"; then
-       PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
--      PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib"
--    elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then
-+      PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/develop/headers/zlib"
-+    elif test -f "$PHP_ZLIB_DIR/develop/headers/zlib.h"; then
-       PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
--      PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include"
-+      PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/develop/headers"
-     else
-       AC_MSG_ERROR([Can not find zlib headers under "$PHP_ZLIB_DIR"])
-     fi
-   else
--    for i in /usr/local /usr; do
--      if test -f "$i/include/zlib/zlib.h"; then
-+    for i in /usr/local /usr /system; do
-+      if test -f "$i/develop/headers/zlib/zlib.h"; then
-         PHP_ZLIB_DIR="$i"
--        PHP_ZLIB_INCDIR="$i/include/zlib"
--      elif test -f "$i/include/zlib.h"; then
-+        PHP_ZLIB_INCDIR="$i/develop/headers/zlib"
-+      elif test -f "$i/develop/headers/zlib.h"; then
-         PHP_ZLIB_DIR="$i"
--        PHP_ZLIB_INCDIR="$i/include"
-+        PHP_ZLIB_INCDIR="$i/develop/headers"
-       fi
-     done
-   fi
--- 
-2.16.1
-
-
-From c9a09d3997cdf687c8accf2ddcc6e37ead08bf6e Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@pulkomandy.tk>
-Date: Tue, 16 Jan 2018 21:34:13 +0100
-Subject: Import old patch: code changes.
-
-
-diff --git a/ext/date/php_date.c b/ext/date/php_date.c
-index 801208d..12170e3 100644
---- a/ext/date/php_date.c
-+++ b/ext/date/php_date.c
-@@ -33,8 +33,6 @@
- 
- #ifdef PHP_WIN32
- static __inline __int64 php_date_llabs( __int64 i ) { return i >= 0? i: -i; }
--#elif defined(__GNUC__) && __GNUC__ < 3
--static __inline __int64_t php_date_llabs( __int64_t i ) { return i >= 0 ? i : -i; }
- #else
- static inline long long php_date_llabs( long long i ) { return i >= 0 ? i : -i; }
- #endif
-diff --git a/ext/standard/microtime.c b/ext/standard/microtime.c
-index 982c83c..9e17082 100644
---- a/ext/standard/microtime.c
-+++ b/ext/standard/microtime.c
-@@ -131,7 +131,7 @@ PHP_FUNCTION(getrusage)
- 	array_init(return_value);
- #define PHP_RUSAGE_PARA(a) \
- 		add_assoc_long(return_value, #a, usg.a)
--#if !defined( _OSD_POSIX) && !defined(__BEOS__) /* BS2000 has only a few fields in the rusage struct */
-+#if !defined( _OSD_POSIX) && !defined(__BEOS__) && !defined(__HAIKU__) /* BS2000 has only a few fields in the rusage struct */
- 	PHP_RUSAGE_PARA(ru_oublock);
- 	PHP_RUSAGE_PARA(ru_inblock);
- 	PHP_RUSAGE_PARA(ru_msgsnd);
--- 
-2.16.1
-
-
-From 8a5654f65fbe4941b1f14d3c2552ddd5bb9cd2f8 Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@pulkomandy.tk>
-Date: Tue, 16 Jan 2018 21:58:37 +0100
-Subject: More build system fixes
-
-
-diff --git a/ext/zlib/config0.m4 b/ext/zlib/config0.m4
-index ebf67cc..b53c7e2 100644
---- a/ext/zlib/config0.m4
-+++ b/ext/zlib/config0.m4
-@@ -13,21 +13,22 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then
-   PHP_SUBST(ZLIB_SHARED_LIBADD)
-   
-   if test "$PHP_ZLIB" != "yes" -a "$PHP_ZLIB" != "no"; then 
--    if test -f $PHP_ZLIB/include/zlib/zlib.h; then
-+    if test -f $PHP_ZLIB/develop/headers/zlib/zlib.h; then
-       ZLIB_DIR=$PHP_ZLIB
--      ZLIB_INCDIR=$ZLIB_DIR/include/zlib
--    elif test -f $PHP_ZLIB/include/zlib.h; then
-+      ZLIB_INCDIR=$ZLIB_DIR/develop/headers/zlib
-+    elif test -f $PHP_ZLIB/develop/headers/zlib.h; then
-       ZLIB_DIR=$PHP_ZLIB
--      ZLIB_INCDIR=$ZLIB_DIR/include
-+      ZLIB_INCDIR=$ZLIB_DIR/develop/headers
-     fi
-   else 
--    for i in /usr/local /usr $PHP_ZLIB_DIR; do
--      if test -f $i/include/zlib/zlib.h; then
-+    for i in /usr/local /usr /system $PHP_ZLIB_DIR; do
-+	  echo $i
-+      if test -f $i/develop/headers/zlib/zlib.h; then
-         ZLIB_DIR=$i
--        ZLIB_INCDIR=$i/include/zlib
--      elif test -f $i/include/zlib.h; then
-+        ZLIB_INCDIR=$i/develop/headers/zlib
-+      elif test -f $i/develop/headers/zlib.h; then
-         ZLIB_DIR=$i
--        ZLIB_INCDIR=$i/include
-+        ZLIB_INCDIR=$i/develop/headers
-       fi
-     done
-   fi
-@@ -42,7 +43,7 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then
-   esac
- 
-   AC_MSG_CHECKING([for zlib version >= 1.2.0.4])
--  ZLIB_VERSION=`$EGREP "define ZLIB_VERSION" $ZLIB_DIR/include/zlib.h | $SED -e 's/[[^0-9\.]]//g'`
-+  ZLIB_VERSION=`$EGREP "define ZLIB_VERSION" $ZLIB_DIR/develop/headers/zlib.h | $SED -e 's/[[^0-9\.]]//g'`
-   AC_MSG_RESULT([$ZLIB_VERSION])
-   if test `echo $ZLIB_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*1000000 + $2*10000 + $3*100 + $4}'` -lt 1020004; then
-     AC_MSG_ERROR([libz version greater or equal to 1.2.0.4 required])
--- 
-2.16.1
-
diff --git a/dev-lang/php/php-5.6.33.recipe b/dev-lang/php/php-5.6.33.recipe
deleted file mode 100644
index 37ef7999c..000000000
--- a/dev-lang/php/php-5.6.33.recipe
+++ /dev/null
@@ -1,112 +0,0 @@
-SUMMARY="A popular general-purpose scripting language"
-DESCRIPTION="PHP is a popular general-purpose scripting language that is \
-especially suited to web development.
-Fast, flexible and pragmatic, PHP powers everything from your blog to the most \
-popular websites in the world."
-HOMEPAGE="https://php.net/"
-COPYRIGHT="2001-2014 PHP Group"
-LICENSE="PHP License v3.01"
-REVISION="2"
-SOURCE_URI="https://php.net/get/php-$portVersion.tar.bz2/from/this/mirror"
-CHECKSUM_SHA256="07f696a9761dcd839e2045c95c3a4d2ffb52c54417477cca9d30a14975b831cc"
-SOURCE_FILENAME="php-$portVersion.tar.bz2"
-PATCHES="php-$portVersion.patchset"
-
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
-
-GLOBAL_WRITABLE_FILES="
-	settings/pear.conf keep-old
-	"
-
-PROVIDES="
-	php = $portVersion
-	cmd:pear
-	cmd:peardev
-	cmd:pecl
-	cmd:phar
-	cmd:phar.phar
-	cmd:php
-	cmd:php_cgi
-	cmd:php_config
-	cmd:phpize
-	"
-REQUIRES="
-	haiku
-	lib:libbz2
-	lib:libcrypto
-	lib:libcurl
-	lib:libfreetype
-	lib:libicuuc
-	lib:libjpeg
-	lib:libpcre
-	lib:libpng16
-	lib:libssl
-	lib:libxml2
-	lib:libz
-	"
-
-BUILD_REQUIRES="
-	devel:libbz2
-	devel:libcrypto
-	devel:libcurl
-	devel:libfreetype
-	devel:libicuuc
-	devel:libjpeg
-	devel:libpcre
-	devel:libpng16
-	devel:libssl
-	devel:libxml2
-	devel:libz
-	"
-BUILD_PREREQUIRES="
-	haiku_devel
-	cmd:autoreconf
-	cmd:awk
-	cmd:bison
-	cmd:dos2unix
-	cmd:freetype_config
-	cmd:gcc
-	cmd:icu_config
-	cmd:make
-	cmd:pkg_config
-	cmd:xml2_config
-	"
-
-PATCH()
-{
-	dos2unix Zend/zend_language_scanner.l
-	dos2unix Zend/zend_language_scanner.c
-}
-
-BUILD()
-{
-	autoreconf
-	autoconf
-	runConfigure ./configure \
-		--with-libxml-dir=`finddir B_SYSTEM_DIRECTORY` \
-		--with-zlib-dir=`finddir B_SYSTEM_DIRECTORY` --with-zlib=shared \
-		--with-openssl \
-		--with-curl \
-		--with-gd \
-		--with-pcre-dir=`finddir B_SYSTEM_DIRECTORY` \
-		--with-png-dir=`finddir B_SYSTEM_DIRECTORY` \
-		--with-jpeg-dir=`finddir B_SYSTEM_DIRECTORY` \
-		--with-freetype-dir=`finddir B_SYSTEM_DIRECTORY` \
-		--disable-opcache \
-		--enable-intl \
-		--enable-ftp \
-		--enable-soap \
-		--without-iconv \
-		--disable-debug
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-}
-
-TEST()
-{
-	make test
-}
diff --git a/dev-lang/php/php-5.6.37.recipe b/dev-lang/php/php-5.6.37.recipe
index 1a97a5a41..ed027c2d8 100644
--- a/dev-lang/php/php-5.6.37.recipe
+++ b/dev-lang/php/php-5.6.37.recipe
@@ -6,7 +6,7 @@ popular websites in the world."
 HOMEPAGE="https://php.net/"
 COPYRIGHT="2001-2018 PHP Group"
 LICENSE="PHP License v3.01"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="https://php.net/get/php-$portVersion.tar.bz2/from/this/mirror"
 CHECKSUM_SHA256="886ad63d05d94ea3e54322691aadea0cf1d4bcdb4450b02fe300e5b570788b23"
 SOURCE_FILENAME="php-$portVersion.tar.bz2"
@@ -106,6 +106,7 @@ BUILD()
 INSTALL()
 {
 	make install
+	rm -rf $libDir/build # Only garbage is installed here.
 }
 
 TEST()