From 7bd809aca3c4de6dd2bb2f9a1259090217787b3a Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Fri, 26 Nov 2010 14:23:31 +0000
Subject: [PATCH] db/v3 meets PKGSPEC

---
 chinese/libtabe/Makefile | 4 ++--
 databases/db/v3/Makefile | 6 ++++--
 mail/bogofilter/Makefile | 4 ++--
 net/crawl/Makefile       | 4 ++--
 security/dsniff/Makefile | 4 ++--
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/chinese/libtabe/Makefile b/chinese/libtabe/Makefile
index b92061a62c0..2e5011e62e3 100644
--- a/chinese/libtabe/Makefile
+++ b/chinese/libtabe/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2010/11/15 00:22:50 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2010/11/26 14:23:31 espie Exp $
 
 COMMENT=	library for Chinese language processing
 
@@ -22,7 +22,7 @@ WANTLIB += c lib/db/db=3
 
 MASTER_SITES=	http://www.kpvs.tp.edu.tw/
 
-LIB_DEPENDS=	db->=3,<4:databases/db/v3
+LIB_DEPENDS=	databases/db/v3
 
 USE_LIBTOOL=	Yes
 CONFIGURE_STYLE= gnu dest
diff --git a/databases/db/v3/Makefile b/databases/db/v3/Makefile
index 00c43e5abce..3b3075cc512 100644
--- a/databases/db/v3/Makefile
+++ b/databases/db/v3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2010/11/15 00:22:51 espie Exp $
+# $OpenBSD: Makefile,v 1.24 2010/11/26 14:23:31 espie Exp $
 
 REV=		3
 DBLIBDIR=	lib/db
@@ -10,6 +10,8 @@ REVISION-tcl=	8
 SHARED_LIBS +=	db                   3.1      # .0.0
 SHARED_LIBS +=	db_cxx               4.0      # .0.0
 SHARED_LIBS +=	db_tcl               4.0      # .0.0
+PKGSPEC-main =	db->=3,<4
+# XXX PKGSPEC-tcl ?
 
 CONFIGURE_STYLE=gnu dest
 
@@ -18,7 +20,7 @@ WANTLIB=c
 
 WANTLIB-tcl =		m ${MODTCL_WANTLIB}
 LIB_DEPENDS-tcl =	${MODTCL_LIB_DEPENDS}
-RUN_DEPENDS-tcl =	db->=3,<4:databases/db/v${REV}
+RUN_DEPENDS-tcl =	databases/db/v${REV}
 
 pre-configure:
 	@${SUBST_CMD} ${WRKSRC}/test/include.tcl
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index da544721781..c4efec5df5e 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2010/11/19 07:23:05 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2010/11/26 14:23:31 espie Exp $
 
 COMMENT =	bayesian spam filter
 
@@ -39,7 +39,7 @@ WANTLIB +=		qdbm>=11
 .else
 BROKEN-hppa =		configure stuck on testing if BDB supports shared environments
 DB_DIR =		db
-LIB_DEPENDS +=		db->=3,<4:databases/db/v3
+LIB_DEPENDS +=		databases/db/v3
 WANTLIB +=		lib/db/db=3
 .endif
 
diff --git a/net/crawl/Makefile b/net/crawl/Makefile
index 0a91648e2e0..0c4e3a36a99 100644
--- a/net/crawl/Makefile
+++ b/net/crawl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2010/11/22 10:27:12 espie Exp $
+# $OpenBSD: Makefile,v 1.28 2010/11/26 14:23:31 espie Exp $
 
 COMMENT=		small and efficient HTTP crawler
 
@@ -18,7 +18,7 @@ WANTLIB=		c event lib/db/db=3
 
 MASTER_SITES=		http://www.monkey.org/~provos/
 
-LIB_DEPENDS=		db->=3,<4:databases/db/v3
+LIB_DEPENDS=		databases/db/v3
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--with-db="${LOCALBASE}"
diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile
index 56a4ba6c44c..d389f571ed0 100644
--- a/security/dsniff/Makefile
+++ b/security/dsniff/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.53 2010/11/20 17:22:43 espie Exp $
+# $OpenBSD: Makefile,v 1.54 2010/11/26 14:23:31 espie Exp $
 
 COMMENT=	sniffing tools for penetration testing
 
@@ -11,7 +11,7 @@ MASTER_SITES=	http://monkey.org/~dugsong/dsniff/
 HOMEPAGE=	http://www.monkey.org/~dugsong/dsniff/
 
 BUILD_DEPENDS=	net/libnids
-LIB_DEPENDS=	db->=3,<4:databases/db/v3 \
+LIB_DEPENDS=	databases/db/v3 \
 		libnet->=1.0,<1.1:net/libnet/1.0
 WANTLIB=	c crypto pcap ssl rpcsvc lib/db/db=3 lib/libnet-1.0/net=0