aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Cottlehuber <dch@FreeBSD.org>2023-05-22 14:12:56 +0000
committerDave Cottlehuber <dch@FreeBSD.org>2023-05-22 14:12:56 +0000
commitb70939ee08bde39f31b5dc578a515cef5472fc0f (patch)
tree010887c63fe85767d9fe0eeb094741fbc372fcae
parentd0dcfbfd4ffa235b6f746ccef89aa3b2481105b8 (diff)
databases/couchdb3: update to 3.3.2
And fix a long-standing error in rc.d script that affects new installs. PR: 271177 Reported by: Jose Jachuf <jjachuf@gmail.com> Sponsored by: SkunkWerks, GmbH
-rw-r--r--databases/couchdb3/Makefile3
-rw-r--r--databases/couchdb3/distinfo6
-rw-r--r--databases/couchdb3/files/couchdb3.in4
-rw-r--r--databases/couchdb3/files/patch-rel_reltool.config2
-rw-r--r--databases/couchdb3/pkg-plist14
5 files changed, 14 insertions, 15 deletions
diff --git a/databases/couchdb3/Makefile b/databases/couchdb3/Makefile
index 53437ad22e5f..25779f08a62d 100644
--- a/databases/couchdb3/Makefile
+++ b/databases/couchdb3/Makefile
@@ -1,6 +1,5 @@
PORTNAME= couchdb3
-DISTVERSION= 3.3.1
-PORTREVISION= 2
+DISTVERSION= 3.3.2
CATEGORIES= databases
MASTER_SITES= APACHE/couchdb/source/${DISTVERSION}
DISTNAME= apache-couchdb-${DISTVERSION}
diff --git a/databases/couchdb3/distinfo b/databases/couchdb3/distinfo
index e6e677160303..b049c06c68a9 100644
--- a/databases/couchdb3/distinfo
+++ b/databases/couchdb3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1673469227
-SHA256 (apache-couchdb-3.3.1.tar.gz) = 9b89d7b54f7ef52b42bd51a6a0a2d3b1b06cce395df2c99d8f1f47f9355e2bee
-SIZE (apache-couchdb-3.3.1.tar.gz) = 19077002
+TIMESTAMP = 1684750988
+SHA256 (apache-couchdb-3.3.2.tar.gz) = 3d6823d42d10cf0d4f86c9c4fe59c9932c89d68578fcb6c4b4278dc769308daa
+SIZE (apache-couchdb-3.3.2.tar.gz) = 19083558
diff --git a/databases/couchdb3/files/couchdb3.in b/databases/couchdb3/files/couchdb3.in
index 5d59c21f7f87..af3f2e27bea2 100644
--- a/databases/couchdb3/files/couchdb3.in
+++ b/databases/couchdb3/files/couchdb3.in
@@ -44,8 +44,8 @@ erl_flags="${erl_sasl} ${erl_boot} ${erl_args} ${%%PORTNAME%%_erl_flags}"
-t ${name} \
-u ${%%PORTNAME%%_user} \
env ERL_FLAGS="${erl_flags}" \
- HOME=/var/run/couchdb \
- ERL_CRASH_DUMP=/var/run/couchdb/erl_crash.dump \
+ HOME=/var/run/%%PORTNAME%% \
+ ERL_CRASH_DUMP=/var/run/%%PORTNAME%%/erl_crash.dump \
COUCHDB_FAUXTON_DOCROOT=%%WWWDIR%% \
COUCHDB_QUERY_SERVER_JAVASCRIPT="%%APPDIR%%/bin/couchjs %%APPDIR%%/share/server/main.js" \
COUCHDB_QUERY_SERVER_COFFEESCRIPT="%%APPDIR%%/bin/couchjs %%APPDIR%%/share/server/main-coffee.js" \
diff --git a/databases/couchdb3/files/patch-rel_reltool.config b/databases/couchdb3/files/patch-rel_reltool.config
index 8f9402504e59..9f377c4de794 100644
--- a/databases/couchdb3/files/patch-rel_reltool.config
+++ b/databases/couchdb3/files/patch-rel_reltool.config
@@ -6,5 +6,5 @@
{sys, [
+ {excl_lib, otp_root}, %% require erts runtime from FreeBSD ports
{lib_dirs, ["../src"]},
- {rel, "couchdb", "3.2.1", [
+ {rel, "couchdb", "3.3.2", [
%% stdlib
diff --git a/databases/couchdb3/pkg-plist b/databases/couchdb3/pkg-plist
index cd9fa9f731d2..ea187618037d 100644
--- a/databases/couchdb3/pkg-plist
+++ b/databases/couchdb3/pkg-plist
@@ -509,13 +509,13 @@ libexec/couchdb3/lib/mochiweb-3.1.1/ebin/mochiweb_util.beam
libexec/couchdb3/lib/mochiweb-3.1.1/ebin/mochiweb_websocket.beam
libexec/couchdb3/lib/mochiweb-3.1.1/ebin/reloader.beam
libexec/couchdb3/lib/mochiweb-3.1.1/include/internal.hrl
-libexec/couchdb3/lib/recon-2.5.2/ebin/recon.app
-libexec/couchdb3/lib/recon-2.5.2/ebin/recon.beam
-libexec/couchdb3/lib/recon-2.5.2/ebin/recon_alloc.beam
-libexec/couchdb3/lib/recon-2.5.2/ebin/recon_lib.beam
-libexec/couchdb3/lib/recon-2.5.2/ebin/recon_map.beam
-libexec/couchdb3/lib/recon-2.5.2/ebin/recon_rec.beam
-libexec/couchdb3/lib/recon-2.5.2/ebin/recon_trace.beam
+libexec/couchdb3/lib/recon-2.5.3/ebin/recon.app
+libexec/couchdb3/lib/recon-2.5.3/ebin/recon.beam
+libexec/couchdb3/lib/recon-2.5.3/ebin/recon_alloc.beam
+libexec/couchdb3/lib/recon-2.5.3/ebin/recon_lib.beam
+libexec/couchdb3/lib/recon-2.5.3/ebin/recon_map.beam
+libexec/couchdb3/lib/recon-2.5.3/ebin/recon_rec.beam
+libexec/couchdb3/lib/recon-2.5.3/ebin/recon_trace.beam
libexec/couchdb3/lib/rexi-%%VERSION%%/ebin/rexi.app
libexec/couchdb3/lib/rexi-%%VERSION%%/ebin/rexi.beam
libexec/couchdb3/lib/rexi-%%VERSION%%/ebin/rexi_app.beam