Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Jun 2020 15:38:39 +0000 (UTC)
From:      Dave Cottlehuber <dch@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r538498 - in head/databases/couchdb3: . files
Message-ID:  <202006111538.05BFcdKA057783@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dch
Date: Thu Jun 11 15:38:39 2020
New Revision: 538498
URL: https://svnweb.freebsd.org/changeset/ports/538498

Log:
  databases/couchdb3: re-enable web UI
  
  over-zealous PORTNAME replacement breaks the environment vars that
  tell CouchDB where to serve files for the administrator portal.
  
  Sponsored by:	SkunkWerks, GmbH

Modified:
  head/databases/couchdb3/Makefile
  head/databases/couchdb3/files/couchdb3.in

Modified: head/databases/couchdb3/Makefile
==============================================================================
--- head/databases/couchdb3/Makefile	Thu Jun 11 15:27:26 2020	(r538497)
+++ head/databases/couchdb3/Makefile	Thu Jun 11 15:38:39 2020	(r538498)
@@ -2,6 +2,7 @@
 
 PORTNAME=	couchdb3
 DISTVERSION=	3.1.0
+PORTVERSION=	1
 CATEGORIES=	databases
 MASTER_SITES=	APACHE/couchdb/source/${DISTVERSION}
 DISTNAME=	apache-couchdb-${DISTVERSION}

Modified: head/databases/couchdb3/files/couchdb3.in
==============================================================================
--- head/databases/couchdb3/files/couchdb3.in	Thu Jun 11 15:27:26 2020	(r538497)
+++ head/databases/couchdb3/files/couchdb3.in	Thu Jun 11 15:38:39 2020	(r538498)
@@ -48,9 +48,9 @@ erl_flags="${erl_sasl} ${erl_boot} ${erl_args} ${%%POR
         env ERL_FLAGS="${erl_flags}" \
         HOME=/var/run/couchdb \
         ERL_CRASH_DUMP=/var/run/couchdb/erl_crash.dump \
-        %%PORTNAME%%_FAUXTON_DOCROOT=%%WWWDIR%% \
-        %%PORTNAME%%_QUERY_SERVER_JAVASCRIPT="%%APPDIR%%/bin/couchjs %%APPDIR%%/share/server/main.js" \
-        %%PORTNAME%%_QUERY_SERVER_COFFEESCRIPT="%%APPDIR%%/bin/couchjs %%APPDIR%%/share/server/main-coffee.js" \
+        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" \
         ${command}
 }
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006111538.05BFcdKA057783>