git: 055a1041eda4 - main - devel/subversion{,-lts}: Band-aid port option BDB and deprecate for removal
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 20 Mar 2025 10:11:39 UTC
The branch main has been updated by michaelo:
URL: https://cgit.FreeBSD.org/ports/commit/?id=055a1041eda4541cd680526da713ad16ac4bbf43
commit 055a1041eda4541cd680526da713ad16ac4bbf43
Author: Michael Osipov <michaelo@FreeBSD.org>
AuthorDate: 2025-03-18 12:28:38 +0000
Commit: Michael Osipov <michaelo@FreeBSD.org>
CommitDate: 2025-03-20 10:11:22 +0000
devel/subversion{,-lts}: Band-aid port option BDB and deprecate for removal
* Limit BDB to supported versions (4+) by Subversion only
* Pass mandatory configure option
* Band-aid when enabled for some combinations with devel/apr1 and bdb in
DEFAULT_VERSIONS
* Deprecate it as it is deprecated upstream already for almost 12 years and
about to be removed in 1.15
PR: 285495
Tested by: michaelo
Approved by: jrm (mentor)
Differential Revision: https://reviews.freebsd.org/D49406
---
devel/subversion-lts/Makefile | 6 +++---
devel/subversion-lts/Makefile.common | 4 ++--
devel/subversion-lts/files/pkg-message.in | 3 +++
devel/subversion/Makefile | 6 +++---
devel/subversion/Makefile.common | 4 ++--
devel/subversion/files/pkg-message.in | 3 +++
6 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/devel/subversion-lts/Makefile b/devel/subversion-lts/Makefile
index c543ec20a64f..8d46e9c4eac1 100644
--- a/devel/subversion-lts/Makefile
+++ b/devel/subversion-lts/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION= 0
+PORTREVISION= 1
PKGNAMESUFFIX= -lts
MAINTAINER= michaelo@apache.org
@@ -107,9 +107,9 @@ pre-everything::
pre-configure:
.if ${PORT_OPTIONS:MBDB}
@BDB_VERSION=`${APR_APU_DIR}/${APU_CONFIG} --db-version`; \
- if [ "$${BDB_VERSION}" != "4" -a "$${BDB_VERSION}" != "5" -a "$${BDB_VERSION}" != "6" -a "$${BDB_VERSION}" != "18" ] ; then \
+ if [ "$${BDB_VERSION}" != "5" -a "$${BDB_VERSION}" != "185" ] ; then \
${ECHO_MSG} "" ; \
- ${ECHO_MSG} 'You should build `'"devel/apr1' with Berkeley DB (4, 5, 6 or 18) support to use subversion with it." ; \
+ ${ECHO_MSG} 'You should build `'"devel/apr1' with Berkeley DB (5, or 18) support to use subversion with it." ; \
${ECHO_MSG} 'Please rebuild `'"devel/apr1' with option "'`'"BDB' and try again." ; \
${ECHO_MSG} "" ; \
${ECHO_MSG} "Or you can disable Berkeley DB support. Only 'fs' repository backend will be available." ; \
diff --git a/devel/subversion-lts/Makefile.common b/devel/subversion-lts/Makefile.common
index 88d93b6d0a0b..ebd060d1501b 100644
--- a/devel/subversion-lts/Makefile.common
+++ b/devel/subversion-lts/Makefile.common
@@ -27,8 +27,8 @@ CONFIGURE_ARGS+= --with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat
# ===============================================================
OPTIONS_SUB= yes
-BDB_CONFIGURE_ON= --enable-bdb6
-BDB_CONFIGURE_OFF= --without-berkeley-db
+BDB_CONFIGURE_WITH= berkeley-db
+BDB_CONFIGURE_ENABLE= bdb6
BDB_USES= bdb
NLS_CONFIGURE_OFF= --disable-nls
diff --git a/devel/subversion-lts/files/pkg-message.in b/devel/subversion-lts/files/pkg-message.in
index fb11b255c24b..5ef8e3dc777f 100644
--- a/devel/subversion-lts/files/pkg-message.in
+++ b/devel/subversion-lts/files/pkg-message.in
@@ -3,6 +3,9 @@
message: <<EOM
The subversion dav modules are no longer activated in httpd.conf!
There is now a dedicated modules file in %%APACHEETCDIR%%/modules.d
+
+Important: The port option BDB is faulty and deprecated upstream for 12 years.
+It will be removed in the future.
EOM
}
]
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 275fd91caa05..c516cc2bb7a1 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION= 0
+PORTREVISION= 1
MAINTAINER= michaelo@apache.org
COMMENT= Version control system
@@ -106,9 +106,9 @@ pre-everything::
pre-configure:
.if ${PORT_OPTIONS:MBDB}
@BDB_VERSION=`${APR_APU_DIR}/${APU_CONFIG} --db-version`; \
- if [ "$${BDB_VERSION}" != "4" -a "$${BDB_VERSION}" != "5" -a "$${BDB_VERSION}" != "6" -a "$${BDB_VERSION}" != "18" ] ; then \
+ if [ "$${BDB_VERSION}" != "5" -a "$${BDB_VERSION}" != "185" ] ; then \
${ECHO_MSG} "" ; \
- ${ECHO_MSG} 'You should build `'"devel/apr1' with Berkeley DB (4, 5, 6 or 18) support to use subversion with it." ; \
+ ${ECHO_MSG} 'You should build `'"devel/apr1' with Berkeley DB (5, or 18) support to use subversion with it." ; \
${ECHO_MSG} 'Please rebuild `'"devel/apr1' with option "'`'"BDB' and try again." ; \
${ECHO_MSG} "" ; \
${ECHO_MSG} "Or you can disable Berkeley DB support. Only 'fs' repository backend will be available." ; \
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 4ae9d28d54fe..4cc005d04821 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -27,8 +27,8 @@ CONFIGURE_ARGS+= --with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat
# ===============================================================
OPTIONS_SUB= yes
-BDB_CONFIGURE_ON= --enable-bdb6
-BDB_CONFIGURE_OFF= --without-berkeley-db
+BDB_CONFIGURE_WITH= berkeley-db
+BDB_CONFIGURE_ENABLE= bdb6
BDB_USES= bdb
NLS_CONFIGURE_OFF= --disable-nls
diff --git a/devel/subversion/files/pkg-message.in b/devel/subversion/files/pkg-message.in
index fb11b255c24b..5ef8e3dc777f 100644
--- a/devel/subversion/files/pkg-message.in
+++ b/devel/subversion/files/pkg-message.in
@@ -3,6 +3,9 @@
message: <<EOM
The subversion dav modules are no longer activated in httpd.conf!
There is now a dedicated modules file in %%APACHEETCDIR%%/modules.d
+
+Important: The port option BDB is faulty and deprecated upstream for 12 years.
+It will be removed in the future.
EOM
}
]