From f7ec16df077e4e5798e1513cd4c4a0e8bf29fd72 Mon Sep 17 00:00:00 2001
From: sturm <sturm@openbsd.org>
Date: Mon, 8 Dec 2003 17:39:16 +0000
Subject: [PATCH] resolve conflict

---
 databases/db/Makefile | 66 +++----------------------------------------
 1 file changed, 4 insertions(+), 62 deletions(-)

diff --git a/databases/db/Makefile b/databases/db/Makefile
index ca3a27ee254..d5f26422b3e 100644
--- a/databases/db/Makefile
+++ b/databases/db/Makefile
@@ -1,64 +1,6 @@
-# $OpenBSD: Makefile,v 1.32 2003/06/17 00:35:32 avsm Exp $
+# $OpenBSD: Makefile,v 1.33 2003/12/08 17:39:16 sturm Exp $
 
-COMMENT=	"Berkeley DB package, revision 3"
+     SUBDIR+= v3
+     SUBDIR+= v4
 
-VMM=		3.1
-VERSION=	${VMM}.17
-DISTNAME=	db-${VERSION}
-CATEGORIES=	databases
-HOMEPAGE=	http://www.sleepycat.com/
-MASTER_SITES=	${HOMEPAGE}/update/snapshot/
-
-TCL_VERSION=	8.3
-
-# License: BSD+SleepyCat's additions.
-# Must purchase license to redistribute if not distributing the source.
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
-
-CONFIGURE_STYLE=	gnu dest
-CONFIGURE_SCRIPT=	../dist/configure
-CONFIGURE_ARGS+=	--enable-compat185 
-CONFIGURE_ARGS+=	--enable-dump185
-CONFIGURE_ARGS+=	--enable-cxx
-CONFIGURE_ARGS+=	--enable-static
-CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
-
-MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC} ${WRKSRC}/dist
-
-WRKBUILD=	${WRKDIST}/build_unix
-
-FLAVORS=	tcl
-FLAVOR?=
-
-.if ${FLAVOR:L:Mtcl}
-# We can't use NO_SHARED_LIBS and IGNORE because IGNORE
-# is only handled by bsd.port.mk and NO_SHARED_LIBS doesn't get
-# defined until bsd.port.mk..
-NOT_FOR_ARCHS=	hppa mvme88k vax
-LIB_DEPENDS+=	tcl83.1.3::lang/tcl/${TCL_VERSION}
-# Argh.
-CFLAGS+=-I${LOCALBASE}/include/tcl${TCL_VERSION}
-CONFIGURE_ARGS+= --enable-tcl 
-CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/lib/tcl${TCL_VERSION}
-# Regression suite requires Tcl.
-CONFIGURE_ARGS+= --enable-test
-
-do-regress:
-	@cd ${WRKBUILD}; tclsh${TCL_VERSION} ${FILESDIR}/regress.tcl
-.else
-CONFIGURE_ARGS+= --disable-tcl
-NO_REGRESS=	Yes
-.endif
-
-post-install:
-	@mv ${PREFIX}/include/db.h ${PREFIX}/include/db3.h
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/db
-	cd ${WRKSRC}/examples_c; ${INSTALL_DATA} *.c \
-		${PREFIX}/share/examples/db
-	cd ${WRKSRC}/examples_cxx; ${INSTALL_DATA} *.cpp \
-		${PREFIX}/share/examples/db
-
-.include <bsd.port.mk>
+.include <bsd.port.subdir.mk>