Add package for berkeley-db module of lang/clisp. Remove conflicting bdb

option from lang/clisp.

8 files changed, 88 insertions, 10 deletions

diff --git a/databases/Makefile b/databases/Makefile
index 10bbd5fc7d5..74942eb5381 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.367 2011/03/10 22:00:23 wiz Exp $
+# $NetBSD: Makefile,v 1.368 2011/04/20 18:31:36 hans Exp $
 #
 
 COMMENT=	Databases
@@ -8,6 +8,7 @@ SUBDIR+=	adodb
 SUBDIR+=	apache-cassandra
 SUBDIR+=	bdb-xml
 SUBDIR+=	cdb
+SUBDIR+=	clisp-bdb
 SUBDIR+=	clisp-gdbm
 SUBDIR+=	clisp-pgsql
 SUBDIR+=	couchdb
diff --git a/databases/clisp-bdb/DESCR b/databases/clisp-bdb/DESCR
new file mode 100644
index 00000000000..c8a530e0cdc
--- /dev/null
+++ b/databases/clisp-bdb/DESCR
@@ -0,0 +1 @@
+CLISP Berkeley DB module
diff --git a/databases/clisp-bdb/Makefile b/databases/clisp-bdb/Makefile
new file mode 100644
index 00000000000..9b149d7e93c
--- /dev/null
+++ b/databases/clisp-bdb/Makefile
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1 2011/04/20 18:31:36 hans Exp $
+#
+
+CLISP_MODULE=	berkeley-db
+
+PKGNAME=	clisp-bdb-$(CLISP_VERSION)
+CATEGORIES=	databases
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=clisp/}
+
+MAINTAINER=	hans@netbsd.org
+HOMEPAGE=	http://clisp.cons.org/
+COMMENT=	CLISP Berkeley DB module
+
+MAKE_JOBS_SAFE=	no
+
+.include "../../lang/clisp/module.mk"
+
+BUILDLINK_TRANSFORM+=   l:db:db4
+.include "../../databases/db4/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/databases/clisp-bdb/PLIST b/databases/clisp-bdb/PLIST
new file mode 100644
index 00000000000..38f3e07bbdc
--- /dev/null
+++ b/databases/clisp-bdb/PLIST
@@ -0,0 +1,10 @@
+@comment $NetBSD: PLIST,v 1.1 2011/04/20 18:31:36 hans Exp $
+lib/clisp/dynmod/bdb.lisp
+lib/clisp/dynmod/lib-bdb.so
+lib/clisp/berkeley-db/Makefile
+lib/clisp/berkeley-db/bdb.o
+lib/clisp/berkeley-db/dbi.fas
+lib/clisp/berkeley-db/dbi.lisp
+lib/clisp/berkeley-db/link.sh
+lib/clisp/berkeley-db/preload.lisp
+
diff --git a/databases/clisp-bdb/distinfo b/databases/clisp-bdb/distinfo
new file mode 100644
index 00000000000..7c4760daa61
--- /dev/null
+++ b/databases/clisp-bdb/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2011/04/20 18:31:36 hans Exp $
+
+SHA1 (clisp-2.49.tar.gz) = 1743e7917013162400c955af441e991db43b3323
+RMD160 (clisp-2.49.tar.gz) = ae30f3b681cb023e885c6e4ed12210ee5ba14c76
+Size (clisp-2.49.tar.gz) = 9823111 bytes
+SHA1 (patch-aa) = 659055c81e01a3e1bffe6f4609712624d6d1dcba
+SHA1 (patch-ab) = bd098a22833ddcfd24f9b3055bab6239ae412805
diff --git a/databases/clisp-bdb/patches/patch-aa b/databases/clisp-bdb/patches/patch-aa
new file mode 100644
index 00000000000..6136a1c47de
--- /dev/null
+++ b/databases/clisp-bdb/patches/patch-aa
@@ -0,0 +1,26 @@
+$NetBSD: patch-aa,v 1.1 2011/04/20 18:31:36 hans Exp $
+
+Override ac_install_sh.
+
+--- modules/berkeley-db/configure.orig	2010-07-09 13:00:01.000000000 +0400
++++ modules/berkeley-db/configure	2010-07-09 13:00:20.000000000 +0400
+@@ -2285,19 +2285,6 @@
+ required=true
+ ${required} && test $cl_cv_have_clisp = no && as_fn_error "CLISP not found" "$LINENO" 5
+ 
+-ac_aux_dir=
+-for ac_dir in $cl_cv_clisp_libdir/build-aux "$srcdir"/$cl_cv_clisp_libdir/build-aux; do
+-  for ac_t in install-sh install.sh shtool; do
+-    if test -f "$ac_dir/$ac_t"; then
+-      ac_aux_dir=$ac_dir
+-      ac_install_sh="$ac_aux_dir/$ac_t -c"
+-      break 2
+-    fi
+-  done
+-done
+-if test -z "$ac_aux_dir"; then
+-  as_fn_error "cannot find install-sh, install.sh, or shtool in $cl_cv_clisp_libdir/build-aux \"$srcdir\"/$cl_cv_clisp_libdir/build-aux" "$LINENO" 5
+-fi
+ 
+ # These three variables are undocumented and unsupported,
+ # and are intended to be withdrawn in a future Autoconf release.
diff --git a/databases/clisp-bdb/patches/patch-ab b/databases/clisp-bdb/patches/patch-ab
new file mode 100644
index 00000000000..c4fece787f5
--- /dev/null
+++ b/databases/clisp-bdb/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2011/04/20 18:31:36 hans Exp $
+
+--- modules/berkeley-db/Makefile.in.orig	2010-03-24 20:44:56.000000000 +0100
++++ modules/berkeley-db/Makefile.in	2011-04-20 16:21:26.184581749 +0200
+@@ -3,7 +3,7 @@
+ srcdir = @srcdir@
+ CC = @CC@
+ DBCPPFLAGS = @CPPFLAGS@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CLISP_CFLAGS@
+ CLISP = @CLISP@ -norc -q
+ CLISP_LINKKIT = @CLISP_LINKKIT@
+ 
diff --git a/lang/clisp/options.mk b/lang/clisp/options.mk
index f01c15527fe..129e6155746 100644
--- a/lang/clisp/options.mk
+++ b/lang/clisp/options.mk
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.4 2010/07/09 18:08:05 asau Exp $
+# $NetBSD: options.mk,v 1.5 2011/04/20 18:31:35 hans Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.clisp
 
 # this option is essential for some others to work:
 PKG_SUPPORTED_OPTIONS+=		ffcall
 
-PKG_SUPPORTED_OPTIONS+=		bdb pari wildcard
+PKG_SUPPORTED_OPTIONS+=		pari wildcard
 PKG_SUPPORTED_OPTIONS+=		readline
 
 PKG_OPTIONS_OPTIONAL_GROUPS=	x11-bindings
@@ -42,13 +42,6 @@ CONFIGURE_ARGS+=	--with-dynamic-ffi
 .  include "../../devel/ffcall/buildlink3.mk"
 .endif
 
-.if !empty(PKG_OPTIONS:Mbdb)
-# it requires version 4, not anything older
-CONFIGURE_ARGS+=	--with-module=berkeley-db
-BUILDLINK_TRANSFORM+=	l:db:db46
-.  include "../../databases/db46/buildlink3.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mpari)
 CONFIGURE_ARGS+=	--with-module=pari
 .  include "../../math/pari/buildlink3.mk"
@@ -79,6 +72,13 @@ CONFIGURE_ARGS+=	--with-readline
 
 # Options for those who wishes to build "static" CLISP:
 
+#.if !empty(PKG_OPTIONS:Mbdb)
+# it requires version 4, not anything older
+#CONFIGURE_ARGS+=	--with-module=berkeley-db
+#BUILDLINK_TRANSFORM+=	l:db:db46
+#.  include "../../databases/db46/buildlink3.mk"
+#.endif
+
 # .if !empty(PKG_OPTIONS:Mpgsql)
 # CONFIGURE_ARGS+=       --with-module=postgresql
 # .  include "../../mk/pgsql.buildlink3.mk"