From owner-svn-ports-all@freebsd.org Thu Jun 11 15:38:40 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 07BF9336E10; Thu, 11 Jun 2020 15:38:40 +0000 (UTC) (envelope-from dch@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49jSgg6RYMz3dpv; Thu, 11 Jun 2020 15:38:39 +0000 (UTC) (envelope-from dch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D851D1A799; Thu, 11 Jun 2020 15:38:39 +0000 (UTC) (envelope-from dch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05BFcdEk057784; Thu, 11 Jun 2020 15:38:39 GMT (envelope-from dch@FreeBSD.org) Received: (from dch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05BFcdKA057783; Thu, 11 Jun 2020 15:38:39 GMT (envelope-from dch@FreeBSD.org) Message-Id: <202006111538.05BFcdKA057783@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dch set sender to dch@FreeBSD.org using -f From: Dave Cottlehuber Date: Thu, 11 Jun 2020 15:38:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538498 - in head/databases/couchdb3: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dch X-SVN-Commit-Paths: in head/databases/couchdb3: . files X-SVN-Commit-Revision: 538498 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jun 2020 15:38:40 -0000 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} }