diff options
| -rw-r--r-- | lang/php5/Makefile | 3 | ||||
| -rw-r--r-- | lang/php5/Makefile.php | 7 | ||||
| -rw-r--r-- | lang/php5/distinfo | 4 | ||||
| -rw-r--r-- | lang/php5/patches/patch-an | 44 |
4 files changed, 50 insertions, 8 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile index df220f05c62..57a1dbecd58 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.69 2008/12/10 19:37:01 adrianp Exp $ +# $NetBSD: Makefile,v 1.70 2009/02/07 18:03:00 adrianp Exp $ PKGNAME= php-${PHP_BASE_VERS} +PKGREVISION= 1 CATEGORIES= lang HOMEPAGE= http://www.php.net/ COMMENT= PHP Hypertext Preprocessor version 5 diff --git a/lang/php5/Makefile.php b/lang/php5/Makefile.php index c77e663e0a0..e2fc85af7c9 100644 --- a/lang/php5/Makefile.php +++ b/lang/php5/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.29 2008/08/17 18:36:50 adrianp Exp $ +# $NetBSD: Makefile.php,v 1.30 2009/02/07 18:03:00 adrianp Exp $ # .include "../../lang/php5/Makefile.common" @@ -61,7 +61,12 @@ CONFIGURE_ARGS+= --disable-ipv6 .if !empty(PKG_OPTIONS:Mssl) . include "../../security/openssl/buildlink3.mk" +. if ${OPSYS} == "SunOS" +CONFIGURE_ARGS+= --with-openssl=yes +LIBS.SunOS+= -lcrypto +. else CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} +. endif .else CONFIGURE_ARGS+= --without-openssl .endif diff --git a/lang/php5/distinfo b/lang/php5/distinfo index 4f5a555f78d..2ca2d6d00d6 100644 --- a/lang/php5/distinfo +++ b/lang/php5/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.56 2008/12/10 19:37:01 adrianp Exp $ +$NetBSD: distinfo,v 1.57 2009/02/07 18:03:00 adrianp Exp $ SHA1 (php-5.2.8/php-5.2.8.tar.bz2) = d285636144e0a4aa61195793634807e763c63dc3 RMD160 (php-5.2.8/php-5.2.8.tar.bz2) = d38fe5d918c335089a027600a93d950f417a7e98 @@ -9,6 +9,6 @@ SHA1 (patch-ag) = 4ccb67ba6f5370b1d16b087e3e714de3e5ae604e SHA1 (patch-ah) = c7cbd4b9ea0796ea3b7491c2cffb6ddddc518587 SHA1 (patch-aj) = 54812097499c81e5cb0196ab949cc86a4f24a9cc SHA1 (patch-al) = 0ee37782cc0d3bf5ede1a583de0589c2c1316b50 -SHA1 (patch-an) = d0578fa2d00932d6b5d97dfff525f4c0f9586bd5 +SHA1 (patch-an) = 8f4174627b8cb5f8bfbc59413c95f71e26b9e602 SHA1 (patch-ap) = 5eb0e0e4244a993da93e36f8fcb5553454207fce SHA1 (patch-aq) = 0c9d48547da2fa80aa8357d23ad8505d1c0330df diff --git a/lang/php5/patches/patch-an b/lang/php5/patches/patch-an index 9b170275bc8..b6f68370d95 100644 --- a/lang/php5/patches/patch-an +++ b/lang/php5/patches/patch-an @@ -1,8 +1,8 @@ -$NetBSD: patch-an,v 1.6 2008/10/28 07:07:59 adam Exp $ +$NetBSD: patch-an,v 1.7 2009/02/07 18:03:00 adrianp Exp $ ---- configure.orig 2008-04-30 20:37:32.000000000 +0200 +--- configure.orig 2008-12-07 11:31:12.000000000 -0800 +++ configure -@@ -12437,7 +12437,7 @@ EOF +@@ -12471,7 +12471,7 @@ EOF echo "$ac_t""$PHP_PATH_INFO_CHECK" 1>&6 @@ -11,7 +11,43 @@ $NetBSD: patch-an,v 1.6 2008/10/28 07:07:59 adam Exp $ PHP_SAPI=cgi -@@ -107515,12 +107515,7 @@ old_CC=$CC +@@ -21467,7 +21467,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 +@@ -34588,7 +34588,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 +@@ -48878,7 +48878,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 +@@ -87996,7 +87996,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 +@@ -108297,12 +108297,7 @@ old_CC=$CC if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags" INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags" |