Page MenuHomeFreeBSD
Files F112525660

D49406.id.diff
No OneTemporary
Actions

D49406.id.diff
View Options

diff --git a/devel/subversion-lts/Makefile b/devel/subversion-lts/Makefile
--- 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-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
--- a/devel/subversion-lts/Makefile.common
+++ b/devel/subversion-lts/Makefile.common
@@ -27,8 +27,8 @@
# ===============================================================
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
--- 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
--- 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-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
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -27,8 +27,8 @@
# ===============================================================
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
--- 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
}
]

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 20, 8:27 AM (18 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17228460
Default Alt Text
D49406.id.diff (3 KB)

Event Timeline