[pkgsrc/trunk]: pkgsrc Net_Socket and Net_SMTP were unbundled from PHP4 in 4....

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/44043f8f298e
branches:  trunk
changeset: 492400:44043f8f298e
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Mon Apr 11 20:08:43 2005 +0000

description:
Net_Socket and Net_SMTP were unbundled from PHP4 in 4.3.11, g/c the related
conditionals and buildlink logic, and convert to standard DEPENDS

diffstat:

 net/pear-Net_SMTP/Makefile        |  11 ++++-------
 net/pear-Net_SMTP/buildlink3.mk   |  25 -------------------------
 net/pear-Net_SMTP/builtin.mk      |  13 -------------
 net/pear-Net_Socket/Makefile      |   9 ++-------
 net/pear-Net_Socket/buildlink3.mk |  25 -------------------------
 net/pear-Net_Socket/builtin.mk    |  18 ------------------
 www/pear-HTML_Common/Makefile     |   7 ++-----
 www/pear-HTTP_Request/Makefile    |   7 ++-----
 8 files changed, 10 insertions(+), 105 deletions(-)

diffs (184 lines):

diff -r d222cb85aac7 -r 44043f8f298e net/pear-Net_SMTP/Makefile
--- a/net/pear-Net_SMTP/Makefile        Mon Apr 11 20:06:36 2005 +0000
+++ b/net/pear-Net_SMTP/Makefile        Mon Apr 11 20:08:43 2005 +0000
@@ -1,16 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2004/11/28 10:21:48 jdolecek Exp $
+# $NetBSD: Makefile,v 1.3 2005/04/11 20:08:43 jdolecek Exp $
 
 DISTNAME=      Net_SMTP-1.2.6
+PKGREVISION=   1
 CATEGORIES+=   net mail
 
 MAINTAINER=    jdolecek%NetBSD.org@localhost
 COMMENT=       PHP classes to provide SMTP Interface
 
-.include "../../lang/php/pear.mk"
+DEPENDS+=      pear-Net_Socket>=1.0.2:../../net/pear-Net_Socket
 
-# used to be bundled before PHP 5.x
-.if ${_PHP_VERSION} < 5
-PKG_SKIP_REASON=       "${PKGBASE} is part of PHP${_PHP_VERSION}"
-.endif
-
+.include "../../lang/php/pear.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r d222cb85aac7 -r 44043f8f298e net/pear-Net_SMTP/buildlink3.mk
--- a/net/pear-Net_SMTP/buildlink3.mk   Mon Apr 11 20:06:36 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/11/27 13:01:16 jdolecek Exp $
-#
-# Net_SMTP was bundled with PHP 4.x, but has been pushed to pear
-# in PHP 5.x. If we build for PHP4, use the bundled version, otherwise 
-# force dependance and install of this package.
-
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
-NETSOCKET_BUILDLINK3_MK:=      ${NETSOCKET_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=    pear-netsmtp
-.endif
-
-BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Npear-netsmtp}
-BUILDLINK_PACKAGES+=   pear-netsmtp
-
-.if !empty(NETSOCKET_BUILDLINK3_MK:M+)
-
-BUILDLINK_DEPENDS.pear-netsmtp+=       pear-Net_SMTP>=1.2.6
-BUILDLINK_PKGSRCDIR.pear-netsmtp?=     ../../net/pear-Net_SMTP
-BUILDLINK_DEPMETHOD.pear-netsmtp?=     full
-
-.endif # NETSOCKET_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r d222cb85aac7 -r 44043f8f298e net/pear-Net_SMTP/builtin.mk
--- a/net/pear-Net_SMTP/builtin.mk      Mon Apr 11 20:06:36 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-# $NetBSD: builtin.mk,v 1.1.1.1 2004/11/27 13:01:16 jdolecek Exp $
-
-.include "../../lang/php/phpversion.mk"
-
-.if ${_PHP_VERSION} < 5
-IS_BUILTIN.pear-netsmtp=       yes
-.else
-IS_BUILTIN.pear-netsmtp=       no
-.endif
-
-USE_BUILTIN.pear-netsmtp?=     ${IS_BUILTIN.pear-netsmtp}
-
-BUILDLINK_VARS+=        IS_BUILTIN.netsmtp
diff -r d222cb85aac7 -r 44043f8f298e net/pear-Net_Socket/Makefile
--- a/net/pear-Net_Socket/Makefile      Mon Apr 11 20:06:36 2005 +0000
+++ b/net/pear-Net_Socket/Makefile      Mon Apr 11 20:08:43 2005 +0000
@@ -1,16 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2004/11/28 10:21:48 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 20:08:43 jdolecek Exp $
 
 DISTNAME=      Net_Socket-1.0.2
+PKGREVISION=   1
 CATEGORIES+=   net
 
 MAINTAINER=    jdolecek%NetBSD.org@localhost
 COMMENT=       PHP classes to provide Network Socket Interface
 
 .include "../../lang/php/pear.mk"
-
-# used to be bundled before PHP 5.x
-.if ${_PHP_VERSION} < 5
-PKG_SKIP_REASON=       "${PKGBASE} is part of PHP${_PHP_VERSION}"
-.endif
-
 .include "../../mk/bsd.pkg.mk"
diff -r d222cb85aac7 -r 44043f8f298e net/pear-Net_Socket/buildlink3.mk
--- a/net/pear-Net_Socket/buildlink3.mk Mon Apr 11 20:06:36 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/11/02 21:52:13 kristerw Exp $
-#
-# Net_Socket was bundled with PHP 4.x, but has been pushed to pear
-# in PHP 5.x. If we build for PHP4, use the bundled version, otherwise 
-# force dependance and install of this package.
-
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
-NETSOCKET_BUILDLINK3_MK:=      ${NETSOCKET_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=    pear-netsocket
-.endif
-
-BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Npear-netsocket}
-BUILDLINK_PACKAGES+=   pear-netsocket
-
-.if !empty(NETSOCKET_BUILDLINK3_MK:M+)
-
-BUILDLINK_DEPENDS.pear-netsocket+=     pear-Net_Socket>=1.0.1
-BUILDLINK_PKGSRCDIR.pear-netsocket?=   ../../net/pear-Net_Socket
-BUILDLINK_DEPMETHOD.pear-netsocket?=   full
-
-.endif # NETSOCKET_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r d222cb85aac7 -r 44043f8f298e net/pear-Net_Socket/builtin.mk
--- a/net/pear-Net_Socket/builtin.mk    Mon Apr 11 20:06:36 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# $NetBSD: builtin.mk,v 1.3 2004/11/27 14:16:39 jdolecek Exp $
-
-.include "../../lang/php/phpversion.mk"
-
-.if ${_PHP_VERSION} <= 4
-IS_BUILTIN.pear-netsocket=     yes
-. if defined(PEAR_NETSOCKET_VERSION_REQD) \
-       && !empty(PEAR_NETSOCKET_VERSION_REQD:M1.0.2)
-# need Net_Socket 1.0.2
-DEPENDS+=              php>=4.3.9nb2:../../www/php4
-.  endif
-.else
-IS_BUILTIN.pear-netsocket=     no
-.endif
-
-USE_BUILTIN.pear-netsocket?=   ${IS_BUILTIN.pear-netsocket}
-
-BUILDLINK_VARS+=        IS_BUILTIN.pear-netsocket
diff -r d222cb85aac7 -r 44043f8f298e www/pear-HTML_Common/Makefile
--- a/www/pear-HTML_Common/Makefile     Mon Apr 11 20:06:36 2005 +0000
+++ b/www/pear-HTML_Common/Makefile     Mon Apr 11 20:08:43 2005 +0000
@@ -1,14 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2004/11/27 13:34:37 jdolecek Exp $
+# $NetBSD: Makefile,v 1.9 2005/04/11 20:08:43 jdolecek Exp $
 
 DISTNAME=      HTML_Common-1.2.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 
 MAINTAINER=    jdolecek%NetBSD.org@localhost
 COMMENT=       Base PHP class for other HTML classes
 
-# This package is base HTML package
-PEAR_DIRRM_BASEDIR=    yes
-
 .include "../../lang/php/pear.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r d222cb85aac7 -r 44043f8f298e www/pear-HTTP_Request/Makefile
--- a/www/pear-HTTP_Request/Makefile    Mon Apr 11 20:06:36 2005 +0000
+++ b/www/pear-HTTP_Request/Makefile    Mon Apr 11 20:08:43 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/11/27 14:23:55 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 20:08:43 jdolecek Exp $
 
 DISTNAME=      HTTP_Request-1.2.3
 #CATEGORIES+=  www
@@ -7,10 +7,7 @@
 COMMENT=       PHP classes to provides an easy way to perform HTTP requests
 
 DEPENDS+=      pear-Net_URL>=1.0.12:../../net/pear-Net_URL
+DEPENDS+=      pear-Net_Socket>=1.0.2:../../net/pear-Net_Socket
 
-# need Net_Socket 1.0.2 or later
-PEAR_NETSOCKET_VERSION_REQD=   1.0.2
-
-.include "../../net/pear-Net_Socket/buildlink3.mk"
 .include "../../lang/php/pear.mk"
 .include "../../mk/bsd.pkg.mk"