Upgrade bundled Net_Socket to 1.0.2 and Net_SMTP to 1.2.6 on installation.

These include some important bug fixes, and some other pear packages
require the newer versions.

Bump PKGREVISION, and BUILDLINK_RECOMMENDED.

3 files changed, 15 insertions, 6 deletions

diff --git a/www/php4/Makefile b/www/php4/Makefile
index 8ad68a8ca50..fa298f1b3db 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2004/04/24 23:03:25 xtraeme Exp $
+# $NetBSD: Makefile,v 1.39 2004/11/27 14:00:08 jdolecek Exp $
 
 PKGNAME=		php-${PHP_BASE_VERS}
 CATEGORIES+=		lang
@@ -36,6 +36,11 @@ MAKE_ENV+=		EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
 CONF_FILES=	${EGDIR}/php.ini-recommended ${PKG_SYSCONFDIR}/php.ini
 OWN_DIRS=	${PREFIX}/${PHP_EXTENSION_DIR}
 
+# some of the bundled Pear extensions have newer versions, which fix
+# some known bugs
+PEAR_CMD=	${PREFIX}/bin/pear
+UPGRADE_PKG=	Net_SMTP-1.2.6 Net_Socket-1.0.2
+
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${PREFIX}/bin/php
 	${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 ${PREFIX}/man/man1/php.1
@@ -46,4 +51,8 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/php
 	${INSTALL_DATA} ${WRKSRC}/php.gif ${PREFIX}/share/php
 
+	for p in ${UPGRADE_PKG}; do \
+		${PEAR_CMD} upgrade $$p; \
+	done
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php
index 85d79e3abea..de6816b5f54 100644
--- a/www/php4/Makefile.php
+++ b/www/php4/Makefile.php
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.php,v 1.18 2004/10/03 00:18:27 tv Exp $
+# $NetBSD: Makefile.php,v 1.19 2004/11/27 14:00:08 jdolecek Exp $
 
 .include "../../www/php4/Makefile.common"
 
-# revision of the core PHP interepreter package
-PKGREVISION=		1
+# revision of the core PHP interpreter package
+PKGREVISION=		2
 
 DISTINFO_FILE=		${.CURDIR}/../../www/php4/distinfo
 PATCHDIR=		${.CURDIR}/../../www/php4/patches
diff --git a/www/php4/buildlink3.mk b/www/php4/buildlink3.mk
index a91892e1dd6..1309076fba6 100644
--- a/www/php4/buildlink3.mk
+++ b/www/php4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/31 18:20:02 jdolecek Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/11/27 14:00:08 jdolecek Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PHP_BUILDLINK3_MK:=	${PHP_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	php
 
 .if !empty(PHP_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.php+=		php-4.3.*
-BUILDLINK_RECOMMENDED.php+=	php>=4.3.9nb1
+BUILDLINK_RECOMMENDED.php+=	php>=4.3.9nb2
 BUILDLINK_PKGSRCDIR.php?=	../../www/php4
 
 # Use full dependency for extension and pear modules