use new databases/db layout

db update and these modifications by
Aleksander Piotrowski <aleksander dot piotrowski at nic dot com dot pl>

net/crawl/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2003/09/25 06:25:13 jolan Exp $
+# $OpenBSD: Makefile,v 1.15 2003/12/08 17:42:34 sturm Exp $
 
 COMMENT=		"small and efficient HTTP crawler"
 
@@ -15,12 +15,13 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		http://www.monkey.org/~provos/
 
-LIB_DEPENDS=		db::databases/db
+LIB_DEPENDS=		db.3::databases/db/v3
 
 DESTDIRNAME=		install_prefix
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--with-db="${LOCALBASE}"
+CONFIGURE_ENV=		CFLAGS="${CFLAGS} -I/usr/local/include/db"
 
 WRKDIST=		${WRKDIR}/crawl
 

net/crawl/patches/patch-configure

@@ -0,0 +1,14 @@
+$OpenBSD: patch-configure,v 1.3 2003/12/08 17:42:34 sturm Exp $
+--- configure.orig	2002-01-29 03:37:16.000000000 +0100
++++ configure	2003-12-07 13:36:36.000000000 +0100
+@@ -1017,8 +1017,8 @@ EOF
+ 
+ 	DBINC="-I$withval/dist"
+ 	DBLIB="-L$withval/dist -ldb"
+-     elif test -f $withval/include/db_185.h -a \
+-	       -f $withval/lib/libdb.a; then
++     elif test -f $withval/include/db/db_185.h -a \
++	       -f $withval/lib/db/libdb.a; then
+ 	owd=`pwd`
+ 	if cd $withval; then withval=`pwd`; cd $owd; fi
+ 	cat >> confdefs.h <<\EOF

security/dsniff/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2002/10/28 17:35:01 naddy Exp $
+# $OpenBSD: Makefile,v 1.27 2003/12/08 17:42:34 sturm Exp $
 
 COMMENT=	"sniffing tools for penetration testing"
 
@@ -10,17 +10,20 @@ MASTER_SITES=	http://monkey.org/~dugsong/dsniff/
 HOMEPAGE=	http://www.monkey.org/~dugsong/dsniff/
 
 BUILD_DEPENDS=	::net/libnids
-LIB_DEPENDS=	db.3::databases/db \
+LIB_DEPENDS=	db.3::databases/db/v3 \
 		net::net/libnet
 
 MAINTAINER=	Dug Song <dugsong@monkey.org>
 
+# BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-CONFIGURE_STYLE= autoconf
+CONFIGURE_STYLE=	autoconf
+CONFIGURE_ARGS=		--with-db="${LOCALBASE}"
+CONFIGURE_ENV=		CFLAGS="${CFLAGS} -I/usr/local/include/db"
 
 FLAVORS=	no_x11
 FLAVOR?=

security/dsniff/patches/patch-configure_in

@@ -1,6 +1,24 @@
-$OpenBSD: patch-configure_in,v 1.1 2002/06/07 03:57:05 pvalchev Exp $
---- configure.in.orig	Tue May 28 16:18:35 2002
-+++ configure.in	Tue May 28 16:18:44 2002
+$OpenBSD: patch-configure_in,v 1.2 2003/12/08 17:42:34 sturm Exp $
+--- configure.in.orig	2000-12-03 06:16:50.000000000 +0100
++++ configure.in	2003-12-03 23:11:27.000000000 +0100
+@@ -109,13 +109,13 @@ AC_ARG_WITH(db,
+ 	AC_DEFINE(HAVE_DB_185_H)
+ 	DBINC="-I$withval/dist"
+ 	DBLIB="-L$withval/dist -ldb"
+-     elif test -f $withval/include/db_185.h -a \
+-	       -f $withval/lib/libdb.a; then
++     elif test -f $withval/include/db/db_185.h -a \
++	       -f $withval/lib/db/libdb.a; then
+ 	owd=`pwd`
+ 	if cd $withval; then withval=`pwd`; cd $owd; fi
+ 	AC_DEFINE(HAVE_DB_185_H)
+-	DBINC="-I$withval/include"
+-	DBLIB="-L$withval/lib -ldb"
++	DBINC="-I$withval/include/db"
++	DBLIB="-L$withval/lib/db -ldb"
+      else
+         AC_ERROR(db_185.h or libdb.a not found in $withval or not configured with --enable-compat185)
+      fi
 @@ -307,7 +307,7 @@ AC_ARG_WITH(openssl,
  	owd=`pwd`
  	if cd $withval; then withval=`pwd`; cd $owd; fi

security/dsniff/pkg/DESCR

@@ -1,3 +1 @@
 password sniffer, plus sniffing tools for penetration testing.
-
-WWW: ${HOMEPAGE}