summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--chinese/libtabe/Makefile3
-rw-r--r--chinese/libtabe/files/patch-src::tabe_tsidbint.c10
-rw-r--r--chinese/libtabe/files/patch-src::tabe_tsiyindbint.c10
-rw-r--r--chinese/xcin25/Makefile4
-rw-r--r--databases/db3/Makefile3
-rw-r--r--databases/db3/distinfo6
-rw-r--r--databases/db3/files/patch-dist::Makefile.in147
-rw-r--r--databases/db3/files/patch-dist::configure37
-rw-r--r--databases/db3/pkg-plist185
-rw-r--r--databases/p5-BerkeleyDB/Makefile11
-rw-r--r--databases/p5-BerkeleyDB/distinfo2
-rw-r--r--databases/py-bsddb3/Makefile3
-rw-r--r--databases/rdfdb/Makefile3
-rw-r--r--databases/rdfdb/files/patch-librdf::rdflib.c20
-rw-r--r--databases/ruby-bdb/Makefile3
-rw-r--r--devel/gconf/Makefile3
-rw-r--r--dns/fastresolve/Makefile3
-rw-r--r--editors/nvi-devel/Makefile6
-rw-r--r--editors/poedit/Makefile4
-rw-r--r--mail/cyrus-imapd/Makefile4
-rw-r--r--mail/cyrus-imapd2/Makefile4
-rw-r--r--mail/cyrus-imapd22/Makefile4
-rw-r--r--mail/cyrus-imapd23/Makefile4
-rw-r--r--mail/cyrus-imapd24/Makefile4
-rw-r--r--mail/drac/Makefile4
-rw-r--r--mail/drac/files/patch-aa4
-rw-r--r--mail/isync/Makefile3
-rw-r--r--mail/kiltdown/Makefile4
-rw-r--r--net/netatalk-devel/Makefile3
-rw-r--r--net/netatalk/Makefile3
-rw-r--r--net/openldap2/Makefile3
-rw-r--r--net/openldap20-server/Makefile3
-rw-r--r--net/openldap20/Makefile3
-rw-r--r--net/openldap21-server/Makefile3
-rw-r--r--net/openldap21/Makefile3
-rw-r--r--net/openldap22-server/Makefile3
-rw-r--r--net/openldap22/Makefile3
-rw-r--r--net/openldap23-server/Makefile3
-rw-r--r--net/openldap24-server/Makefile3
-rw-r--r--security/cyrus-sasl/Makefile2
-rw-r--r--security/cyrus-sasl/scripts/configure.sasl2
-rw-r--r--security/cyrus-sasl2/Makefile2
-rw-r--r--security/cyrus-sasl2/scripts/configure.sasl2
-rw-r--r--sysutils/cfengine/Makefile4
-rw-r--r--sysutils/cfengine3-legacy/Makefile4
-rw-r--r--sysutils/cfengine3/Makefile4
-rw-r--r--sysutils/fastresolve/Makefile3
-rw-r--r--www/crawl/Makefile3
-rw-r--r--www/squidguard/Makefile7
49 files changed, 324 insertions, 240 deletions
diff --git a/chinese/libtabe/Makefile b/chinese/libtabe/Makefile
index 971f6d776700..9197bf65f6b7 100644
--- a/chinese/libtabe/Makefile
+++ b/chinese/libtabe/Makefile
@@ -7,13 +7,14 @@
PORTNAME= libtabe
PORTVERSION= 0.2.5
+PORTREVISION= 1
CATEGORIES= chinese
MASTER_SITES= ftp://xcin.linux.org.tw/pub/xcin/libtabe/devel/
MAINTAINER= kcwu@ck.tp.edu.tw
.if !defined(USE_DB2)
-LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
.else
LIB_DEPENDS= db2.0:${PORTSDIR}/databases/db
.endif
diff --git a/chinese/libtabe/files/patch-src::tabe_tsidbint.c b/chinese/libtabe/files/patch-src::tabe_tsidbint.c
new file mode 100644
index 000000000000..9bb3c612b45b
--- /dev/null
+++ b/chinese/libtabe/files/patch-src::tabe_tsidbint.c
@@ -0,0 +1,10 @@
+--- src/tabe_tsidbint.c.orig Sun Nov 11 12:33:07 2001
++++ src/tabe_tsidbint.c Thu Aug 22 02:14:53 2002
+@@ -267,3 +267,7 @@
+ dbp = (DB *)tsidb->dbp;
++#ifndef HAVE_DB3
+ errno = dbp->stat(dbp, &sp, NULL, 0);
++#else
++ errno = dbp->stat(dbp, &sp, 0);
++#endif
+ if (!errno) {
diff --git a/chinese/libtabe/files/patch-src::tabe_tsiyindbint.c b/chinese/libtabe/files/patch-src::tabe_tsiyindbint.c
new file mode 100644
index 000000000000..57e27d85288d
--- /dev/null
+++ b/chinese/libtabe/files/patch-src::tabe_tsiyindbint.c
@@ -0,0 +1,10 @@
+--- src/tabe_tsiyindbint.c.orig Sun Nov 11 12:33:08 2001
++++ src/tabe_tsiyindbint.c Thu Aug 22 02:16:00 2002
+@@ -270,3 +270,7 @@
+ dbp = (DB *)tsiyindb->dbp;
++#ifndef HAVE_DB3
+ errno = dbp->stat(dbp, &sp, NULL, 0);
++#else
++ errno = dbp->stat(dbp, &sp, 0);
++#endif
+ if (!errno) {
diff --git a/chinese/xcin25/Makefile b/chinese/xcin25/Makefile
index 7bfe2334364b..c6011da08786 100644
--- a/chinese/xcin25/Makefile
+++ b/chinese/xcin25/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xcin
PORTVERSION= 2.5.3.p2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= chinese x11
MASTER_SITES= ftp://xcin.linux.org.tw/pub/xcin/xcin/ \
ftp://xcin.linux.org.tw/pub/xcin/xcin/devel/ \
@@ -21,7 +21,7 @@ LIB_DEPENDS= tabe.2:${PORTSDIR}/chinese/libtabe \
intl.4:${PORTSDIR}/devel/gettext \
iconv.3:${PORTSDIR}/converters/libiconv
.if !defined(USE_DB2)
-LIB_DEPENDS+= db3.2:${PORTSDIR}/databases/db3
+LIB_DEPENDS+= db3.3:${PORTSDIR}/databases/db3
.else
LIB_DEPENDS+= db2.0:${PORTSDIR}/databases/db
.endif
diff --git a/databases/db3/Makefile b/databases/db3/Makefile
index d9fa7ea24fa5..e93f7b77ea52 100644
--- a/databases/db3/Makefile
+++ b/databases/db3/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= db3
-PORTVERSION= 3.2.9
-PORTREVISION= 3
+PORTVERSION= 3.3.11
PORTEPOCH?= 1
CATEGORIES= databases
MASTER_SITES= http://www.sleepycat.com/update/snapshot/
diff --git a/databases/db3/distinfo b/databases/db3/distinfo
index 6eeb2e243e88..13533543c89f 100644
--- a/databases/db3/distinfo
+++ b/databases/db3/distinfo
@@ -1,3 +1,3 @@
-MD5 (bdb/db-3.2.9.tar.gz) = 4df5c7051b11411e0a970f6c91613942
-MD5 (bdb/patch.3.2.9.1) = 9cf113248f29b1e319ae73b266df4986
-MD5 (bdb/patch.3.2.9.2) = f8edd1cf6535cd62f9b8ff81e0474273
+MD5 (bdb/db-3.3.11.tar.gz) = b6ae24fa55713f17a9ac3219d987722c
+MD5 (bdb/patch.3.3.11.1) = b5649f4f1232e6ae801d387a9a149190
+MD5 (bdb/patch.3.3.11.2) = fca939f74fc6555e1319626ceca35b33
diff --git a/databases/db3/files/patch-dist::Makefile.in b/databases/db3/files/patch-dist::Makefile.in
index 5e0f454ea8c0..aeb257e31f24 100644
--- a/databases/db3/files/patch-dist::Makefile.in
+++ b/databases/db3/files/patch-dist::Makefile.in
@@ -1,86 +1,88 @@
---- ../dist/Makefile.in.orig Fri Dec 1 02:07:33 2000
-+++ ../dist/Makefile.in Tue Dec 25 13:10:15 2001
-@@ -33,12 +33,12 @@
+--- ../dist/Makefile.in.orig Fri Jul 6 15:53:16 2001
++++ ../dist/Makefile.in Tue May 14 12:26:13 2002
+@@ -11,7 +11,7 @@
+ bindir= @bindir@
+ includedir=@includedir@
+ libdir= @libdir@
+-docdir= $(prefix)/docs
++docdir= $(prefix)/share/doc/db3
- libdb= libdb.a
+ dmode= 755
+ emode= 555
+@@ -61,12 +61,12 @@
+ LIBSO_LIBS= @LIBSO_LIBS@
+ libdb= libdb.a
-libso_base= libdb
--libso_linkname= $(libso_base)-$(SOVERSION).la
-libso= $(libso_base)-$(SOVERSION).@SOSUFFIX@
+-libso_static= $(libso_base)-$(SOVERSION).a
-libso_target= $(libso_base)-$(SOVERSION).la
+libso_base= libdb$(SOMAJOR)
-+libso_linkname= $(libso_base).la
+libso= $(libso_base).@SOSUFFIX@
++libso_static= $(libso_base).a
+libso_target= $(libso_base).la
libso_default= $(libso_base).@SOSUFFIX@
-libso_major= $(libso_base)-$(SOMAJOR).@SOSUFFIX@
-+libso_major= $(libso_base).@SOSUFFIX@.2
++libso_major= $(libso_base).@SOSUFFIX@.3
##################################################
- # C++
-@@ -47,12 +47,12 @@
- # You must configure it using:
- # --enable-cxx
- ##################################################
+ # C++ API.
+@@ -78,13 +78,13 @@
+ CXXLINK= @MAKEFILE_CXXLINK@
+ LIBXSO_LIBS= @LIBXSO_LIBS@
+
-libcxx= libdb_cxx.a
-libxso_base= libdb_cxx
-libxso= $(libxso_base)-$(SOVERSION).@SOSUFFIX@
+-libxso_static= $(libxso_base)-$(SOVERSION).a
-libxso_target= $(libxso_base)-$(SOVERSION).la
+libcxx= libdb3_cxx.a
+libxso_base= libdb3_cxx
+libxso= $(libxso_base).@SOSUFFIX@
++libxso_static= $(libxso_base).a
+libxso_target= $(libxso_base).la
libxso_default= $(libxso_base).@SOSUFFIX@
-libxso_major= $(libxso_base)-$(SOMAJOR).@SOSUFFIX@
-+libxso_major= $(libxso_base).@SOSUFFIX@.2
++libxso_major= $(libxso_base).@SOSUFFIX@.3
##################################################
- # JAVA
-@@ -115,7 +115,7 @@
- bindir= @bindir@
- includedir=@includedir@
- libdir= @libdir@
--docdir= $(prefix)/docs
-+docdir= $(prefix)/share/doc/db3
+ # Java API.
+@@ -239,8 +239,8 @@
+ perf_util@o@
- dmode= 755
- emode= 555
-@@ -192,8 +192,8 @@
- db_dump@o@ db_load@o@ db_printlog@o@ db_recover@o@ db_stat@o@ \
- db_upgrade@o@ db_verify@o@ util_log@o@ util_sig@o@
-
--PROGS= @ADDITIONAL_PROGS@ db_archive db_checkpoint db_deadlock \
+ UTIL_PROGS=\
+- @ADDITIONAL_PROGS@ db_archive db_checkpoint db_deadlock \
- db_dump db_load db_printlog db_recover db_stat db_upgrade db_verify
-+PROGS= @ADDITIONAL_PROGS@ db3_archive db3_checkpoint db3_deadlock \
++ @ADDITIONAL_PROGS@ db3_archive db3_checkpoint db3_deadlock \
+ db3_dump db3_load db3_printlog db3_recover db3_stat db3_upgrade db3_verify
- JAVA_DBSRCS=\
- $(JAVA_DBDIR)/Db.java $(JAVA_DBDIR)/DbAppendRecno.java \
-@@ -279,53 +279,53 @@
- $(CCLINK) -o $@ $(LDFLAGS) $(RPC_SRV) util_log@o@ $(LIBDB_ARGS) $(LIBS)
+ ##################################################
+ # We're building a standard library or a RPM file hierarchy, potentially
+@@ -298,53 +298,53 @@
+ $(RPC_SRV_OBJS) util_log@o@ $(DEF_LIB) $(LIBS)
$(POSTLINK) $@
--db_archive: db_archive@o@ util_sig@o@ @DEFAULT_LIB@
-+db3_archive: db_archive@o@ util_sig@o@ @DEFAULT_LIB@
+-db_archive: db_archive@o@ util_sig@o@ $(DEF_LIB)
++db3_archive: db_archive@o@ util_sig@o@ $(DEF_LIB)
$(CCLINK) -o $@ $(LDFLAGS) \
- db_archive@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
+ db_archive@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
$(POSTLINK) $@
--db_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ @DEFAULT_LIB@
-+db3_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ @DEFAULT_LIB@
+-db_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB)
++db3_checkpoint: db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB)
$(CCLINK) -o $@ $(LDFLAGS) \
- db_checkpoint@o@ util_log@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
+ db_checkpoint@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
$(POSTLINK) $@
--db_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ @DEFAULT_LIB@
-+db3_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ @DEFAULT_LIB@
+-db_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB)
++db3_deadlock: db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB)
$(CCLINK) -o $@ $(LDFLAGS) \
- db_deadlock@o@ util_log@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
+ db_deadlock@o@ util_log@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
$(POSTLINK) $@
--db_dump: db_dump@o@ util_sig@o@ @DEFAULT_LIB@
-+db3_dump: db_dump@o@ util_sig@o@ @DEFAULT_LIB@
- $(CCLINK) -o $@ $(LDFLAGS) db_dump@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
+-db_dump: db_dump@o@ util_sig@o@ $(DEF_LIB)
++db3_dump: db_dump@o@ util_sig@o@ $(DEF_LIB)
+ $(CCLINK) -o $@ $(LDFLAGS) db_dump@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
$(POSTLINK) $@
-db_dump185: db_dump185@o@ @LIBOBJS@
@@ -88,58 +90,61 @@
$(CCLINK) -o $@ $(LDFLAGS) db_dump185@o@ @LIBOBJS@ $(DB185LIB)
$(POSTLINK) $@
--db_load: db_load@o@ util_sig@o@ @DEFAULT_LIB@
-+db3_load: db_load@o@ util_sig@o@ @DEFAULT_LIB@
- $(CCLINK) -o $@ $(LDFLAGS) db_load@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
+-db_load: db_load@o@ util_sig@o@ $(DEF_LIB)
++db3_load: db_load@o@ util_sig@o@ $(DEF_LIB)
+ $(CCLINK) -o $@ $(LDFLAGS) db_load@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
$(POSTLINK) $@
--db_printlog: db_printlog@o@ util_sig@o@ @DEFAULT_LIB@
-+db3_printlog: db_printlog@o@ util_sig@o@ @DEFAULT_LIB@
+-db_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB)
++db3_printlog: db_printlog@o@ util_sig@o@ $(DEF_LIB)
$(CCLINK) -o $@ $(LDFLAGS) \
- db_printlog@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
+ db_printlog@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
$(POSTLINK) $@
--db_recover: db_recover@o@ util_sig@o@ @DEFAULT_LIB@
-+db3_recover: db_recover@o@ util_sig@o@ @DEFAULT_LIB@
+-db_recover: db_recover@o@ util_sig@o@ $(DEF_LIB)
++db3_recover: db_recover@o@ util_sig@o@ $(DEF_LIB)
$(CCLINK) -o $@ $(LDFLAGS) \
- db_recover@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
+ db_recover@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
$(POSTLINK) $@
--db_stat: db_stat@o@ util_sig@o@ @DEFAULT_LIB@
-+db3_stat: db_stat@o@ util_sig@o@ @DEFAULT_LIB@
- $(CCLINK) -o $@ $(LDFLAGS) db_stat@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
+-db_stat: db_stat@o@ util_sig@o@ $(DEF_LIB)
++db3_stat: db_stat@o@ util_sig@o@ $(DEF_LIB)
+ $(CCLINK) -o $@ $(LDFLAGS) db_stat@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
$(POSTLINK) $@
--db_upgrade: db_upgrade@o@ util_sig@o@ @DEFAULT_LIB@
-+db3_upgrade: db_upgrade@o@ util_sig@o@ @DEFAULT_LIB@
+-db_upgrade: db_upgrade@o@ util_sig@o@ $(DEF_LIB)
++db3_upgrade: db_upgrade@o@ util_sig@o@ $(DEF_LIB)
$(CCLINK) -o $@ $(LDFLAGS) \
- db_upgrade@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
+ db_upgrade@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
$(POSTLINK) $@
--db_verify: db_verify@o@ util_sig@o@ @DEFAULT_LIB@
-+db3_verify: db_verify@o@ util_sig@o@ @DEFAULT_LIB@
+-db_verify: db_verify@o@ util_sig@o@ $(DEF_LIB)
++db3_verify: db_verify@o@ util_sig@o@ $(DEF_LIB)
$(CCLINK) -o $@ $(LDFLAGS) \
- db_verify@o@ util_sig@o@ $(LIBDB_ARGS) $(LIBS)
+ db_verify@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
$(POSTLINK) $@
-@@ -452,8 +452,8 @@
+@@ -401,10 +401,9 @@
@cd $(libdir) && $(rm) -f \
- $(libso_target) $(libso) $(libso_default) $(libso_major)
+ $(libso) $(libso_target) $(libso_default) $(libso_major)
@$(INSTALLER) $(libso_target) $(libdir)
- @cd $(libdir) && $(ln) -s $(libso) $(libso_default)
- @cd $(libdir) && $(ln) -s $(libso) $(libso_major)
-+ @cd $(libdir) && $(chmod) $(fmode) $(libso_major)
-+# @cd $(libdir) && $(ln) -s $(libso_major) $(libso_default)
@$(LIBTOOL) --mode=finish $(libdir)
+- @cd $(libdir) && $(chmod) $(fmode) $(libso) $(libso_target)
++ @$(rm) -f $(libdir)/$(libso_target)
++ @cd $(libdir) && $(chmod) $(fmode) $(libso)
- install_dynamic_cxx:
-@@ -463,8 +463,8 @@
+ install_static_cxx:
+ @echo "Installing DB C++ static library: $(libdir) ..."
+@@ -421,9 +420,8 @@
@cd $(libdir) && $(rm) -f \
- $(libxso_target) $(libxso) $(libxso_default) $(libxso_major)
+ $(libxso) $(libxso_target) $(libxso_default) $(libxso_major)
@$(INSTALLER) $(libxso_target) $(libdir)
- @cd $(libdir) && $(ln) -s $(libxso) $(libxso_default)
- @cd $(libdir) && $(ln) -s $(libxso) $(libxso_major)
-+ @cd $(libdir) && $(chmod) $(fmode) $(libxso_major)
-+# @cd $(libdir) && $(ln) -s $(libxso_major) $(libxso_default)
+- @cd $(libdir) && $(chmod) $(fmode) $(libxso) $(libxso_target)
++ @$(rm) -f $(libdir)/$(libxso_target)
++ @cd $(libdir) && $(chmod) $(fmode) $(libxso)
install_tcl:
@echo "Installing DB Tcl library: $(libdir) ..."
diff --git a/databases/db3/files/patch-dist::configure b/databases/db3/files/patch-dist::configure
index eb05bc929de4..48e44c8708c1 100644
--- a/databases/db3/files/patch-dist::configure
+++ b/databases/db3/files/patch-dist::configure
@@ -1,33 +1,20 @@
---- ../dist/configure.orig Tue Dec 25 12:41:16 2001
-+++ ../dist/configure Tue Dec 25 12:50:29 2001
-@@ -1626,9 +1626,9 @@
- echo $ac_n "checking libtool configuration""... $ac_c" 1>&6
- echo "configure:1628: checking libtool configuration" >&5
- echo "$ac_t""" 1>&6
-- ${CONFIG_SHELL-/bin/sh} $srcdir/ltconfig \
-- --no-verify $srcdir/ltmain.sh \
-- --output=./libtool $host_os \
-+ ${CONFIG_SHELL-/bin/sh} %%LOCALBASE%%/share/libtool/ltconfig \
-+ --no-verify --disable-ltlibs %%LOCALBASE%%/share/libtool/ltmain.sh $target \
-+ --output=./libtool \
- --disable-static \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+--- ../dist/configure.orig Tue May 14 12:23:44 2002
++++ ../dist/configure Tue May 14 12:24:11 2002
+@@ -8449,7 +8449,7 @@
+ MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${SAVE_CC}"
+ MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${SAVE_CXX}"
-@@ -1644,7 +1644,7 @@
+-SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} -avoid-version"
++SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} -version-info ${DB_VERSION_MINOR}"
+ INSTALLER="\$(LIBTOOL) --mode=install cp"
- INSTALLER="\$(LIBTOOL) --mode=install cp"
- POSTLINK="\$(LIBTOOL) --mode=execute true"
-- SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} -avoid-version"
-+ SOLINK="\$(LIBTOOL) --mode=link ${SAVE_CC} -version-info ${DB_VERSION_MINOR}"
- SOFLAGS="-rpath \$(libdir)"
- o=".lo"
- fi
-@@ -2093,7 +2093,7 @@
- fi
+ # Configure for shared libraries, static libraries, or both. If both are
+@@ -9100,7 +9100,7 @@
+ # Optional utilities.
if test "$db_cv_dump185" = "yes"; then
- ADDITIONAL_PROGS="db_dump185 $ADDITIONAL_PROGS"
+ ADDITIONAL_PROGS="db3_dump185 $ADDITIONAL_PROGS"
fi
- echo $ac_n "checking for pthread_create in "-pthread"""... $ac_c" 1>&6
+ # test servers, example programs.
diff --git a/databases/db3/pkg-plist b/databases/db3/pkg-plist
index 855f9e8f0e8e..267d8aa7b539 100644
--- a/databases/db3/pkg-plist
+++ b/databases/db3/pkg-plist
@@ -9,15 +9,20 @@ bin/db3_recover
bin/db3_stat
bin/db3_upgrade
bin/db3_verify
+include/db3/cxx_common.h
+include/db3/cxx_except.h
include/db3/db.h
include/db3/db_185.h
include/db3/db_cxx.h
+lib/libdb3.a
lib/libdb3.so
-lib/libdb3.so.2
+lib/libdb3.so.3
+lib/libdb3_cxx.a
lib/libdb3_cxx.so
-lib/libdb3_cxx.so.2
+lib/libdb3_cxx.so.3
share/doc/db3/api_c/c_index.html
share/doc/db3/api_c/c_pindex.html
+share/doc/db3/api_c/db_associate.html
share/doc/db3/api_c/db_close.html
share/doc/db3/api_c/db_create.html
share/doc/db3/api_c/db_cursor.html
@@ -34,6 +39,7 @@ share/doc/db3/api_c/db_open.html
share/doc/db3/api_c/db_put.html
share/doc/db3/api_c/db_remove.html
share/doc/db3/api_c/db_rename.html
+share/doc/db3/api_c/db_set_alloc.html
share/doc/db3/api_c/db_set_append_recno.html
share/doc/db3/api_c/db_set_bt_compare.html
share/doc/db3/api_c/db_set_bt_minkey.html
@@ -49,7 +55,6 @@ share/doc/db3/api_c/db_set_h_ffactor.html
share/doc/db3/api_c/db_set_h_hash.html
share/doc/db3/api_c/db_set_h_nelem.html
share/doc/db3/api_c/db_set_lorder.html
-share/doc/db3/api_c/db_set_malloc.html
share/doc/db3/api_c/db_set_pagesize.html
share/doc/db3/api_c/db_set_paniccall.html
share/doc/db3/api_c/db_set_q_extentsize.html
@@ -57,9 +62,9 @@ share/doc/db3/api_c/db_set_re_delim.html
share/doc/db3/api_c/db_set_re_len.html
share/doc/db3/api_c/db_set_re_pad.html
share/doc/db3/api_c/db_set_re_source.html
-share/doc/db3/api_c/db_set_realloc.html
share/doc/db3/api_c/db_stat.html
share/doc/db3/api_c/db_sync.html
+share/doc/db3/api_c/db_truncate.html
share/doc/db3/api_c/db_upgrade.html
share/doc/db3/api_c/db_verify.html
share/doc/db3/api_c/dbc_close.html
@@ -70,10 +75,13 @@ share/doc/db3/api_c/dbc_get.html
share/doc/db3/api_c/dbc_put.html
share/doc/db3/api_c/dbm.html
share/doc/db3/api_c/dbt.html
+share/doc/db3/api_c/dbt_bulk.html
share/doc/db3/api_c/env_close.html
share/doc/db3/api_c/env_create.html
+share/doc/db3/api_c/env_err.html
share/doc/db3/api_c/env_open.html
share/doc/db3/api_c/env_remove.html
+share/doc/db3/api_c/env_set_alloc.html
share/doc/db3/api_c/env_set_cachesize.html
share/doc/db3/api_c/env_set_data_dir.html
share/doc/db3/api_c/env_set_errcall.html
@@ -84,6 +92,7 @@ share/doc/db3/api_c/env_set_flags.html
share/doc/db3/api_c/env_set_lg_bsize.html
share/doc/db3/api_c/env_set_lg_dir.html
share/doc/db3/api_c/env_set_lg_max.html
+share/doc/db3/api_c/env_set_lg_regionmax.html
share/doc/db3/api_c/env_set_lk_conflicts.html
share/doc/db3/api_c/env_set_lk_detect.html
share/doc/db3/api_c/env_set_lk_max.html
@@ -97,7 +106,7 @@ share/doc/db3/api_c/env_set_paniccall.html
share/doc/db3/api_c/env_set_panicstate.html
share/doc/db3/api_c/env_set_rec_init.html
share/doc/db3/api_c/env_set_region_init.html
-share/doc/db3/api_c/env_set_server.html
+share/doc/db3/api_c/env_set_rpc_server.html
share/doc/db3/api_c/env_set_shm_key.html
share/doc/db3/api_c/env_set_tas_spins.html
share/doc/db3/api_c/env_set_tmp_dir.html
@@ -157,11 +166,14 @@ share/doc/db3/api_c/txn_abort.html
share/doc/db3/api_c/txn_begin.html
share/doc/db3/api_c/txn_checkpoint.html
share/doc/db3/api_c/txn_commit.html
+share/doc/db3/api_c/txn_discard.html
share/doc/db3/api_c/txn_id.html
share/doc/db3/api_c/txn_prepare.html
+share/doc/db3/api_c/txn_recover.html
share/doc/db3/api_c/txn_stat.html
share/doc/db3/api_cxx/cxx_index.html
share/doc/db3/api_cxx/cxx_pindex.html
+share/doc/db3/api_cxx/db_associate.html
share/doc/db3/api_cxx/db_class.html
share/doc/db3/api_cxx/db_close.html
share/doc/db3/api_cxx/db_cursor.html
@@ -177,6 +189,7 @@ share/doc/db3/api_cxx/db_open.html
share/doc/db3/api_cxx/db_put.html
share/doc/db3/api_cxx/db_remove.html
share/doc/db3/api_cxx/db_rename.html
+share/doc/db3/api_cxx/db_set_alloc.html
share/doc/db3/api_cxx/db_set_append_recno.html
share/doc/db3/api_cxx/db_set_bt_compare.html
share/doc/db3/api_cxx/db_set_bt_minkey.html
@@ -192,7 +205,6 @@ share/doc/db3/api_cxx/db_set_h_ffactor.html
share/doc/db3/api_cxx/db_set_h_hash.html
share/doc/db3/api_cxx/db_set_h_nelem.html
share/doc/db3/api_cxx/db_set_lorder.html
-share/doc/db3/api_cxx/db_set_malloc.html
share/doc/db3/api_cxx/db_set_pagesize.html
share/doc/db3/api_cxx/db_set_paniccall.html
share/doc/db3/api_cxx/db_set_q_extentsize.html
@@ -200,9 +212,9 @@ share/doc/db3/api_cxx/db_set_re_delim.html
share/doc/db3/api_cxx/db_set_re_len.html
share/doc/db3/api_cxx/db_set_re_pad.html
share/doc/db3/api_cxx/db_set_re_source.html
-share/doc/db3/api_cxx/db_set_realloc.html
share/doc/db3/api_cxx/db_stat.html
share/doc/db3/api_cxx/db_sync.html
+share/doc/db3/api_cxx/db_truncate.html
share/doc/db3/api_cxx/db_upgrade.html
share/doc/db3/api_cxx/db_verify.html
share/doc/db3/api_cxx/dbc_class.html
@@ -213,10 +225,13 @@ share/doc/db3/api_cxx/dbc_dup.html
share/doc/db3/api_cxx/dbc_get.html
share/doc/db3/api_cxx/dbc_put.html
share/doc/db3/api_cxx/dbenv_class.html
+share/doc/db3/api_cxx/dbt_bulk.html
share/doc/db3/api_cxx/dbt_class.html
share/doc/db3/api_cxx/env_close.html
+share/doc/db3/api_cxx/env_err.html
share/doc/db3/api_cxx/env_open.html
share/doc/db3/api_cxx/env_remove.html
+share/doc/db3/api_cxx/env_set_alloc.html
share/doc/db3/api_cxx/env_set_cachesize.html
share/doc/db3/api_cxx/env_set_data_dir.html
share/doc/db3/api_cxx/env_set_errcall.html
@@ -228,11 +243,12 @@ share/doc/db3/api_cxx/env_set_flags.html
share/doc/db3/api_cxx/env_set_lg_bsize.html
share/doc/db3/api_cxx/env_set_lg_dir.html
share/doc/db3/api_cxx/env_set_lg_max.html
+share/doc/db3/api_cxx/env_set_lg_regionmax.html
share/doc/db3/api_cxx/env_set_lk_conflicts.html
share/doc/db3/api_cxx/env_set_lk_detect.html
share/doc/db3/api_cxx/env_set_lk_max.html
-share/doc/db3/api_cxx/env_set_lk_max_lockers.html
-share/doc/db3/api_cxx/env_set_lk_max_locks.html
+share/doc/db3/api_cxx/env_set_lk_max_lockers.html
+share/doc/db3/api_cxx/env_set_lk_max_locks.html
share/doc/db3/api_cxx/env_set_lk_max_objects.html
share/doc/db3/api_cxx/env_set_mp_mmapsize.html
share/doc/db3/api_cxx/env_set_mutexlocks.html
@@ -241,7 +257,7 @@ share/doc/db3/api_cxx/env_set_paniccall.html
share/doc/db3/api_cxx/env_set_panicstate.html
share/doc/db3/api_cxx/env_set_rec_init.html
share/doc/db3/api_cxx/env_set_region_init.html
-share/doc/db3/api_cxx/env_set_server.html
+share/doc/db3/api_cxx/env_set_rpc_server.html
share/doc/db3/api_cxx/env_set_shm_key.html
share/doc/db3/api_cxx/env_set_tas_spins.html
share/doc/db3/api_cxx/env_set_tmp_dir.html
@@ -252,6 +268,7 @@ share/doc/db3/api_cxx/env_set_verbose.html
share/doc/db3/api_cxx/env_strerror.html
share/doc/db3/api_cxx/env_version.html
share/doc/db3/api_cxx/except_class.html
+share/doc/db3/api_cxx/get_dbt.html
share/doc/db3/api_cxx/get_errno.html
share/doc/db3/api_cxx/lock_class.html
share/doc/db3/api_cxx/lock_detect.html
@@ -270,6 +287,7 @@ share/doc/db3/api_cxx/log_register.html
share/doc/db3/api_cxx/log_stat.html
share/doc/db3/api_cxx/log_unregister.html
share/doc/db3/api_cxx/lsn_class.html
+share/doc/db3/api_cxx/mem_class.html
share/doc/db3/api_cxx/memp_fclose.html
share/doc/db3/api_cxx/memp_fget.html
share/doc/db3/api_cxx/memp_fopen.html
@@ -287,10 +305,13 @@ share/doc/db3/api_cxx/txn_begin.html
share/doc/db3/api_cxx/txn_checkpoint.html
share/doc/db3/api_cxx/txn_class.html
share/doc/db3/api_cxx/txn_commit.html
+share/doc/db3/api_cxx/txn_discard.html
share/doc/db3/api_cxx/txn_id.html
share/doc/db3/api_cxx/txn_prepare.html
+share/doc/db3/api_cxx/txn_recover.html
share/doc/db3/api_cxx/txn_stat.html
share/doc/db3/api_cxx/what.html
+share/doc/db3/api_java/db_associate.html
share/doc/db3/api_java/db_class.html
share/doc/db3/api_java/db_close.html
share/doc/db3/api_java/db_cursor.html
@@ -327,6 +348,7 @@ share/doc/db3/api_java/db_set_re_pad.html
share/doc/db3/api_java/db_set_re_source.html
share/doc/db3/api_java/db_stat.html
share/doc/db3/api_java/db_sync.html
+share/doc/db3/api_java/db_truncate.html
share/doc/db3/api_java/db_upgrade.html
share/doc/db3/api_java/db_verify.html
share/doc/db3/api_java/dbc_class.html
@@ -337,6 +359,7 @@ share/doc/db3/api_java/dbc_dup.html
share/doc/db3/api_java/dbc_get.html
share/doc/db3/api_java/dbc_put.html
share/doc/db3/api_java/dbenv_class.html
+share/doc/db3/api_java/dbt_bulk_class.html
share/doc/db3/api_java/dbt_class.html
share/doc/db3/api_java/deadlock_class.html
share/doc/db3/api_java/env_close.html
@@ -352,6 +375,7 @@ share/doc/db3/api_java/env_set_flags.html
share/doc/db3/api_java/env_set_lg_bsize.html
share/doc/db3/api_java/env_set_lg_dir.html
share/doc/db3/api_java/env_set_lg_max.html
+share/doc/db3/api_java/env_set_lg_regionmax.html
share/doc/db3/api_java/env_set_lk_conflicts.html
share/doc/db3/api_java/env_set_lk_detect.html
share/doc/db3/api_java/env_set_lk_max.html
@@ -364,7 +388,7 @@ share/doc/db3/api_java/env_set_pageyield.html
share/doc/db3/api_java/env_set_panicstate.html
share/doc/db3/api_java/env_set_rec_init.html
share/doc/db3/api_java/env_set_region_init.html
-share/doc/db3/api_java/env_set_server.html
+share/doc/db3/api_java/env_set_rpc_server.html
share/doc/db3/api_java/env_set_shm_key.html
share/doc/db3/api_java/env_set_tas_spins.html
share/doc/db3/api_java/env_set_tmp_dir.html
@@ -375,6 +399,7 @@ share/doc/db3/api_java/env_set_verbose.html
share/doc/db3/api_java/env_strerror.html
share/doc/db3/api_java/env_version.html
share/doc/db3/api_java/except_class.html
+share/doc/db3/api_java/get_dbt.html
share/doc/db3/api_java/get_errno.html
share/doc/db3/api_java/java_index.html
share/doc/db3/api_java/java_pindex.html
@@ -413,8 +438,10 @@ share/doc/db3/api_java/txn_begin.html
share/doc/db3/api_java/txn_checkpoint.html
share/doc/db3/api_java/txn_class.html
share/doc/db3/api_java/txn_commit.html
+share/doc/db3/api_java/txn_discard.html
share/doc/db3/api_java/txn_id.html
share/doc/db3/api_java/txn_prepare.html
+share/doc/db3/api_java/txn_recover.html
share/doc/db3/api_java/txn_stat.html
share/doc/db3/api_tcl/db_close.html
share/doc/db3/api_tcl/db_count.html
@@ -431,6 +458,7 @@ share/doc/db3/api_tcl/db_remove.html
share/doc/db3/api_tcl/db_rename.html
share/doc/db3/api_tcl/db_stat.html
share/doc/db3/api_tcl/db_sync.html
+share/doc/db3/api_tcl/db_truncate.html
share/doc/db3/api_tcl/dbc_close.html
share/doc/db3/api_tcl/dbc_del.html
share/doc/db3/api_tcl/dbc_dup.html
@@ -462,17 +490,16 @@ share/doc/db3/ref/am/curget.html
share/doc/db3/ref/am/curput.html
share/doc/db3/ref/am/cursor.html
share/doc/db3/ref/am/delete.html
-share/doc/db3/ref/am/error.html
share/doc/db3/ref/am/get.html
share/doc/db3/ref/am/join.html
share/doc/db3/ref/am/open.html
share/doc/db3/ref/am/opensub.html
share/doc/db3/ref/am/ops.html
-share/doc/db3/ref/am/partial.html
share/doc/db3/ref/am/put.html
-share/doc/db3/ref/am/stability.html
+share/doc/db3/ref/am/second.html
share/doc/db3/ref/am/stat.html
share/doc/db3/ref/am/sync.html
+share/doc/db3/ref/am/truncate.html
share/doc/db3/ref/am/upgrade.html
share/doc/db3/ref/am/verify.html
share/doc/db3/ref/am_conf/bt_compare.html
@@ -494,6 +521,16 @@ share/doc/db3/ref/am_conf/re_source.html
share/doc/db3/ref/am_conf/recno.html
share/doc/db3/ref/am_conf/renumber.html
share/doc/db3/ref/am_conf/select.html
+share/doc/db3/ref/am_misc/align.html
+share/doc/db3/ref/am_misc/dbsizes.html
+share/doc/db3/ref/am_misc/diskspace.html
+share/doc/db3/ref/am_misc/error.html
+share/doc/db3/ref/am_misc/faq.html
+share/doc/db3/ref/am_misc/get_bulk.html
+share/doc/db3/ref/am_misc/partial.html
+share/doc/db3/ref/am_misc/perm.html
+share/doc/db3/ref/am_misc/stability.html
+share/doc/db3/ref/am_misc/tune.html
share/doc/db3/ref/arch/apis.html
share/doc/db3/ref/arch/bigpic.gif
share/doc/db3/ref/arch/bigpic.html
@@ -503,6 +540,7 @@ share/doc/db3/ref/arch/smallpic.gif
share/doc/db3/ref/arch/utilities.html
share/doc/db3/ref/build_unix/aix.html
share/doc/db3/ref/build_unix/conf.html
+share/doc/db3/ref/build_unix/embedix.html
share/doc/db3/ref/build_unix/flags.html
share/doc/db3/ref/build_unix/freebsd.html
share/doc/db3/ref/build_unix/hpux.html
@@ -538,6 +576,7 @@ share/doc/db3/ref/dumpload/text.html
share/doc/db3/ref/dumpload/utility.html
share/doc/db3/ref/env/create.html
share/doc/db3/ref/env/error.html
+share/doc/db3/ref/env/faq.html
share/doc/db3/ref/env/intro.html
share/doc/db3/ref/env/naming.html
share/doc/db3/ref/env/open.html
@@ -548,6 +587,8 @@ share/doc/db3/ref/install/file.html
share/doc/db3/ref/install/magic.s5.be.txt
share/doc/db3/ref/install/magic.s5.le.txt
share/doc/db3/ref/install/magic.txt
+share/doc/db3/ref/install/multiple.html
+share/doc/db3/ref/install/rpm.html
share/doc/db3/ref/intro/data.html
share/doc/db3/ref/intro/dbis.html
share/doc/db3/ref/intro/dbisnot.html
@@ -580,11 +621,8 @@ share/doc/db3/ref/mp/intro.html
share/doc/db3/ref/perl/intro.html
share/doc/db3/ref/pindex.src
share/doc/db3/ref/program/appsignals.html
-share/doc/db3/ref/program/byteorder.html
share/doc/db3/ref/program/compatible.html
share/doc/db3/ref/program/copy.html
-share/doc/db3/ref/program/dbsizes.html
-share/doc/db3/ref/program/diskspace.html
share/doc/db3/ref/program/environ.html
share/doc/db3/ref/program/errorret.html
share/doc/db3/ref/program/extending.html
@@ -594,7 +632,6 @@ share/doc/db3/ref/program/recimp.html
share/doc/db3/ref/program/runtime.html
share/doc/db3/ref/program/scope.html
share/doc/db3/ref/program/solaris.txt
-share/doc/db3/ref/program/version.html
share/doc/db3/ref/refs/bdb_usenix.html
share/doc/db3/ref/refs/bdb_usenix.ps
share/doc/db3/ref/refs/embedded.html
@@ -609,7 +646,7 @@ share/doc/db3/ref/sendmail/intro.html
share/doc/db3/ref/simple_tut/close.html
share/doc/db3/ref/simple_tut/del.html
share/doc/db3/ref/simple_tut/errors.html
-share/doc/db3/ref/simple_tut/example.txt
+share/doc/db3/ref/simple_tut/example.cs
share/doc/db3/ref/simple_tut/get.html
share/doc/db3/ref/simple_tut/handles.html
share/doc/db3/ref/simple_tut/intro.html
@@ -623,7 +660,6 @@ share/doc/db3/ref/tcl/program.html
share/doc/db3/ref/tcl/using.html
share/doc/db3/ref/test/faq.html
share/doc/db3/ref/test/run.html
-share/doc/db3/ref/toc.html
share/doc/db3/ref/transapp/admin.html
share/doc/db3/ref/transapp/app.html
share/doc/db3/ref/transapp/archival.html
@@ -632,23 +668,25 @@ share/doc/db3/ref/transapp/cursor.html
share/doc/db3/ref/transapp/data_open.html
share/doc/db3/ref/transapp/deadlock.html
share/doc/db3/ref/transapp/env_open.html
+share/doc/db3/ref/transapp/faq.html
share/doc/db3/ref/transapp/filesys.html
share/doc/db3/ref/transapp/inc.html
share/doc/db3/ref/transapp/intro.html
share/doc/db3/ref/transapp/logfile.html
+share/doc/db3/ref/transapp/nested.html
share/doc/db3/ref/transapp/put.html
share/doc/db3/ref/transapp/read.html
share/doc/db3/ref/transapp/reclimit.html
share/doc/db3/ref/transapp/recovery.html
share/doc/db3/ref/transapp/term.html
share/doc/db3/ref/transapp/throughput.html
-share/doc/db3/ref/transapp/transapp.txt
+share/doc/db3/ref/transapp/transapp.cs
+share/doc/db3/ref/transapp/tune.html
share/doc/db3/ref/transapp/why.html
-share/doc/db3/ref/transapp/writetest.txt
+share/doc/db3/ref/transapp/writetest.cs
share/doc/db3/ref/txn/config.html
share/doc/db3/ref/txn/intro.html
share/doc/db3/ref/txn/limits.html
-share/doc/db3/ref/txn/nested.html
share/doc/db3/ref/txn/other.html
share/doc/db3/ref/upgrade.2.0/convert.html
share/doc/db3/ref/upgrade.2.0/disk.html
@@ -717,10 +755,26 @@ share/doc/db3/ref/upgrade.3.2/renumber.html
share/doc/db3/ref/upgrade.3.2/set_flags.html
share/doc/db3/ref/upgrade.3.2/toc.html
share/doc/db3/ref/upgrade.3.2/tx_recover.html
+share/doc/db3/ref/upgrade.3.3/alloc.html
+share/doc/db3/ref/upgrade.3.3/bigfile.html
+share/doc/db3/ref/upgrade.3.3/conflict.html
+share/doc/db3/ref/upgrade.3.3/disk.html
+share/doc/db3/ref/upgrade.3.3/getswap.html
+share/doc/db3/ref/upgrade.3.3/gettype.html
+share/doc/db3/ref/upgrade.3.3/intro.html
+share/doc/db3/ref/upgrade.3.3/memp_fget.html
+share/doc/db3/ref/upgrade.3.3/rpc.html
+share/doc/db3/ref/upgrade.3.3/shared.html
+share/doc/db3/ref/upgrade.3.3/toc.html
+share/doc/db3/ref/upgrade.3.3/txn_prepare.html
share/doc/db3/ref/upgrade/process.html
-share/doc/db3/ref/xa/config.html
+share/doc/db3/ref/upgrade/version.html
+share/doc/db3/ref/xa/build.html
share/doc/db3/ref/xa/faq.html
share/doc/db3/ref/xa/intro.html
+share/doc/db3/ref/xa/xa_config.html
+share/doc/db3/ref/xa/xa_intro.html
+share/doc/db3/reftoc.html
share/doc/db3/sleepycat/contact.html
share/doc/db3/sleepycat/legal.html
share/doc/db3/sleepycat/license.html
@@ -736,46 +790,49 @@ share/doc/db3/utility/db_stat.html
share/doc/db3/utility/db_upgrade.html
share/doc/db3/utility/db_verify.html
share/doc/db3/utility/index.html
-@dirrm include/db3
-@dirrm share/doc/db3/api_c
-@dirrm share/doc/db3/api_cxx
-@dirrm share/doc/db3/api_java
-@dirrm share/doc/db3/api_tcl
-@dirrm share/doc/db3/images
-@dirrm share/doc/db3/ref/am
-@dirrm share/doc/db3/ref/am_conf
-@dirrm share/doc/db3/ref/arch
-@dirrm share/doc/db3/ref/build_unix
-@dirrm share/doc/db3/ref/build_vxworks
-@dirrm share/doc/db3/ref/build_win
-@dirrm share/doc/db3/ref/cam
-@dirrm share/doc/db3/ref/debug
-@dirrm share/doc/db3/ref/distrib
-@dirrm share/doc/db3/ref/dumpload
-@dirrm share/doc/db3/ref/env
-@dirrm share/doc/db3/ref/install
-@dirrm share/doc/db3/ref/intro
-@dirrm share/doc/db3/ref/java
-@dirrm share/doc/db3/ref/lock
-@dirrm share/doc/db3/ref/log
-@dirrm share/doc/db3/ref/mp
-@dirrm share/doc/db3/ref/perl
-@dirrm share/doc/db3/ref/program
-@dirrm share/doc/db3/ref/refs
-@dirrm share/doc/db3/ref/rpc
-@dirrm share/doc/db3/ref/sendmail
-@dirrm share/doc/db3/ref/simple_tut
-@dirrm share/doc/db3/ref/tcl
-@dirrm share/doc/db3/ref/test
-@dirrm share/doc/db3/ref/transapp
-@dirrm share/doc/db3/ref/txn
-@dirrm share/doc/db3/ref/upgrade
-@dirrm share/doc/db3/ref/upgrade.2.0
-@dirrm share/doc/db3/ref/upgrade.3.0
-@dirrm share/doc/db3/ref/upgrade.3.1
-@dirrm share/doc/db3/ref/upgrade.3.2
+@dirrm share/doc/db3/utility
+@dirrm share/doc/db3/sleepycat
@dirrm share/doc/db3/ref/xa
+@dirrm share/doc/db3/ref/upgrade.3.3
+@dirrm share/doc/db3/ref/upgrade.3.2
+@dirrm share/doc/db3/ref/upgrade.3.1
+@dirrm share/doc/db3/ref/upgrade.3.0
+@dirrm share/doc/db3/ref/upgrade.2.0
+@dirrm share/doc/db3/ref/upgrade
+@dirrm share/doc/db3/ref/txn
+@dirrm share/doc/db3/ref/transapp
+@dirrm share/doc/db3/ref/test
+@dirrm share/doc/db3/ref/tcl
+@dirrm share/doc/db3/ref/splash
+@dirrm share/doc/db3/ref/simple_tut
+@dirrm share/doc/db3/ref/sendmail
+@dirrm share/doc/db3/ref/rpc
+@dirrm share/doc/db3/ref/refs
+@dirrm share/doc/db3/ref/program
+@dirrm share/doc/db3/ref/perl
+@dirrm share/doc/db3/ref/mp
+@dirrm share/doc/db3/ref/log
+@dirrm share/doc/db3/ref/lock
+@dirrm share/doc/db3/ref/java
+@dirrm share/doc/db3/ref/intro
+@dirrm share/doc/db3/ref/install
+@dirrm share/doc/db3/ref/env
+@dirrm share/doc/db3/ref/dumpload
+@dirrm share/doc/db3/ref/distrib
+@dirrm share/doc/db3/ref/debug
+@dirrm share/doc/db3/ref/cam
+@dirrm share/doc/db3/ref/build_win
+@dirrm share/doc/db3/ref/build_vxworks
+@dirrm share/doc/db3/ref/build_unix
+@dirrm share/doc/db3/ref/arch
+@dirrm share/doc/db3/ref/am_misc
+@dirrm share/doc/db3/ref/am_conf
+@dirrm share/doc/db3/ref/am
@dirrm share/doc/db3/ref
-@dirrm share/doc/db3/sleepycat
-@dirrm share/doc/db3/utility
+@dirrm share/doc/db3/images
+@dirrm share/doc/db3/api_tcl
+@dirrm share/doc/db3/api_java
+@dirrm share/doc/db3/api_cxx
+@dirrm share/doc/db3/api_c
@dirrm share/doc/db3
+@dirrm include/db3
diff --git a/databases/p5-BerkeleyDB/Makefile b/databases/p5-BerkeleyDB/Makefile
index 01793893e451..9c5424223ec5 100644
--- a/databases/p5-BerkeleyDB/Makefile
+++ b/databases/p5-BerkeleyDB/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= BerkeleyDB
-PORTVERSION= 0.15
-PORTREVISION= 2
+PORTVERSION= 0.19
CATEGORIES= databases perl5
MASTER_SITES= $(MASTER_SITE_PERL_CPAN)
MASTER_SITE_SUBDIR= BerkeleyDB
@@ -15,7 +14,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= bill@twwells.com
-LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
PERL_CONFIGURE= yes
ALL_TARGET= all test
@@ -24,9 +23,9 @@ MAN3= BerkeleyDB.3
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
post-patch:
- ${PERL} -pi -e 's|^(INCLUDE\s+= )./libraries/.*$$|$$1\$(PREFIX)/include/db3|g; \
- s|^(LIB\s+= )./libraries/.*$$|$$1$(PREFIX)/lib|g' ${WRKSRC}/config.in
- ${PERL} -pi -e 's|^#DBNAME.*|DBNAME = -ldb3|' ${WRKSRC}/config.in
+ @${ECHO} "INCLUDE = ${LOCALBASE}/include/db3" > ${WRKSRC}/config.in
+ @${ECHO} "LIB = ${LOCALBASE}/lib" >> ${WRKSRC}/config.in
+ @${ECHO} "DBNAME = -ldb3" >> ${WRKSRC}/config.in
${PERL} -pi -e '$$_="" if /MAN3PODS/' ${WRKSRC}/Makefile.PL
.include <bsd.port.mk>
diff --git a/databases/p5-BerkeleyDB/distinfo b/databases/p5-BerkeleyDB/distinfo
index 10eea3f09444..c9069a139b82 100644
--- a/databases/p5-BerkeleyDB/distinfo
+++ b/databases/p5-BerkeleyDB/distinfo
@@ -1 +1 @@
-MD5 (BerkeleyDB-0.15.tar.gz) = d6a0511bd12559652f0a83820714e64a
+MD5 (BerkeleyDB-0.19.tar.gz) = 09db64e8c9a4c2af0c3580c41b1ac455
diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
index 904af43f7e9c..b5a0df4e43e6 100644
--- a/databases/py-bsddb3/Makefile
+++ b/databases/py-bsddb3/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bsddb3
PORTVERSION= 3.4.0
+PORTREVISION= 1
CATEGORIES= databases python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= pybsddb
@@ -15,7 +16,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= perky@FreeBSD.org
.if defined(WITH_DB3)
-LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
DBVERSION= db3
.else
LIB_DEPENDS= db4.0:${PORTSDIR}/databases/db4
diff --git a/databases/rdfdb/Makefile b/databases/rdfdb/Makefile
index 1dbe2205f2e9..d3532ce332f2 100644
--- a/databases/rdfdb/Makefile
+++ b/databases/rdfdb/Makefile
@@ -7,13 +7,14 @@
PORTNAME= rdfdb
PORTVERSION= 0.46
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= http://www.guha.com/
DISTNAME= rdfdb_src
MAINTAINER= pjenvey@turntables.org
-LIB_DEPENDS= db3:${PORTSDIR}/databases/db3
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
WRKSRC= ${WRKDIR}/rdfdb
USE_GMAKE= yes
diff --git a/databases/rdfdb/files/patch-librdf::rdflib.c b/databases/rdfdb/files/patch-librdf::rdflib.c
index 5d01f827c3f2..49cdc0349ac9 100644
--- a/databases/rdfdb/files/patch-librdf::rdflib.c
+++ b/databases/rdfdb/files/patch-librdf::rdflib.c
@@ -1,15 +1,11 @@
-$FreeBSD$
-
---- librdf/rdflib.c.orig Sat Jun 8 20:20:52 2002
-+++ librdf/rdflib.c Sat Jun 8 20:21:58 2002
-@@ -196,9 +196,9 @@
- RDF_LoadFileAssert (RDF_Parser rdfp, RDF_DB db, RDF_Resource source, RDF_Resource arc, void* target, RDF_ValueType type) {
- if (gVerbose > 2) printAssertion("\nAsserting:", db, source, arc, target, type);
- gAssertionCount++;
-+ extern FILE *rdfpGetFile(RDF_Parser rdfp);
- if (!addRemoveTriple(db, source, arc, target, type,
+--- librdf/rdflib.c.orig Wed Oct 4 02:00:07 2000
++++ librdf/rdflib.c Thu Aug 22 02:05:39 2002
+@@ -194,2 +194,4 @@
+
++extern FILE *rdfpGetFile(RDF_Parser rdfp);
++
+ RDF_Result
+@@ -200,3 +202,2 @@
RDF_ASSERT, getFileCode(rdfp)) && (rdfpGetFile(rdfp))) {
- extern FILE *rdfpGetFile(RDF_Parser rdfp);
FILE *file = rdfpGetFile(rdfp);
- fprintf(file, "%s\t%s\t", arc, source);
- if (type == RDF_INT_TYPE) {
diff --git a/databases/ruby-bdb/Makefile b/databases/ruby-bdb/Makefile
index bfc2732659b6..0d02c9766091 100644
--- a/databases/ruby-bdb/Makefile
+++ b/databases/ruby-bdb/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bdb
PORTVERSION= 0.3.3
+PORTREVISION= 1
CATEGORIES= databases ruby
MASTER_SITES= ftp://moulon.inra.fr/pub/ruby/
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
@@ -20,7 +21,7 @@ MAINTAINER= knu@FreeBSD.org
.if defined(WITH_BDB4)
LIB_DEPENDS= db4.0:${PORTSDIR}/databases/db4
.else
-LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
.endif
USE_RUBY= yes
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index 0942f6960dd9..fcae2b963b2c 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gconf
PORTVERSION= 1.0.9
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/GConf
@@ -16,7 +17,7 @@ DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
LIB_DEPENDS= guile.10:${PORTSDIR}/lang/guile \
- db3.2:${PORTSDIR}/databases/db3
+ db3.3:${PORTSDIR}/databases/db3
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/dns/fastresolve/Makefile b/dns/fastresolve/Makefile
index 6831d168f180..b148818c5927 100644
--- a/dns/fastresolve/Makefile
+++ b/dns/fastresolve/Makefile
@@ -7,12 +7,13 @@
PORTNAME= fastresolve
PORTVERSION= 2.8
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.pix.net/staff/djm/sw/dist/
MAINTAINER= verm@drunkmonk.net
-LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3 \
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3 \
adns.1:${PORTSDIR}/net/adns
USE_BZIP2= yes
diff --git a/editors/nvi-devel/Makefile b/editors/nvi-devel/Makefile
index 367c5076cdf1..ade2f73a6182 100644
--- a/editors/nvi-devel/Makefile
+++ b/editors/nvi-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= nvi
PORTVERSION= 1.81.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= http://www.kotnet.org/~skimo/nvi/devel/ \
${MASTER_SITE_LOCAL}
@@ -16,13 +16,13 @@ MASTER_SITE_SUBDIR= dd
MAINTAINER= dd@FreeBSD.org
BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv
-LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
USE_BZIP2= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/build.unix
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ARGS+= --with-db3=${PREFIX}
+CONFIGURE_ARGS+= --with-db3=${LOCALBASE}
CONFIGURE_SCRIPT= ../dist/configure
MAN1= ex.1 vi.1 view.1
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 154c9aefaa9a..873bb82ab711 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -8,7 +8,7 @@
PORTNAME= poedit
PORTVERSION= 1.1.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -20,7 +20,7 @@ MAINTAINER= ports@FreeBSD.org
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \
wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel \
- db3:${PORTSDIR}/databases/db3
+ db3.3:${PORTSDIR}/databases/db3
PATCH_DIST_ARGS= -d ${PATCH_WRKSRC} -E ${PATCH_DIST_STRIP} -p1
USE_REINPLACE= yes
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 6420451a4f5f..79871d691fff 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cyrus-imapd
PORTVERSION= 2.0.16
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
@@ -18,7 +18,7 @@ PATCHFILES= ${DISTNAME}-ipv6-20020118.diff.gz
MAINTAINER= ume@FreeBSD.org
LIB_DEPENDS= sasl.8:${PORTSDIR}/security/cyrus-sasl \
- db3.2:${PORTSDIR}/databases/db3
+ db3.3:${PORTSDIR}/databases/db3
BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \
${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index 3d202b5417c1..f2c9b9551860 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cyrus-imapd
PORTVERSION= 2.1.7
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
@@ -18,7 +18,7 @@ PATCHFILES= ${DISTNAME}-ipv6-20020822.diff.gz
MAINTAINER= ume@FreeBSD.org
LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
- db3.2:${PORTSDIR}/databases/db3
+ db3.3:${PORTSDIR}/databases/db3
BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \
${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 3d202b5417c1..f2c9b9551860 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cyrus-imapd
PORTVERSION= 2.1.7
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
@@ -18,7 +18,7 @@ PATCHFILES= ${DISTNAME}-ipv6-20020822.diff.gz
MAINTAINER= ume@FreeBSD.org
LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
- db3.2:${PORTSDIR}/databases/db3
+ db3.3:${PORTSDIR}/databases/db3
BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \
${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 3d202b5417c1..f2c9b9551860 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cyrus-imapd
PORTVERSION= 2.1.7
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
@@ -18,7 +18,7 @@ PATCHFILES= ${DISTNAME}-ipv6-20020822.diff.gz
MAINTAINER= ume@FreeBSD.org
LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
- db3.2:${PORTSDIR}/databases/db3
+ db3.3:${PORTSDIR}/databases/db3
BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \
${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 3d202b5417c1..f2c9b9551860 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cyrus-imapd
PORTVERSION= 2.1.7
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
@@ -18,7 +18,7 @@ PATCHFILES= ${DISTNAME}-ipv6-20020822.diff.gz
MAINTAINER= ume@FreeBSD.org
LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
- db3.2:${PORTSDIR}/databases/db3
+ db3.3:${PORTSDIR}/databases/db3
BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend \
${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
diff --git a/mail/drac/Makefile b/mail/drac/Makefile
index d80299a9fc1c..b07096f4893d 100644
--- a/mail/drac/Makefile
+++ b/mail/drac/Makefile
@@ -7,7 +7,7 @@
PORTNAME= drac
PORTVERSION= 1.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail
MASTER_SITES= ftp://ftp.cc.umanitoba.ca/src/ \
http://atreides.freenix.no/~anders/ \
@@ -18,7 +18,7 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= anders@FreeBSD.org
.if defined(WITH_POSTFIX_DB3)
-LIB_DEPENDS+= db3.2:${PORTSDIR}/databases/db3
+LIB_DEPENDS+= db3.3:${PORTSDIR}/databases/db3
.endif
NO_WRKSUBDIR= yes
diff --git a/mail/drac/files/patch-aa b/mail/drac/files/patch-aa
index efa953d3aa0d..46a8066b6d86 100644
--- a/mail/drac/files/patch-aa
+++ b/mail/drac/files/patch-aa
@@ -55,8 +55,8 @@
+RPCGENFLAGS = -C -I
+
+.if defined(WITH_POSTFIX_DB3)
-+CFLAGS+= -I${PREFIX}/include/db3
-+LDLIBS+= -L${PREFIX}/lib -ldb3
++CFLAGS+= -I${LOCALBASE}/include/db3
++LDLIBS+= -L${LOCALBASE}/lib -ldb3
+.endif
# Man sections
diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index 2af0094aaa44..ffb6ebd684de 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -6,10 +6,11 @@
PORTNAME= isync
PORTVERSION= 0.8
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.cs.hmc.edu/~me/isync/
-LIB_DEPENDS= db3:${PORTSDIR}/databases/db3
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
MAINTAINER= eivind@FreeBSD.org
diff --git a/mail/kiltdown/Makefile b/mail/kiltdown/Makefile
index 8f1e477d1bdc..17ff265df467 100644
--- a/mail/kiltdown/Makefile
+++ b/mail/kiltdown/Makefile
@@ -7,14 +7,14 @@
PORTNAME= kiltdown
PORTVERSION= 0.8.045
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= kiltdown
MAINTAINER= dinoex@FreeBSD.org
-LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
USE_X_PREFIX= yes
USE_QT_VER= 2
diff --git a/net/netatalk-devel/Makefile b/net/netatalk-devel/Makefile
index 9bbf43f4ad45..a3fa125ce456 100644
--- a/net/netatalk-devel/Makefile
+++ b/net/netatalk-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= netatalk
PORTVERSION= 1.5.3.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -15,7 +16,7 @@ MASTER_SITE_SUBDIR= netatalk
MAINTAINER= marcus@FreeBSD.org
.if defined(WITH_CNID)
-LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
.endif
.if defined(WITH_SRVLOC)
LIB_DEPENDS+= slp.1:${PORTSDIR}/net/openslp
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 9bbf43f4ad45..a3fa125ce456 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= netatalk
PORTVERSION= 1.5.3.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@@ -15,7 +16,7 @@ MASTER_SITE_SUBDIR= netatalk
MAINTAINER= marcus@FreeBSD.org
.if defined(WITH_CNID)
-LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
.endif
.if defined(WITH_SRVLOC)
LIB_DEPENDS+= slp.1:${PORTSDIR}/net/openslp
diff --git a/net/openldap2/Makefile b/net/openldap2/Makefile
index 25c94e488a7a..f20296d52b70 100644
--- a/net/openldap2/Makefile
+++ b/net/openldap2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= openldap
PORTVERSION= 2.0.25
+PORTREVISION= 1
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
@@ -22,7 +23,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
USE_AUTOCONF_VER=213
USE_LIBTOOL= yes
diff --git a/net/openldap20-server/Makefile b/net/openldap20-server/Makefile
index 25c94e488a7a..f20296d52b70 100644
--- a/net/openldap20-server/Makefile
+++ b/net/openldap20-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME= openldap
PORTVERSION= 2.0.25
+PORTREVISION= 1
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
@@ -22,7 +23,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
USE_AUTOCONF_VER=213
USE_LIBTOOL= yes
diff --git a/net/openldap20/Makefile b/net/openldap20/Makefile
index 25c94e488a7a..f20296d52b70 100644
--- a/net/openldap20/Makefile
+++ b/net/openldap20/Makefile
@@ -7,6 +7,7 @@
PORTNAME= openldap
PORTVERSION= 2.0.25
+PORTREVISION= 1
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
@@ -22,7 +23,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
USE_AUTOCONF_VER=213
USE_LIBTOOL= yes
diff --git a/net/openldap21-server/Makefile b/net/openldap21-server/Makefile
index 25c94e488a7a..f20296d52b70 100644
--- a/net/openldap21-server/Makefile
+++ b/net/openldap21-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME= openldap
PORTVERSION= 2.0.25
+PORTREVISION= 1
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
@@ -22,7 +23,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
USE_AUTOCONF_VER=213
USE_LIBTOOL= yes
diff --git a/net/openldap21/Makefile b/net/openldap21/Makefile
index 25c94e488a7a..f20296d52b70 100644
--- a/net/openldap21/Makefile
+++ b/net/openldap21/Makefile
@@ -7,6 +7,7 @@
PORTNAME= openldap
PORTVERSION= 2.0.25
+PORTREVISION= 1
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
@@ -22,7 +23,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
USE_AUTOCONF_VER=213
USE_LIBTOOL= yes
diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile
index 25c94e488a7a..f20296d52b70 100644
--- a/net/openldap22-server/Makefile
+++ b/net/openldap22-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME= openldap
PORTVERSION= 2.0.25
+PORTREVISION= 1
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
@@ -22,7 +23,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
USE_AUTOCONF_VER=213
USE_LIBTOOL= yes
diff --git a/net/openldap22/Makefile b/net/openldap22/Makefile
index 25c94e488a7a..f20296d52b70 100644
--- a/net/openldap22/Makefile
+++ b/net/openldap22/Makefile
@@ -7,6 +7,7 @@
PORTNAME= openldap
PORTVERSION= 2.0.25
+PORTREVISION= 1
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
@@ -22,7 +23,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
USE_AUTOCONF_VER=213
USE_LIBTOOL= yes
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index 25c94e488a7a..f20296d52b70 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME= openldap
PORTVERSION= 2.0.25
+PORTREVISION= 1
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
@@ -22,7 +23,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
USE_AUTOCONF_VER=213
USE_LIBTOOL= yes
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 25c94e488a7a..f20296d52b70 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME= openldap
PORTVERSION= 2.0.25
+PORTREVISION= 1
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
@@ -22,7 +23,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
-LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
USE_AUTOCONF_VER=213
USE_LIBTOOL= yes
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index a1d591c51881..ec4f808eea27 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cyrus-sasl
PORTVERSION= 1.5.27
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= security ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \
http://www.surf.org.uk/downloads/ \
diff --git a/security/cyrus-sasl/scripts/configure.sasl b/security/cyrus-sasl/scripts/configure.sasl
index 40139034b447..8f72f3e0f437 100644
--- a/security/cyrus-sasl/scripts/configure.sasl
+++ b/security/cyrus-sasl/scripts/configure.sasl
@@ -113,7 +113,7 @@ while [ "$1" ]; do
rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
exit 1
fi
- echo "LIB_DEPENDS+= db3.2:\${PORTSDIR}/databases/db3"
+ echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3"
echo "CONFIGURE_ARGS+= --with-dblib=berkeley"
echo "SASLDB_NAME= sasldb"
DBLIB=1
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 20078220d867..8b91e803be72 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cyrus-sasl
PORTVERSION= 2.1.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.westbend.net/pub/cyrus-mail/ \
diff --git a/security/cyrus-sasl2/scripts/configure.sasl b/security/cyrus-sasl2/scripts/configure.sasl
index b9b0983b93af..36d675ba47f4 100644
--- a/security/cyrus-sasl2/scripts/configure.sasl
+++ b/security/cyrus-sasl2/scripts/configure.sasl
@@ -77,7 +77,7 @@ while [ "$1" ]; do
rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
exit 1
fi
- echo "LIB_DEPENDS+= db3.2:\${PORTSDIR}/databases/db3"
+ echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3"
echo "CONFIGURE_ARGS+= --with-dblib=berkeley --with-bdb-incdir=${PREFIX}/include/db3 --with-bdb-libdir=${PREFIX}/lib"
echo "SASLDB_NAME= sasldb2"
DBLIB=1
diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile
index b873c37ec393..81c044333557 100644
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cfengine
PORTVERSION= 1.6.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iu.hio.no/pub/cfengine/ \
ftp://ftp.sunsite.utk.edu/pub/cfengine/cfengine-ftp/ \
@@ -20,7 +20,7 @@ MAINTAINER= gordon@FreeBSD.org
BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX
.endif
-LIB_DEPENDS= db3:${PORTSDIR}/databases/db3
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
.if defined(PACKAGE_BUILDING) && !exists(/usr/include/tcpd.h)
LIB_DEPENDS+= wrap.7:${PORTSDIR}/security/tcp_wrapper
.endif
diff --git a/sysutils/cfengine3-legacy/Makefile b/sysutils/cfengine3-legacy/Makefile
index b873c37ec393..81c044333557 100644
--- a/sysutils/cfengine3-legacy/Makefile
+++ b/sysutils/cfengine3-legacy/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cfengine
PORTVERSION= 1.6.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iu.hio.no/pub/cfengine/ \
ftp://ftp.sunsite.utk.edu/pub/cfengine/cfengine-ftp/ \
@@ -20,7 +20,7 @@ MAINTAINER= gordon@FreeBSD.org
BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX
.endif
-LIB_DEPENDS= db3:${PORTSDIR}/databases/db3
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
.if defined(PACKAGE_BUILDING) && !exists(/usr/include/tcpd.h)
LIB_DEPENDS+= wrap.7:${PORTSDIR}/security/tcp_wrapper
.endif
diff --git a/sysutils/cfengine3/Makefile b/sysutils/cfengine3/Makefile
index b873c37ec393..81c044333557 100644
--- a/sysutils/cfengine3/Makefile
+++ b/sysutils/cfengine3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cfengine
PORTVERSION= 1.6.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iu.hio.no/pub/cfengine/ \
ftp://ftp.sunsite.utk.edu/pub/cfengine/cfengine-ftp/ \
@@ -20,7 +20,7 @@ MAINTAINER= gordon@FreeBSD.org
BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX
.endif
-LIB_DEPENDS= db3:${PORTSDIR}/databases/db3
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
.if defined(PACKAGE_BUILDING) && !exists(/usr/include/tcpd.h)
LIB_DEPENDS+= wrap.7:${PORTSDIR}/security/tcp_wrapper
.endif
diff --git a/sysutils/fastresolve/Makefile b/sysutils/fastresolve/Makefile
index 6831d168f180..b148818c5927 100644
--- a/sysutils/fastresolve/Makefile
+++ b/sysutils/fastresolve/Makefile
@@ -7,12 +7,13 @@
PORTNAME= fastresolve
PORTVERSION= 2.8
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.pix.net/staff/djm/sw/dist/
MAINTAINER= verm@drunkmonk.net
-LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3 \
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3 \
adns.1:${PORTSDIR}/net/adns
USE_BZIP2= yes
diff --git a/www/crawl/Makefile b/www/crawl/Makefile
index 861da0aed6a8..2a7083f6a367 100644
--- a/www/crawl/Makefile
+++ b/www/crawl/Makefile
@@ -7,6 +7,7 @@
PORTNAME= crawl
PORTVERSION= 0.3
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://www.monkey.org/~provos/
@@ -14,7 +15,7 @@ MAINTAINER= petef@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent
LIB_DEPENDS= md5.1:${PORTSDIR}/www/libwww \
- db3.2:${PORTSDIR}/databases/db3
+ db3.3:${PORTSDIR}/databases/db3
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/www/squidguard/Makefile b/www/squidguard/Makefile
index 1cbee205d513..18902f084b62 100644
--- a/www/squidguard/Makefile
+++ b/www/squidguard/Makefile
@@ -7,6 +7,7 @@
PORTNAME= squidGuard
PORTVERSION= 1.2.0
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://ftp.ost.eltele.no/pub/www/proxy/squidGuard/ \
ftp://ftp.ost.eltele.no/pub/www/proxy/squidGuard/ \
@@ -14,12 +15,12 @@ MASTER_SITES= http://ftp.ost.eltele.no/pub/www/proxy/squidGuard/ \
MAINTAINER= ports@tyfon.net
-BUILD_DEPENDS= ${LOCALBASE}/lib/libdb3.so.2:${PORTSDIR}/databases/db3
+LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= --with-db-inc=${PREFIX}/include/db3 \
- --with-db-lib=${PREFIX}/lib \
+CONFIGURE_ARGS= --with-db-inc=${LOCALBASE}/include/db3 \
+ --with-db-lib=${LOCALBASE}/lib \
--with-sg-config=${PREFIX}/etc/squid/${PORTNAME}.conf \
--with-sg-dbhome=${DATADIR} \
--with-sg-logdir=${LOGDIR}