pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/php72 remove patch to add / to PHP_OPENSSL_DIR - ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5b5389803042
branches:  trunk
changeset: 372342:5b5389803042
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Sun Dec 03 11:47:33 2017 +0000

description:
remove patch to add / to PHP_OPENSSL_DIR - can't find in history why
it was added (is there since at least php54), and package compiles just
fine without it; goal is to reduce amount of patches we maintain

diffstat:

 lang/php72/distinfo                   |   5 ++---
 lang/php72/patches/patch-acinclude.m4 |  13 -------------
 lang/php72/patches/patch-configure    |  11 +----------
 3 files changed, 3 insertions(+), 26 deletions(-)

diffs (59 lines):

diff -r 01b4b82c867a -r 5b5389803042 lang/php72/distinfo
--- a/lang/php72/distinfo       Sun Dec 03 11:09:46 2017 +0000
+++ b/lang/php72/distinfo       Sun Dec 03 11:47:33 2017 +0000
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.3 2017/11/30 20:45:46 jdolecek Exp $
+$NetBSD: distinfo,v 1.4 2017/12/03 11:47:33 jdolecek Exp $
 
 SHA1 (php-7.2.0.tar.bz2) = b15bd8fef8d5b99b993784e9c2254ab82f616c64
 RMD160 (php-7.2.0.tar.bz2) = a39b7057bcb93b656fda39008ee4743c4f7f2a0f
 SHA512 (php-7.2.0.tar.bz2) = f4b4d97a0b662cab9ed47a549453ad522da45fa5aa34e3ece49a8b85b49b7a5921d2d7cdd0a6766b09d63c4f7fd022502222656ce112fc80f85e8f2409c5c826
 Size (php-7.2.0.tar.bz2) = 14594486 bytes
-SHA1 (patch-acinclude.m4) = b682280fd89950c082c2226bdb7364b0dc475bad
-SHA1 (patch-configure) = a9d48535baf94415ca49ccda43e196010969ea9e
+SHA1 (patch-configure) = 0a0de9cebbc9550875b164209983ce6fda0648d1
 SHA1 (patch-ext_curl_config.m4) = f583f90a499d4f0bdb3d21fa8f129a30d2fa6d6c
 SHA1 (patch-ext_imap_config.m4) = f4e10ab81697b72019313f63bc630627a08efd92
 SHA1 (patch-ext_intl_config.m4) = 1ea3d3e6f05d5fed0bd4ca4518440199aec0954d
diff -r 01b4b82c867a -r 5b5389803042 lang/php72/patches/patch-acinclude.m4
--- a/lang/php72/patches/patch-acinclude.m4     Sun Dec 03 11:09:46 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-acinclude.m4,v 1.1 2017/11/15 08:56:12 jdolecek Exp $
-
---- acinclude.m4.orig  2015-06-23 17:33:33.000000000 +0000
-+++ acinclude.m4
-@@ -2354,7 +2354,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
-   if test "$found_openssl" = "no"; then
-   
-     if test "$PHP_OPENSSL_DIR" = "yes"; then
--      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
-+      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
-     fi
- 
-     for i in $PHP_OPENSSL_DIR; do
diff -r 01b4b82c867a -r 5b5389803042 lang/php72/patches/patch-configure
--- a/lang/php72/patches/patch-configure        Sun Dec 03 11:09:46 2017 +0000
+++ b/lang/php72/patches/patch-configure        Sun Dec 03 11:47:33 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.2 2017/11/15 11:01:31 jdolecek Exp $
+$NetBSD: patch-configure,v 1.3 2017/12/03 11:47:33 jdolecek Exp $
 
 --- configure.orig     2017-11-07 11:57:02.000000000 +0000
 +++ configure
@@ -30,15 +30,6 @@
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
-@@ -18592,7 +18571,7 @@ fi
-     if test "$found_openssl" = "no"; then
- 
-     if test "$PHP_OPENSSL_DIR" = "yes"; then
--      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
-+      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
-     fi
- 
-     for i in $PHP_OPENSSL_DIR; do
 @@ -21090,7 +21069,7 @@ $as_echo "#define HAVE_SQLITE3_ERRSTR 1"
      PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
  



Home | Main Index | Thread Index | Old Index