aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/apache2/Makefile.modules4
-rw-r--r--www/apache2/files/patch-srclib:apr-util:build:dbm.m4131
-rw-r--r--www/apache2/files/patch-srclib:apr-utils:build:dbm.m455
-rw-r--r--www/apache20/Makefile.modules4
-rw-r--r--www/apache20/files/patch-srclib:apr-util:build:dbm.m4131
-rw-r--r--www/apache20/files/patch-srclib:apr-utils:build:dbm.m455
-rw-r--r--www/apache21/Makefile.modules4
-rw-r--r--www/apache21/files/patch-srclib:apr-util:build:dbm.m4 (renamed from www/apache21/files/patch-srclib:apr-utils:build:dbm.m4)13
-rw-r--r--www/apache22/Makefile.modules4
-rw-r--r--www/apache22/files/patch-srclib:apr-util:build:dbm.m4 (renamed from www/apache22/files/patch-srclib:apr-utils:build:dbm.m4)13
10 files changed, 302 insertions, 112 deletions
diff --git a/www/apache2/Makefile.modules b/www/apache2/Makefile.modules
index c0bff5aba490..0ee7a75ed386 100644
--- a/www/apache2/Makefile.modules
+++ b/www/apache2/Makefile.modules
@@ -78,6 +78,10 @@ CONFIGURE_ARGS+= --with-dbm=db41 \
LIB_DEPENDS+= db-4.2:${PORTSDIR}/databases/db42
CONFIGURE_ARGS+= --with-dbm=db42 \
--with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db42
+. elif ${WITH_BERKELEYDB} == "db43"
+LIB_DEPENDS+= db-4.3:${PORTSDIR}/databases/db43
+CONFIGURE_ARGS+= --with-dbm=db43 \
+ --with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db43
. else
IGNORE= "Unknown Berkeley DB version"
. endif
diff --git a/www/apache2/files/patch-srclib:apr-util:build:dbm.m4 b/www/apache2/files/patch-srclib:apr-util:build:dbm.m4
new file mode 100644
index 000000000000..3571ab7b0bb6
--- /dev/null
+++ b/www/apache2/files/patch-srclib:apr-util:build:dbm.m4
@@ -0,0 +1,131 @@
+--- srclib/apr-util/build/dbm.m4.orig Sat Mar 13 05:36:23 2004
++++ srclib/apr-util/build/dbm.m4 Mon Jan 17 18:45:29 2005
+@@ -298,8 +298,8 @@
+ fi
+ APU_CHECK_BERKELEY_DB(1, -1, -1,
+ "$places",
+- "db_185.h",
+- "db"
++ "db.h",
++ "c"
+ )
+ if test "$apu_have_db" = "1"; then
+ apu_db_version=185
+@@ -341,7 +341,7 @@
+ APU_CHECK_BERKELEY_DB(3, -1, -1,
+ "$places",
+ "db3/db.h db.h",
+- "db3 db"
++ "db3"
+ )
+ if test "$apu_have_db" = "1"; then
+ apu_db_version=3
+@@ -361,8 +361,8 @@
+ fi
+ APU_CHECK_BERKELEY_DB("4", "0", "-1",
+ "$places",
+- "db4/db.h db.h",
+- "db-4.0 db4 db"
++ "db4/db.h",
++ "db4"
+ )
+ if test "$apu_have_db" = "1"; then
+ apu_db_version=4
+@@ -382,8 +382,8 @@
+ fi
+ APU_CHECK_BERKELEY_DB("4", "1", "-1",
+ "$places",
+- "db41/db.h db4/db.h db.h",
+- "db-4.1 db4 db"
++ "db41/db.h",
++ "db41"
+ )
+ if test "$apu_have_db" = "1"; then
+ apu_db_version=4
+@@ -403,8 +403,28 @@
+ fi
+ APU_CHECK_BERKELEY_DB("4", "2", "-1",
+ "$places",
+- "db42/db.h db4/db.h db.h",
+- "db-4.2 db4 db"
++ "db42/db.h",
++ "db-4.2"
++ )
++ if test "$apu_have_db" = "1"; then
++ apu_db_version=4
++ fi
++])
++
++dnl
++dnl APU_CHECK_DB43: is DB4.3 present?
++dnl
++dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
++dnl
++AC_DEFUN(APU_CHECK_DB43, [
++ places=$1
++ if test -z "$places"; then
++ places="std /usr/local/BerkeleyDB.4.3 /boot/home/config"
++ fi
++ APU_CHECK_BERKELEY_DB("4", "3", "-1",
++ "$places",
++ "db43/db.h",
++ "db-4.3"
+ )
+ if test "$apu_have_db" = "1"; then
+ apu_db_version=4
+@@ -465,6 +485,12 @@
+ AC_MSG_ERROR(Berkeley db4 not found)
+ fi
+ ;;
++ db43)
++ APU_CHECK_DB43("$check_places")
++ if test "$apu_db_version" != "4"; then
++ AC_MSG_ERROR(Berkeley db4 not found)
++ fi
++ ;;
+ default)
+ APU_CHECK_DB_ALL("$check_places")
+ ;;
+@@ -472,11 +498,12 @@
+ ])
+
+ dnl
+-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.2 to 1.
++dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.3 to 1.
+ dnl
+ AC_DEFUN(APU_CHECK_DB_ALL, [
+ all_places=$1
+-
++ APU_CHECK_DB43("$all_places")
++ if test "$apu_db_version" != "4"; then
+ APU_CHECK_DB42("$all_places")
+ if test "$apu_db_version" != "4"; then
+ APU_CHECK_DB41("$all_places")
+@@ -496,6 +523,7 @@
+ fi
+ fi
+ fi
++ fi
+ AC_MSG_CHECKING(for Berkeley DB)
+ if test "$apu_have_db" = "1"; then
+ AC_MSG_RESULT(found db$apu_db_version)
+@@ -528,7 +556,7 @@
+ ], [
+ if test "$withval" = "yes"; then
+ AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
+- One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42])
++ One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42,db43])
+ fi
+ requested="$withval"
+ ], [
+@@ -703,6 +731,10 @@
+ apu_default_dbm=db4
+ ;;
+ db42)
++ apu_use_db=1
++ apu_default_dbm=db4
++ ;;
++ db43)
+ apu_use_db=1
+ apu_default_dbm=db4
+ ;;
diff --git a/www/apache2/files/patch-srclib:apr-utils:build:dbm.m4 b/www/apache2/files/patch-srclib:apr-utils:build:dbm.m4
deleted file mode 100644
index e13c41e28eeb..000000000000
--- a/www/apache2/files/patch-srclib:apr-utils:build:dbm.m4
+++ /dev/null
@@ -1,55 +0,0 @@
---- srclib/apr-util/build/dbm.m4.orig Sat Mar 20 06:52:01 2004
-+++ srclib/apr-util/build/dbm.m4 Sat Mar 20 06:54:51 2004
-@@ -298,8 +298,8 @@
- fi
- APU_CHECK_BERKELEY_DB(1, -1, -1,
- "$places",
-- "db_185.h",
-- "db"
-+ "db.h",
-+ "c"
- )
- if test "$apu_have_db" = "1"; then
- apu_db_version=185
-@@ -341,7 +341,7 @@
- APU_CHECK_BERKELEY_DB(3, -1, -1,
- "$places",
- "db3/db.h db.h",
-- "db3 db"
-+ "db3"
- )
- if test "$apu_have_db" = "1"; then
- apu_db_version=3
-@@ -361,8 +361,8 @@
- fi
- APU_CHECK_BERKELEY_DB("4", "0", "-1",
- "$places",
-- "db4/db.h db.h",
-- "db-4.0 db4 db"
-+ "db4/db.h",
-+ "db4"
- )
- if test "$apu_have_db" = "1"; then
- apu_db_version=4
-@@ -382,8 +382,8 @@
- fi
- APU_CHECK_BERKELEY_DB("4", "1", "-1",
- "$places",
-- "db41/db.h db4/db.h db.h",
-- "db-4.1 db4 db"
-+ "db41/db.h",
-+ "db41"
- )
- if test "$apu_have_db" = "1"; then
- apu_db_version=4
-@@ -403,8 +403,8 @@
- fi
- APU_CHECK_BERKELEY_DB("4", "2", "-1",
- "$places",
-- "db42/db.h db4/db.h db.h",
-- "db-4.2 db4 db"
-+ "db42/db.h",
-+ "db-4.2"
- )
- if test "$apu_have_db" = "1"; then
- apu_db_version=4
diff --git a/www/apache20/Makefile.modules b/www/apache20/Makefile.modules
index c0bff5aba490..0ee7a75ed386 100644
--- a/www/apache20/Makefile.modules
+++ b/www/apache20/Makefile.modules
@@ -78,6 +78,10 @@ CONFIGURE_ARGS+= --with-dbm=db41 \
LIB_DEPENDS+= db-4.2:${PORTSDIR}/databases/db42
CONFIGURE_ARGS+= --with-dbm=db42 \
--with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db42
+. elif ${WITH_BERKELEYDB} == "db43"
+LIB_DEPENDS+= db-4.3:${PORTSDIR}/databases/db43
+CONFIGURE_ARGS+= --with-dbm=db43 \
+ --with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db43
. else
IGNORE= "Unknown Berkeley DB version"
. endif
diff --git a/www/apache20/files/patch-srclib:apr-util:build:dbm.m4 b/www/apache20/files/patch-srclib:apr-util:build:dbm.m4
new file mode 100644
index 000000000000..3571ab7b0bb6
--- /dev/null
+++ b/www/apache20/files/patch-srclib:apr-util:build:dbm.m4
@@ -0,0 +1,131 @@
+--- srclib/apr-util/build/dbm.m4.orig Sat Mar 13 05:36:23 2004
++++ srclib/apr-util/build/dbm.m4 Mon Jan 17 18:45:29 2005
+@@ -298,8 +298,8 @@
+ fi
+ APU_CHECK_BERKELEY_DB(1, -1, -1,
+ "$places",
+- "db_185.h",
+- "db"
++ "db.h",
++ "c"
+ )
+ if test "$apu_have_db" = "1"; then
+ apu_db_version=185
+@@ -341,7 +341,7 @@
+ APU_CHECK_BERKELEY_DB(3, -1, -1,
+ "$places",
+ "db3/db.h db.h",
+- "db3 db"
++ "db3"
+ )
+ if test "$apu_have_db" = "1"; then
+ apu_db_version=3
+@@ -361,8 +361,8 @@
+ fi
+ APU_CHECK_BERKELEY_DB("4", "0", "-1",
+ "$places",
+- "db4/db.h db.h",
+- "db-4.0 db4 db"
++ "db4/db.h",
++ "db4"
+ )
+ if test "$apu_have_db" = "1"; then
+ apu_db_version=4
+@@ -382,8 +382,8 @@
+ fi
+ APU_CHECK_BERKELEY_DB("4", "1", "-1",
+ "$places",
+- "db41/db.h db4/db.h db.h",
+- "db-4.1 db4 db"
++ "db41/db.h",
++ "db41"
+ )
+ if test "$apu_have_db" = "1"; then
+ apu_db_version=4
+@@ -403,8 +403,28 @@
+ fi
+ APU_CHECK_BERKELEY_DB("4", "2", "-1",
+ "$places",
+- "db42/db.h db4/db.h db.h",
+- "db-4.2 db4 db"
++ "db42/db.h",
++ "db-4.2"
++ )
++ if test "$apu_have_db" = "1"; then
++ apu_db_version=4
++ fi
++])
++
++dnl
++dnl APU_CHECK_DB43: is DB4.3 present?
++dnl
++dnl if present: sets apu_db_header, apu_db_lib, and apu_db_version
++dnl
++AC_DEFUN(APU_CHECK_DB43, [
++ places=$1
++ if test -z "$places"; then
++ places="std /usr/local/BerkeleyDB.4.3 /boot/home/config"
++ fi
++ APU_CHECK_BERKELEY_DB("4", "3", "-1",
++ "$places",
++ "db43/db.h",
++ "db-4.3"
+ )
+ if test "$apu_have_db" = "1"; then
+ apu_db_version=4
+@@ -465,6 +485,12 @@
+ AC_MSG_ERROR(Berkeley db4 not found)
+ fi
+ ;;
++ db43)
++ APU_CHECK_DB43("$check_places")
++ if test "$apu_db_version" != "4"; then
++ AC_MSG_ERROR(Berkeley db4 not found)
++ fi
++ ;;
+ default)
+ APU_CHECK_DB_ALL("$check_places")
+ ;;
+@@ -472,11 +498,12 @@
+ ])
+
+ dnl
+-dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.2 to 1.
++dnl APU_CHECK_DB_ALL: Try all Berkeley DB versions, from 4.3 to 1.
+ dnl
+ AC_DEFUN(APU_CHECK_DB_ALL, [
+ all_places=$1
+-
++ APU_CHECK_DB43("$all_places")
++ if test "$apu_db_version" != "4"; then
+ APU_CHECK_DB42("$all_places")
+ if test "$apu_db_version" != "4"; then
+ APU_CHECK_DB41("$all_places")
+@@ -496,6 +523,7 @@
+ fi
+ fi
+ fi
++ fi
+ AC_MSG_CHECKING(for Berkeley DB)
+ if test "$apu_have_db" = "1"; then
+ AC_MSG_RESULT(found db$apu_db_version)
+@@ -528,7 +556,7 @@
+ ], [
+ if test "$withval" = "yes"; then
+ AC_MSG_ERROR([--with-dbm needs to specify a DBM type to use.
+- One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42])
++ One of: sdbm, gdbm, ndbm, db, db1, db185, db2, db3, db4, db41, db42,db43])
+ fi
+ requested="$withval"
+ ], [
+@@ -703,6 +731,10 @@
+ apu_default_dbm=db4
+ ;;
+ db42)
++ apu_use_db=1
++ apu_default_dbm=db4
++ ;;
++ db43)
+ apu_use_db=1
+ apu_default_dbm=db4
+ ;;
diff --git a/www/apache20/files/patch-srclib:apr-utils:build:dbm.m4 b/www/apache20/files/patch-srclib:apr-utils:build:dbm.m4
deleted file mode 100644
index e13c41e28eeb..000000000000
--- a/www/apache20/files/patch-srclib:apr-utils:build:dbm.m4
+++ /dev/null
@@ -1,55 +0,0 @@
---- srclib/apr-util/build/dbm.m4.orig Sat Mar 20 06:52:01 2004
-+++ srclib/apr-util/build/dbm.m4 Sat Mar 20 06:54:51 2004
-@@ -298,8 +298,8 @@
- fi
- APU_CHECK_BERKELEY_DB(1, -1, -1,
- "$places",
-- "db_185.h",
-- "db"
-+ "db.h",
-+ "c"
- )
- if test "$apu_have_db" = "1"; then
- apu_db_version=185
-@@ -341,7 +341,7 @@
- APU_CHECK_BERKELEY_DB(3, -1, -1,
- "$places",
- "db3/db.h db.h",
-- "db3 db"
-+ "db3"
- )
- if test "$apu_have_db" = "1"; then
- apu_db_version=3
-@@ -361,8 +361,8 @@
- fi
- APU_CHECK_BERKELEY_DB("4", "0", "-1",
- "$places",
-- "db4/db.h db.h",
-- "db-4.0 db4 db"
-+ "db4/db.h",
-+ "db4"
- )
- if test "$apu_have_db" = "1"; then
- apu_db_version=4
-@@ -382,8 +382,8 @@
- fi
- APU_CHECK_BERKELEY_DB("4", "1", "-1",
- "$places",
-- "db41/db.h db4/db.h db.h",
-- "db-4.1 db4 db"
-+ "db41/db.h",
-+ "db41"
- )
- if test "$apu_have_db" = "1"; then
- apu_db_version=4
-@@ -403,8 +403,8 @@
- fi
- APU_CHECK_BERKELEY_DB("4", "2", "-1",
- "$places",
-- "db42/db.h db4/db.h db.h",
-- "db-4.2 db4 db"
-+ "db42/db.h",
-+ "db-4.2"
- )
- if test "$apu_have_db" = "1"; then
- apu_db_version=4
diff --git a/www/apache21/Makefile.modules b/www/apache21/Makefile.modules
index 1f2404e60556..6b59b1ac52de 100644
--- a/www/apache21/Makefile.modules
+++ b/www/apache21/Makefile.modules
@@ -81,6 +81,10 @@ CONFIGURE_ARGS+= --with-dbm=db41 \
LIB_DEPENDS+= db-4.2:${PORTSDIR}/databases/db42
CONFIGURE_ARGS+= --with-dbm=db42 \
--with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db42
+. elif ${WITH_BERKELEYDB} == "db43"
+LIB_DEPENDS+= db-4.3:${PORTSDIR}/databases/db43
+CONFIGURE_ARGS+= --with-dbm=db43 \
+ --with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db43
. else
IGNORE= "Unknown Berkeley DB version"
. endif
diff --git a/www/apache21/files/patch-srclib:apr-utils:build:dbm.m4 b/www/apache21/files/patch-srclib:apr-util:build:dbm.m4
index 78b4b2c57d59..70fe1ef96154 100644
--- a/www/apache21/files/patch-srclib:apr-utils:build:dbm.m4
+++ b/www/apache21/files/patch-srclib:apr-util:build:dbm.m4
@@ -1,5 +1,5 @@
--- srclib/apr-util/build/dbm.m4.orig Wed Nov 17 02:12:20 2004
-+++ srclib/apr-util/build/dbm.m4 Sat Dec 11 17:08:31 2004
++++ srclib/apr-util/build/dbm.m4 Mon Jan 17 21:22:47 2005
@@ -298,8 +298,8 @@
fi
APU_CHECK_BERKELEY_DB(1, -1, -1,
@@ -53,3 +53,14 @@
)
if test "$apu_have_db" = "1"; then
apu_db_version=4
+@@ -422,8 +422,8 @@
+ fi
+ APU_CHECK_BERKELEY_DB("4", "3", "-1",
+ "$places",
+- "db43/db.h db4/db.h db.h",
+- "db-4.3 db43 db4 db"
++ "db43/db.h",
++ "db-4.3"
+ )
+ if test "$apu_have_db" = "1"; then
+ apu_db_version=4
diff --git a/www/apache22/Makefile.modules b/www/apache22/Makefile.modules
index 1f2404e60556..6b59b1ac52de 100644
--- a/www/apache22/Makefile.modules
+++ b/www/apache22/Makefile.modules
@@ -81,6 +81,10 @@ CONFIGURE_ARGS+= --with-dbm=db41 \
LIB_DEPENDS+= db-4.2:${PORTSDIR}/databases/db42
CONFIGURE_ARGS+= --with-dbm=db42 \
--with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db42
+. elif ${WITH_BERKELEYDB} == "db43"
+LIB_DEPENDS+= db-4.3:${PORTSDIR}/databases/db43
+CONFIGURE_ARGS+= --with-dbm=db43 \
+ --with-berkeley-db=${LOCALBASE}/include:${LOCALBASE}/lib/db43
. else
IGNORE= "Unknown Berkeley DB version"
. endif
diff --git a/www/apache22/files/patch-srclib:apr-utils:build:dbm.m4 b/www/apache22/files/patch-srclib:apr-util:build:dbm.m4
index 78b4b2c57d59..70fe1ef96154 100644
--- a/www/apache22/files/patch-srclib:apr-utils:build:dbm.m4
+++ b/www/apache22/files/patch-srclib:apr-util:build:dbm.m4
@@ -1,5 +1,5 @@
--- srclib/apr-util/build/dbm.m4.orig Wed Nov 17 02:12:20 2004
-+++ srclib/apr-util/build/dbm.m4 Sat Dec 11 17:08:31 2004
++++ srclib/apr-util/build/dbm.m4 Mon Jan 17 21:22:47 2005
@@ -298,8 +298,8 @@
fi
APU_CHECK_BERKELEY_DB(1, -1, -1,
@@ -53,3 +53,14 @@
)
if test "$apu_have_db" = "1"; then
apu_db_version=4
+@@ -422,8 +422,8 @@
+ fi
+ APU_CHECK_BERKELEY_DB("4", "3", "-1",
+ "$places",
+- "db43/db.h db4/db.h db.h",
+- "db-4.3 db43 db4 db"
++ "db43/db.h",
++ "db-4.3"
+ )
+ if test "$apu_have_db" = "1"; then
+ apu_db_version=4
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-09 22:21:38 +0000