Sat Feb 7 18:03:00 2009 UTC ()
Get SSL support working on OpenSolaris.  Unfortunately on OpenSolairs the
OpenSSL install is split between /lib and /usr/include/openssl with plays
havoc with the php ./configure as it assumes both have the same base
directory (e.g. /usr).  This patch uses a modified inbuilt check for
OpenSSL instead of explicitly specifying a base using --with-openssl.


(adrianp)
diff -r1.69 -r1.70 pkgsrc/lang/php5/Makefile
diff -r1.29 -r1.30 pkgsrc/lang/php5/Makefile.php
diff -r1.56 -r1.57 pkgsrc/lang/php5/distinfo
diff -r1.6 -r1.7 pkgsrc/lang/php5/patches/patch-an
cvs diff -r1.69 -r1.70 pkgsrc/lang/php5/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/php5/Attic/Makefile 2008/12/10 19:37:01 1.69
+++ pkgsrc/lang/php5/Attic/Makefile 2009/02/07 18:03:00 1.70
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.69 2008/12/10 19:37:01 adrianp Exp $ 1# $NetBSD: Makefile,v 1.70 2009/02/07 18:03:00 adrianp Exp $
2 2
3PKGNAME= php-${PHP_BASE_VERS} 3PKGNAME= php-${PHP_BASE_VERS}
 4PKGREVISION= 1
4CATEGORIES= lang 5CATEGORIES= lang
5HOMEPAGE= http://www.php.net/ 6HOMEPAGE= http://www.php.net/
6COMMENT= PHP Hypertext Preprocessor version 5 7COMMENT= PHP Hypertext Preprocessor version 5
7 8
8TEST_TARGET= test 9TEST_TARGET= test
9PKG_DESTDIR_SUPPORT= user-destdir 10PKG_DESTDIR_SUPPORT= user-destdir
10 11
11USE_TOOLS+= gmake lex 12USE_TOOLS+= gmake lex
12LIBTOOL_OVERRIDE= # empty 13LIBTOOL_OVERRIDE= # empty
13 14
14PKG_OPTIONS_REQUIRED_GROUPS+= sapi 15PKG_OPTIONS_REQUIRED_GROUPS+= sapi
15PKG_OPTIONS_GROUP.sapi= cgi fastcgi 16PKG_OPTIONS_GROUP.sapi= cgi fastcgi
16PKG_SUGGESTED_OPTIONS+= cgi 17PKG_SUGGESTED_OPTIONS+= cgi
cvs diff -r1.29 -r1.30 pkgsrc/lang/php5/Attic/Makefile.php (expand / switch to unified diff)

--- pkgsrc/lang/php5/Attic/Makefile.php 2008/08/17 18:36:50 1.29
+++ pkgsrc/lang/php5/Attic/Makefile.php 2009/02/07 18:03:00 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.php,v 1.29 2008/08/17 18:36:50 adrianp Exp $ 1# $NetBSD: Makefile.php,v 1.30 2009/02/07 18:03:00 adrianp Exp $
2# 2#
3 3
4.include "../../lang/php5/Makefile.common" 4.include "../../lang/php5/Makefile.common"
5 5
6DISTINFO_FILE= ${.CURDIR}/../../lang/php5/distinfo 6DISTINFO_FILE= ${.CURDIR}/../../lang/php5/distinfo
7PATCHDIR= ${.CURDIR}/../../lang/php5/patches 7PATCHDIR= ${.CURDIR}/../../lang/php5/patches
8 8
9USE_LIBTOOL= YES 9USE_LIBTOOL= YES
10USE_LANGUAGES= c c++ 10USE_LANGUAGES= c c++
11GNU_CONFIGURE= YES 11GNU_CONFIGURE= YES
12BUILD_DEFS+= VARBASE 12BUILD_DEFS+= VARBASE
13 13
14CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}" 14CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
@@ -51,21 +51,26 @@ SUBST_FILES.ini+= php.ini-recommended @@ -51,21 +51,26 @@ SUBST_FILES.ini+= php.ini-recommended
51SUBST_SED.ini= -e "s|\;include_path = \".:/php/includes\"|include_path = \".:${PREFIX}/lib/php\"|g" 51SUBST_SED.ini= -e "s|\;include_path = \".:/php/includes\"|include_path = \".:${PREFIX}/lib/php\"|g"
52SUBST_MESSAGE.ini= Fixing default ini files. 52SUBST_MESSAGE.ini= Fixing default ini files.
53 53
54.include "../../mk/bsd.options.mk" 54.include "../../mk/bsd.options.mk"
55 55
56.if !empty(PKG_OPTIONS:Minet6) 56.if !empty(PKG_OPTIONS:Minet6)
57CONFIGURE_ARGS+= --enable-ipv6 57CONFIGURE_ARGS+= --enable-ipv6
58.else 58.else
59CONFIGURE_ARGS+= --disable-ipv6 59CONFIGURE_ARGS+= --disable-ipv6
60.endif 60.endif
61 61
62.if !empty(PKG_OPTIONS:Mssl) 62.if !empty(PKG_OPTIONS:Mssl)
63. include "../../security/openssl/buildlink3.mk" 63. include "../../security/openssl/buildlink3.mk"
 64. if ${OPSYS} == "SunOS"
 65CONFIGURE_ARGS+= --with-openssl=yes
 66LIBS.SunOS+= -lcrypto
 67. else
64CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} 68CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
 69. endif
65.else 70.else
66CONFIGURE_ARGS+= --without-openssl 71CONFIGURE_ARGS+= --without-openssl
67.endif 72.endif
68 73
69.if !empty(PKG_OPTIONS:Mmaintainer-zts) 74.if !empty(PKG_OPTIONS:Mmaintainer-zts)
70CONFIGURE_ARGS+= --enable-maintainer-zts 75CONFIGURE_ARGS+= --enable-maintainer-zts
71.endif 76.endif
cvs diff -r1.56 -r1.57 pkgsrc/lang/php5/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/php5/Attic/distinfo 2008/12/10 19:37:01 1.56
+++ pkgsrc/lang/php5/Attic/distinfo 2009/02/07 18:03:00 1.57
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.56 2008/12/10 19:37:01 adrianp Exp $ 1$NetBSD: distinfo,v 1.57 2009/02/07 18:03:00 adrianp Exp $
2 2
3SHA1 (php-5.2.8/php-5.2.8.tar.bz2) = d285636144e0a4aa61195793634807e763c63dc3 3SHA1 (php-5.2.8/php-5.2.8.tar.bz2) = d285636144e0a4aa61195793634807e763c63dc3
4RMD160 (php-5.2.8/php-5.2.8.tar.bz2) = d38fe5d918c335089a027600a93d950f417a7e98 4RMD160 (php-5.2.8/php-5.2.8.tar.bz2) = d38fe5d918c335089a027600a93d950f417a7e98
5Size (php-5.2.8/php-5.2.8.tar.bz2) = 9827180 bytes 5Size (php-5.2.8/php-5.2.8.tar.bz2) = 9827180 bytes
6SHA1 (patch-aa) = 20bc3831e435182d014b11ae9f1f6c537a21af20 6SHA1 (patch-aa) = 20bc3831e435182d014b11ae9f1f6c537a21af20
7SHA1 (patch-ad) = b324c33b1e70adee5b89dcecdd7690dcadcc18ec 7SHA1 (patch-ad) = b324c33b1e70adee5b89dcecdd7690dcadcc18ec
8SHA1 (patch-ag) = 4ccb67ba6f5370b1d16b087e3e714de3e5ae604e 8SHA1 (patch-ag) = 4ccb67ba6f5370b1d16b087e3e714de3e5ae604e
9SHA1 (patch-ah) = c7cbd4b9ea0796ea3b7491c2cffb6ddddc518587 9SHA1 (patch-ah) = c7cbd4b9ea0796ea3b7491c2cffb6ddddc518587
10SHA1 (patch-aj) = 54812097499c81e5cb0196ab949cc86a4f24a9cc 10SHA1 (patch-aj) = 54812097499c81e5cb0196ab949cc86a4f24a9cc
11SHA1 (patch-al) = 0ee37782cc0d3bf5ede1a583de0589c2c1316b50 11SHA1 (patch-al) = 0ee37782cc0d3bf5ede1a583de0589c2c1316b50
12SHA1 (patch-an) = d0578fa2d00932d6b5d97dfff525f4c0f9586bd5 12SHA1 (patch-an) = 8f4174627b8cb5f8bfbc59413c95f71e26b9e602
13SHA1 (patch-ap) = 5eb0e0e4244a993da93e36f8fcb5553454207fce 13SHA1 (patch-ap) = 5eb0e0e4244a993da93e36f8fcb5553454207fce
14SHA1 (patch-aq) = 0c9d48547da2fa80aa8357d23ad8505d1c0330df 14SHA1 (patch-aq) = 0c9d48547da2fa80aa8357d23ad8505d1c0330df
cvs diff -r1.6 -r1.7 pkgsrc/lang/php5/patches/Attic/patch-an (expand / switch to unified diff)

--- pkgsrc/lang/php5/patches/Attic/patch-an 2008/10/28 07:07:59 1.6
+++ pkgsrc/lang/php5/patches/Attic/patch-an 2009/02/07 18:03:00 1.7
@@ -1,27 +1,63 @@ @@ -1,27 +1,63 @@
1$NetBSD: patch-an,v 1.6 2008/10/28 07:07:59 adam Exp $ 1$NetBSD: patch-an,v 1.7 2009/02/07 18:03:00 adrianp Exp $
2 2
3--- configure.orig 2008-04-30 20:37:32.000000000 +0200 3--- configure.orig 2008-12-07 11:31:12.000000000 -0800
4+++ configure 4+++ configure
5@@ -12437,7 +12437,7 @@ EOF 5@@ -12471,7 +12471,7 @@ EOF
6  6
7 echo "$ac_t""$PHP_PATH_INFO_CHECK" 1>&6 7 echo "$ac_t""$PHP_PATH_INFO_CHECK" 1>&6
8  8
9- INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)" 9- INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
10+ INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)@CGIDIR@/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)@CGIDIR@/php" 10+ INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)@CGIDIR@/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)@CGIDIR@/php"
11  11
12 PHP_SAPI=cgi 12 PHP_SAPI=cgi
13  13
14@@ -107515,12 +107515,7 @@ old_CC=$CC 14@@ -21467,7 +21467,7 @@ fi
 15 if test "$found_openssl" = "no"; then
 16
 17 if test "$PHP_OPENSSL_DIR" = "yes"; then
 18- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
 19+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
 20 fi
 21
 22 for i in $PHP_OPENSSL_DIR; do
 23@@ -34588,7 +34588,7 @@ fi
 24 if test "$found_openssl" = "no"; then
 25
 26 if test "$PHP_OPENSSL_DIR" = "yes"; then
 27- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
 28+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
 29 fi
 30
 31 for i in $PHP_OPENSSL_DIR; do
 32@@ -48878,7 +48878,7 @@ fi
 33 if test "$found_openssl" = "no"; then
 34
 35 if test "$PHP_OPENSSL_DIR" = "yes"; then
 36- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
 37+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
 38 fi
 39
 40 for i in $PHP_OPENSSL_DIR; do
 41@@ -87996,7 +87996,7 @@ fi
 42 if test "$found_openssl" = "no"; then
 43
 44 if test "$PHP_OPENSSL_DIR" = "yes"; then
 45- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
 46+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
 47 fi
 48
 49 for i in $PHP_OPENSSL_DIR; do
 50@@ -108297,12 +108297,7 @@ old_CC=$CC
15 if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then 51 if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
16 CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags" 52 CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
17 INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags" 53 INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
18- cat >meta_ccld<<EOF 54- cat >meta_ccld<<EOF
19-#! /bin/sh 55-#! /bin/sh
20-exec $CC $ac_cv_pthreads_cflags \$@ 56-exec $CC $ac_cv_pthreads_cflags \$@
21-EOF 57-EOF
22- CC="$abs_builddir/meta_ccld" 58- CC="$abs_builddir/meta_ccld"
23- chmod +x meta_ccld 59- chmod +x meta_ccld
24+ CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags" 60+ CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags"
25 fi 61 fi
26  62
27 if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then 63 if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then