2 files changed, 4 insertions, 68 deletions
diff --git a/databases/couchdb/files/patch-configure b/databases/couchdb/files/patch-configure
deleted file mode 100644
index 2e5f7d2f1ba0..000000000000
--- a/databases/couchdb/files/patch-configure
+++ /dev/null
@@ -1,38 +0,0 @@
---- configure.orig	2015-06-26 09:25:19 UTC
-+++ configure
-@@ -18532,7 +18532,7 @@ esac
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang version compatibility" >&5
- $as_echo_n "checking Erlang version compatibility... " >&6; }
--erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 17 (erts-6.0)"
-+erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 20 (erts-9.0)"
- 
- version="`${ERL} -version 2>&1 | ${SED} 's/[^0-9]/ /g'` 0 0 0"
- major_version=`echo $version | ${AWK} "{print \\$1}"`
-@@ -18540,7 +18540,7 @@ minor_version=`echo $version | ${AWK} "{
- patch_version=`echo $version | ${AWK} "{print \\$3}"`
- echo -n "detected Erlang version: $major_version.$minor_version.$patch_version..."
- 
--if test $major_version -lt 5 -o $major_version -gt 6; then
-+if test $major_version -lt 5 -o $major_version -gt 9; then
-     as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5
- fi
- 
-@@ -18559,7 +18559,7 @@ otp_release="`\
- 
- 
- 
-- if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17)"); then
-+ if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18|19|20)"); then
-   USE_OTP_NIFS_TRUE=
-   USE_OTP_NIFS_FALSE='#'
- else
-@@ -18567,7 +18567,7 @@ else
-   USE_OTP_NIFS_FALSE=
- fi
- 
-- if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17)"); then
-+ if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18|19|20)"); then
-   USE_EJSON_COMPARE_NIF_TRUE=
-   USE_EJSON_COMPARE_NIF_FALSE='#'
- else
diff --git a/databases/couchdb/files/pkg-message.in b/databases/couchdb/files/pkg-message.in
index a7f095387789..ae67d78d3778 100644
--- a/databases/couchdb/files/pkg-message.in
+++ b/databases/couchdb/files/pkg-message.in
@@ -1,30 +1,4 @@
-===>  COMPATIBILITY NOTE:
-      1.2.0 removed support for the old 0.9 database format.
-
-      More info:
-        * http://wiki.apache.org/couchdb/Breaking_changes?action=show&redirect=BreakingChanges
-
-===>  CONFIGURATION NOTES:
-
-      PERFORMANCE
-         For best response (minimal delay) most sites will wish to uncomment this line
-         from %%PREFIX%%/etc/couchdb/local.ini:
-
-            socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}]
-
-         Otherwise you'll see a large delay when establishing connections to the DB.
-
-      ADMIN ACCOUNT
-         By default no admin password or account is configured which leaves the DB
-         server open.  Add accounts to the bottom of %%PREFIX%%/etc/couchdb/local.ini
-         to secure your installation (by default CouchDB listens on localhost only).
-
-      DATABASE LOCATION
-	 The DB files themselves are now stored in /var/db/couchdb by default.
-	 Previous versions of this port defaulted to /var/lib/couchdb, and if
-	 you installed directly from source /usr/local/lib/couchdb.
-
-	 If you are upgrading you may need to move your DB files to /var/db/couchdb
-	 if you are not specifying database_dir and view_index_dir locations
-         in local.ini.
-
+ADMIN ACCOUNT
+By default no admin password or account is configured which leaves the DB
+server open.  Add accounts to the bottom of %%PREFIX%%/etc/couchdb/local.ini
+to secure your installation (by default CouchDB listens on localhost only).