[pkgsrc/pkgsrc-2006Q4]: pkgsrc Pullup ticket 2035 - requested by bouyer

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4d3a9fb2a9aa
branches:  pkgsrc-2006Q4
changeset: 523035:4d3a9fb2a9aa
user:      salo <salo%pkgsrc.org@localhost>
date:      Fri Mar 02 13:02:26 2007 +0000

description:
Pullup ticket 2035 - requested by bouyer
add back SSL extension for PHP5

Revisions pulled up:
- pkgsrc/lang/php5/Makefile                             1.48
- pkgsrc/lang/php5/Makefile.php                         1.24
- pkgsrc/www/ap-php/Makefile                            1.13

   Module Name:         pkgsrc
   Committed By:        jdolecek
   Date:                Sun Feb 25 20:05:11 UTC 2007

   Modified Files:
        pkgsrc/lang/php5: Makefile Makefile.php

   Log Message:
   put back openssl extension, mistakely commented out in PHP 5.2.1 upgrade

   noted by Manuel Bouyer
---
   Module Name:         pkgsrc
   Committed By:        jdolecek
   Date:                Sun Feb 25 20:06:09 UTC 2007

   Modified Files:
        pkgsrc/www/ap-php: Makefile

   Log Message:
   bump revision for openssl omission fix in lang/php5 for PHP 5.2.1

   noted by Manuel Bouyer

diffstat:

 lang/php5/Makefile     |   3 ++-
 lang/php5/Makefile.php |  12 ++++++------
 www/ap-php/Makefile    |   4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diffs (50 lines):

diff -r 46bdc97c3240 -r 4d3a9fb2a9aa lang/php5/Makefile
--- a/lang/php5/Makefile        Fri Feb 23 11:58:10 2007 +0000
+++ b/lang/php5/Makefile        Fri Mar 02 13:02:26 2007 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2006/11/06 22:06:35 jdolecek Exp $
+# $NetBSD: Makefile,v 1.47.2.1 2007/03/02 13:02:26 salo Exp $
 
 PKGNAME=               php-${PHP_BASE_VERS}
+PKGREVISION=           1
 CATEGORIES=            lang
 
 HOMEPAGE=              http://www.php.net/
diff -r 46bdc97c3240 -r 4d3a9fb2a9aa lang/php5/Makefile.php
--- a/lang/php5/Makefile.php    Fri Feb 23 11:58:10 2007 +0000
+++ b/lang/php5/Makefile.php    Fri Mar 02 13:02:26 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.21.2.1 2007/02/23 11:56:25 ghen Exp $
+# $NetBSD: Makefile.php,v 1.21.2.2 2007/03/02 13:02:26 salo Exp $
 #
 
 .include "../../lang/php5/Makefile.common"
@@ -50,9 +50,9 @@
 CONFIGURE_ARGS+=       --disable-ipv6
 .endif
 
-#.if !empty(PKG_OPTIONS:Mssl)
-#.  include "../../security/openssl/buildlink3.mk"
-#CONFIGURE_ARGS+=      --with-openssl=${BUILDLINK_PREFIX.openssl}
-#.else
+.if !empty(PKG_OPTIONS:Mssl)
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-openssl=${BUILDLINK_PREFIX.openssl}
+.else
 CONFIGURE_ARGS+=       --without-openssl
-#.endif
+.endif
diff -r 46bdc97c3240 -r 4d3a9fb2a9aa www/ap-php/Makefile
--- a/www/ap-php/Makefile       Fri Feb 23 11:58:10 2007 +0000
+++ b/www/ap-php/Makefile       Fri Mar 02 13:02:26 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2006/10/20 22:10:34 jdolecek Exp $
+# $NetBSD: Makefile,v 1.12.2.1 2007/03/02 13:02:26 salo Exp $
 #
 
 PKGNAME=               ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}-${PHP_BASE_VERS}
-PKGREVISION=           1
+PKGREVISION=           2
 COMMENT=               Apache (${PKG_APACHE}) module for ${PKG_PHP}
 
 CONFLICTS=             ap-php-[0-9]*