summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorlukem <lukem@pkgsrc.org>2001-10-23 07:26:41 +0000
committerlukem <lukem@pkgsrc.org>2001-10-23 07:26:41 +0000
commit39f7310ad5b3f0e6ffbf32f9ad0f3380b4e4efff (patch)
tree97d94fd2dc08764e5c34f4cf175a574ec89a6eff /databases
parentc8b475e108712704e7964582e55592479c3551d8 (diff)
downloadpkgsrc-39f7310ad5b3f0e6ffbf32f9ad0f3380b4e4efff.tar.gz
* Apply two patches from the master distribution site;
3.2.9.1 Fix a bug where running recovery on a database environment containing only logs from a previous release of Berkeley DB, in which log.0000000001 doesn't exist, could fail. 3.2.9.2 Fix a bug where opening too many files causes a core dump. * Use ${BSD_INSTALL_*} instead of cp, so that bin/db3_* and include/db3/* get installed with the correct ownership * Crank version from 2.9 to 2.9.2
Diffstat (limited to 'databases')
-rw-r--r--databases/db3/Makefile8
-rw-r--r--databases/db3/buildlink.mk4
-rw-r--r--databases/db3/distinfo8
-rw-r--r--databases/db3/patches/patch-aa52
4 files changed, 59 insertions, 13 deletions
diff --git a/databases/db3/Makefile b/databases/db3/Makefile
index 521269fd2f6..0ec5c1b6402 100644
--- a/databases/db3/Makefile
+++ b/databases/db3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2001/07/19 19:16:43 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/10/23 07:26:41 lukem Exp $
DISTNAME= db-3.2.9
-PKGNAME= db3-2.9
+PKGNAME= db3-2.9.2
CATEGORIES= databases
MASTER_SITES= http://www.sleepycat.com/update/3.2.9/
@@ -9,6 +9,10 @@ MAINTAINER= wrstuden@netbsd.org
HOMEPAGE= http://www.sleepycat.com/
COMMENT= Sleepycat Software's Berkeley DB version 3
+PATCH_SITES= ${MASTER_SITES}
+PATCHFILES= patch.3.2.9.1 patch.3.2.9.2
+PATCH_DIST_ARGS=-d ${WRKSRC}/.. --forward --quiet
+
USE_BUILDLINK_ONLY= yes
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKDIR}/${DISTNAME}/dist/ltconfig
diff --git a/databases/db3/buildlink.mk b/databases/db3/buildlink.mk
index 710c758057b..2ee93859265 100644
--- a/databases/db3/buildlink.mk
+++ b/databases/db3/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/08/11 11:20:38 rh Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/10/23 07:26:41 lukem Exp $
#
# This Makefile fragment is included by packages that use db3.
#
@@ -17,7 +17,7 @@ DB3_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
-BUILDLINK_DEPENDS.db3?= db3>=2.9
+BUILDLINK_DEPENDS.db3?= db3>=2.9.2
DEPENDS+= ${BUILDLINK_DEPENDS.db3}:../../databases/db3
EVAL_PREFIX+= BUILDLINK_PREFIX.db3=db3
diff --git a/databases/db3/distinfo b/databases/db3/distinfo
index 39909220e8b..c32bb0a397e 100644
--- a/databases/db3/distinfo
+++ b/databases/db3/distinfo
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.3 2001/07/19 19:16:44 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/10/23 07:26:41 lukem Exp $
SHA1 (db-3.2.9.tar.gz) = 1adcc34b6a56e51e4019e80bc56b509ac28e1035
Size (db-3.2.9.tar.gz) = 2085238 bytes
-SHA1 (patch-aa) = 32a39969500b837357c2ce59fb2a90ea82181455
+SHA1 (patch.3.2.9.1) = 34108ae9ce03c40c4d1016e9e54690d5d8fc4135
+Size (patch.3.2.9.1) = 2139 bytes
+SHA1 (patch.3.2.9.2) = c447c089f44c401c174244a7f9f7967522ba92a4
+Size (patch.3.2.9.2) = 495 bytes
+SHA1 (patch-aa) = 08b864ac2c9513c61367efe1c53817f600b420d2
SHA1 (patch-ab) = 7d33cd81c1e23b44d72bb2018624af8dfd08fed4
diff --git a/databases/db3/patches/patch-aa b/databases/db3/patches/patch-aa
index 767ac733028..44d052b7581 100644
--- a/databases/db3/patches/patch-aa
+++ b/databases/db3/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.5 2001/07/19 19:16:45 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2001/10/23 07:26:42 lukem Exp $
---- ../dist/Makefile.in.orig Thu Nov 30 15:07:33 2000
-+++ ../dist/Makefile.in
+--- ../dist/Makefile.in.orig Fri Dec 1 10:07:33 2000
++++ ../dist/Makefile.in Tue Oct 23 17:16:15 2001
@@ -17,7 +17,7 @@
INSTALLER= @INSTALLER@
@@ -197,7 +197,22 @@ $NetBSD: patch-aa,v 1.5 2001/07/19 19:16:45 jlam Exp $
$(CCLINK) -o $@ $(LDFLAGS) \
db_verify@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
$(POSTLINK) $@
-@@ -452,8 +444,6 @@
+@@ -409,12 +401,9 @@
+
+ install_include:
+ @echo "Installing DB include files: $(includedir) ..."
+- @test -d $(includedir) || \
+- ($(mkdir) -p $(includedir) && $(chmod) $(dmode) $(includedir))
+- @cd $(includedir) && $(rm) -f db.h db_185.h db_cxx.h
+- @$(cp) -p db.h \
++ ${BSD_INSTALL_DATA_DIR} $(includedir)
++ ${BSD_INSTALL_DATA} db.h \
+ $(srcdir)/include/db_cxx.h @ADDITIONAL_INCS@ $(includedir)
+- @cd $(includedir) && $(chmod) $(fmode) db.h db_cxx.h @ADDITIONAL_INCS@
+
+ uninstall_include:
+ -cd $(includedir) && $(rm) -f db.h db_185.h db_cxx.h
+@@ -452,8 +441,6 @@
@cd $(libdir) && $(rm) -f \
$(libso_target) $(libso) $(libso_default) $(libso_major)
@$(INSTALLER) $(libso_target) $(libdir)
@@ -206,7 +221,7 @@ $NetBSD: patch-aa,v 1.5 2001/07/19 19:16:45 jlam Exp $
@$(LIBTOOL) --mode=finish $(libdir)
install_dynamic_cxx:
-@@ -463,8 +453,6 @@
+@@ -463,8 +450,6 @@
@cd $(libdir) && $(rm) -f \
$(libxso_target) $(libxso) $(libxso_default) $(libxso_major)
@$(INSTALLER) $(libxso_target) $(libdir)
@@ -215,7 +230,7 @@ $NetBSD: patch-aa,v 1.5 2001/07/19 19:16:45 jlam Exp $
install_tcl:
@echo "Installing DB Tcl library: $(libdir) ..."
-@@ -473,8 +461,6 @@
+@@ -473,8 +458,6 @@
@cd $(libdir) && $(rm) -f \
$(libtso_target) $(libtso) $(libtso_default) $(libtso_major)
@$(INSTALLER) $(libtso_target) $(libdir)
@@ -224,7 +239,7 @@ $NetBSD: patch-aa,v 1.5 2001/07/19 19:16:45 jlam Exp $
install_java:
@echo "Installing DB Java library: $(libdir) ..."
-@@ -483,9 +469,6 @@
+@@ -483,27 +466,21 @@
@cd $(libdir) && $(rm) -f \
$(libjso_target) $(libjso) $(libjso_default) $(libjso_major)
@$(INSTALLER) $(libjso_target) $(libdir)
@@ -234,3 +249,26 @@ $NetBSD: patch-aa,v 1.5 2001/07/19 19:16:45 jlam Exp $
@$(cp) $(JAVA_CLASSTOP)/$(libj_jarfile) $(libdir)
install_utilities:
+ @echo "Installing DB utilities: $(bindir) ..."
+- @test -d $(bindir) || \
+- ($(mkdir) -p $(bindir) && $(chmod) $(dmode) $(bindir))
+- @cd $(bindir) && $(rm) -f $(PROGS)
+- @$(INSTALLER) -fp $(PROGS) $(bindir)
+- @cd $(bindir) && (test ! -f $(strip) || $(strip) $(PROGS))
+- @cd $(bindir) && $(chmod) $(emode) $(PROGS)
++ ${BSD_INSTALL_SCRIPT_DIR} $(includedir) $(bindir)
++ for i in $(PROGS); do \
++ ${BSD_INSTALL_SCRIPT} $$i $(bindir); \
++ done
+
+ uninstall_utilities:
+ -cd $(bindir) && $(rm) -f $(PROGS)
+
+ install_docs:
+ @echo "Installing documentation: $(docdir) ..."
+- @test -d $(docdir) || \
+- ($(mkdir) -p $(docdir) && $(chmod) $(dmode) $(docdir))
++ ${BSD_INSTALL_DATA_DIR} $(docdir)
+ @cd $(docdir) && $(rm) -rf *
+ @cd $(srcdir)/docs && $(cp) -pr * $(docdir)/
+