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

6 files changed, 6 insertions, 95 deletions

diff --git a/net/pear-Net_SMTP/Makefile b/net/pear-Net_SMTP/Makefile
index 68f9bc756ee..83f14c72e46 100644
--- a/net/pear-Net_SMTP/Makefile
+++ b/net/pear-Net_SMTP/Makefile
@@ -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
 COMMENT=	PHP classes to provide SMTP 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
+DEPENDS+=	pear-Net_Socket>=1.0.2:../../net/pear-Net_Socket
 
+.include "../../lang/php/pear.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/pear-Net_SMTP/buildlink3.mk b/net/pear-Net_SMTP/buildlink3.mk
deleted file mode 100644
index 85bc0d766c1..00000000000
--- a/net/pear-Net_SMTP/buildlink3.mk
+++ /dev/null
@@ -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 --git a/net/pear-Net_SMTP/builtin.mk b/net/pear-Net_SMTP/builtin.mk
deleted file mode 100644
index 918d6b0de60..00000000000
--- a/net/pear-Net_SMTP/builtin.mk
+++ /dev/null
@@ -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 --git a/net/pear-Net_Socket/Makefile b/net/pear-Net_Socket/Makefile
index 6e76a887f0f..0f3df37b19a 100644
--- a/net/pear-Net_Socket/Makefile
+++ b/net/pear-Net_Socket/Makefile
@@ -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
 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 --git a/net/pear-Net_Socket/buildlink3.mk b/net/pear-Net_Socket/buildlink3.mk
deleted file mode 100644
index 3076ad706d5..00000000000
--- a/net/pear-Net_Socket/buildlink3.mk
+++ /dev/null
@@ -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 --git a/net/pear-Net_Socket/builtin.mk b/net/pear-Net_Socket/builtin.mk
deleted file mode 100644
index 3c95452f238..00000000000
--- a/net/pear-Net_Socket/builtin.mk
+++ /dev/null
@@ -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