diff options
| -rw-r--r-- | databases/couchdb/Makefile | 12 | ||||
| -rw-r--r-- | databases/couchdb/PLIST | 69 | ||||
| -rw-r--r-- | databases/couchdb/distinfo | 24 | ||||
| -rw-r--r-- | databases/couchdb/patches/patch-aa | 18 | ||||
| -rw-r--r-- | databases/couchdb/patches/patch-rebar.config.script | 12 | ||||
| -rw-r--r-- | databases/couchdb/patches/patch-rel_files_couchdb.in (renamed from databases/couchdb/patches/patch-rel_overlay_bin_couchdb) | 18 | ||||
| -rw-r--r-- | databases/couchdb/patches/patch-rel_overlay_etc_default.ini | 19 | ||||
| -rw-r--r-- | databases/couchdb/patches/patch-src_config_src_config__app.erl | 4 | ||||
| -rw-r--r-- | databases/couchdb/patches/patch-src_couch_rebar.config.script | 38 | ||||
| -rw-r--r-- | databases/couchdb/patches/patch-src_snappy_rebar.config | 10 |
10 files changed, 124 insertions, 100 deletions
diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile index 99787b121df..c24b482925f 100644 --- a/databases/couchdb/Makefile +++ b/databases/couchdb/Makefile @@ -1,13 +1,12 @@ -# $NetBSD: Makefile,v 1.58 2019/08/22 12:22:57 ryoon Exp $ +# $NetBSD: Makefile,v 1.59 2019/09/06 09:10:47 jperkin Exp $ # -DISTNAME= apache-couchdb-2.1.1 +DISTNAME= apache-couchdb-2.3.1 PKGNAME= ${DISTNAME:S/apache-//} -PKGREVISION= 12 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_APACHE:=couchdb/source/${PKGVERSION_NOREV}/} -MAINTAINER= fhajny@NetBSD.org +MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://couchdb.apache.org/ COMMENT= Document database server, accessible via a RESTful JSON API LICENSE= apache-2.0 @@ -80,6 +79,10 @@ INSTALLATION_DIRS+= couchdb/share/server couchdb/share/www/docs INSTALLATION_DIRS+= ${PKGMANDIR}/man1 INSTALLATION_DIRS+= share/examples/couchdb +CTF_FILES_SKIP+= couchdb/erts*/bin/* +CTF_FILES_SKIP+= couchdb/lib/*/priv/bin/* +CTF_FILES_SKIP+= couchdb/lib/*/priv/lib/*.so + RCD_SCRIPTS+= couchdb # This is silly, but the rebar release target embeds the Erlang VM @@ -116,7 +119,6 @@ do-install: BUILDLINK_DEPMETHOD.erlang= build .include "../../mk/termcap.buildlink3.mk" .include "../../lang/erlang/buildlink3.mk" - .include "../../lang/spidermonkey185/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../textproc/icu/buildlink3.mk" diff --git a/databases/couchdb/PLIST b/databases/couchdb/PLIST index 240bf242fce..acf59be4dc8 100644 --- a/databases/couchdb/PLIST +++ b/databases/couchdb/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2017/11/07 15:33:27 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.10 2019/09/06 09:10:47 jperkin Exp $ bin/couchdb bin/couchjs couchdb/releases/${PKGVERSION}/couchdb.boot @@ -13,7 +13,7 @@ couchdb/releases/RELEASES couchdb/releases/start_erl.data couchdb/share/server/main-coffee.js couchdb/share/server/main.js -couchdb/share/www/dashboard.assets/css/styles.25bdeac6d2ce92b30461.css +couchdb/share/www/dashboard.assets/css/styles.89dbadd64e69e0df7653.css couchdb/share/www/dashboard.assets/fonts/fauxtonicon5.eot couchdb/share/www/dashboard.assets/fonts/fauxtonicon5.ttf couchdb/share/www/dashboard.assets/fonts/fauxtonicon5.woff @@ -31,9 +31,9 @@ couchdb/share/www/dashboard.assets/img/googleplus.png couchdb/share/www/dashboard.assets/img/linkedin.png couchdb/share/www/dashboard.assets/img/loader.gif couchdb/share/www/dashboard.assets/img/twitter.png -couchdb/share/www/dashboard.assets/js/bundle.25bdeac6d2ce92b30461.js -couchdb/share/www/dashboard.assets/js/manifest.9900c5a8eb329caf2817.js -couchdb/share/www/dashboard.assets/js/vendor.884175873da25bb4e526.js +couchdb/share/www/dashboard.assets/js/bundle.89dbadd64e69e0df7653.js +couchdb/share/www/dashboard.assets/js/manifest.a154524a560e5f6f431b.js +couchdb/share/www/dashboard.assets/js/vendor.9993972098ce728e0fc2.js couchdb/share/www/docs/_images/intro-consistency-01.png couchdb/share/www/docs/_images/intro-consistency-02.png couchdb/share/www/docs/_images/intro-consistency-03.png @@ -44,7 +44,11 @@ couchdb/share/www/docs/_images/intro-consistency-07.png couchdb/share/www/docs/_images/intro-why-01.png couchdb/share/www/docs/_images/intro-why-02.png couchdb/share/www/docs/_images/intro-why-03.png +couchdb/share/www/docs/_images/purge-checkpoint-docs.png couchdb/share/www/docs/_images/replication-state-diagram.svg +couchdb/share/www/docs/_images/rev-tree1.png +couchdb/share/www/docs/_images/rev-tree2.png +couchdb/share/www/docs/_images/rev-tree3.png couchdb/share/www/docs/_images/views-intro-01.png couchdb/share/www/docs/_images/views-intro-02.png couchdb/share/www/docs/_images/views-intro-03.png @@ -59,6 +63,7 @@ couchdb/share/www/docs/_sources/api/database/find.rst.txt couchdb/share/www/docs/_sources/api/database/index.rst.txt couchdb/share/www/docs/_sources/api/database/misc.rst.txt couchdb/share/www/docs/_sources/api/database/security.rst.txt +couchdb/share/www/docs/_sources/api/database/shard.rst.txt couchdb/share/www/docs/_sources/api/ddoc/common.rst.txt couchdb/share/www/docs/_sources/api/ddoc/index.rst.txt couchdb/share/www/docs/_sources/api/ddoc/render.rst.txt @@ -73,10 +78,17 @@ couchdb/share/www/docs/_sources/api/server/authn.rst.txt couchdb/share/www/docs/_sources/api/server/common.rst.txt couchdb/share/www/docs/_sources/api/server/configuration.rst.txt couchdb/share/www/docs/_sources/api/server/index.rst.txt +couchdb/share/www/docs/_sources/best-practices/documents.rst.txt +couchdb/share/www/docs/_sources/best-practices/forms.rst.txt +couchdb/share/www/docs/_sources/best-practices/index.rst.txt +couchdb/share/www/docs/_sources/best-practices/iso-date.rst.txt +couchdb/share/www/docs/_sources/best-practices/jsdevel.rst.txt +couchdb/share/www/docs/_sources/best-practices/reverse-proxies.rst.txt +couchdb/share/www/docs/_sources/best-practices/views.rst.txt couchdb/share/www/docs/_sources/cluster/databases.rst.txt couchdb/share/www/docs/_sources/cluster/index.rst.txt couchdb/share/www/docs/_sources/cluster/nodes.rst.txt -couchdb/share/www/docs/_sources/cluster/setup.rst.txt +couchdb/share/www/docs/_sources/cluster/purging.rst.txt couchdb/share/www/docs/_sources/cluster/sharding.rst.txt couchdb/share/www/docs/_sources/cluster/theory.rst.txt couchdb/share/www/docs/_sources/config/auth.rst.txt @@ -84,14 +96,11 @@ couchdb/share/www/docs/_sources/config/cluster.rst.txt couchdb/share/www/docs/_sources/config/compaction.rst.txt couchdb/share/www/docs/_sources/config/couch-peruser.rst.txt couchdb/share/www/docs/_sources/config/couchdb.rst.txt -couchdb/share/www/docs/_sources/config/externals.rst.txt -couchdb/share/www/docs/_sources/config/http-handlers.rst.txt couchdb/share/www/docs/_sources/config/http.rst.txt couchdb/share/www/docs/_sources/config/index.rst.txt couchdb/share/www/docs/_sources/config/intro.rst.txt couchdb/share/www/docs/_sources/config/logging.rst.txt couchdb/share/www/docs/_sources/config/misc.rst.txt -couchdb/share/www/docs/_sources/config/proxying.rst.txt couchdb/share/www/docs/_sources/config/query-servers.rst.txt couchdb/share/www/docs/_sources/config/replicator.rst.txt couchdb/share/www/docs/_sources/config/services.rst.txt @@ -103,6 +112,11 @@ couchdb/share/www/docs/_sources/cve/2012-5641.rst.txt couchdb/share/www/docs/_sources/cve/2012-5649.rst.txt couchdb/share/www/docs/_sources/cve/2012-5650.rst.txt couchdb/share/www/docs/_sources/cve/2014-2668.rst.txt +couchdb/share/www/docs/_sources/cve/2017-12635.rst.txt +couchdb/share/www/docs/_sources/cve/2017-12636.rst.txt +couchdb/share/www/docs/_sources/cve/2018-11769.rst.txt +couchdb/share/www/docs/_sources/cve/2018-17188.rst.txt +couchdb/share/www/docs/_sources/cve/2018-8007.rst.txt couchdb/share/www/docs/_sources/cve/index.rst.txt couchdb/share/www/docs/_sources/ddocs/ddocs.rst.txt couchdb/share/www/docs/_sources/ddocs/index.rst.txt @@ -113,7 +127,6 @@ couchdb/share/www/docs/_sources/ddocs/views/joins.rst.txt couchdb/share/www/docs/_sources/ddocs/views/nosql.rst.txt couchdb/share/www/docs/_sources/ddocs/views/pagination.rst.txt couchdb/share/www/docs/_sources/experimental.rst.txt -couchdb/share/www/docs/_sources/externals.rst.txt couchdb/share/www/docs/_sources/fauxton/index.rst.txt couchdb/share/www/docs/_sources/fauxton/install.rst.txt couchdb/share/www/docs/_sources/index.rst.txt @@ -121,7 +134,6 @@ couchdb/share/www/docs/_sources/install/docker.rst.txt couchdb/share/www/docs/_sources/install/freebsd.rst.txt couchdb/share/www/docs/_sources/install/index.rst.txt couchdb/share/www/docs/_sources/install/mac.rst.txt -couchdb/share/www/docs/_sources/install/setup.rst.txt couchdb/share/www/docs/_sources/install/snap.rst.txt couchdb/share/www/docs/_sources/install/troubleshooting.rst.txt couchdb/share/www/docs/_sources/install/unix.rst.txt @@ -136,6 +148,7 @@ couchdb/share/www/docs/_sources/intro/security.rst.txt couchdb/share/www/docs/_sources/intro/tour.rst.txt couchdb/share/www/docs/_sources/intro/why.rst.txt couchdb/share/www/docs/_sources/json-structure.rst.txt +couchdb/share/www/docs/_sources/maintenance/backups.rst.txt couchdb/share/www/docs/_sources/maintenance/compaction.rst.txt couchdb/share/www/docs/_sources/maintenance/index.rst.txt couchdb/share/www/docs/_sources/maintenance/performance.rst.txt @@ -148,6 +161,9 @@ couchdb/share/www/docs/_sources/replication/index.rst.txt couchdb/share/www/docs/_sources/replication/intro.rst.txt couchdb/share/www/docs/_sources/replication/protocol.rst.txt couchdb/share/www/docs/_sources/replication/replicator.rst.txt +couchdb/share/www/docs/_sources/setup/cluster.rst.txt +couchdb/share/www/docs/_sources/setup/index.rst.txt +couchdb/share/www/docs/_sources/setup/single-node.rst.txt couchdb/share/www/docs/_sources/whatsnew/0.10.rst.txt couchdb/share/www/docs/_sources/whatsnew/0.11.rst.txt couchdb/share/www/docs/_sources/whatsnew/0.8.rst.txt @@ -159,8 +175,11 @@ couchdb/share/www/docs/_sources/whatsnew/1.3.rst.txt couchdb/share/www/docs/_sources/whatsnew/1.4.rst.txt couchdb/share/www/docs/_sources/whatsnew/1.5.rst.txt couchdb/share/www/docs/_sources/whatsnew/1.6.rst.txt +couchdb/share/www/docs/_sources/whatsnew/1.7.rst.txt couchdb/share/www/docs/_sources/whatsnew/2.0.rst.txt couchdb/share/www/docs/_sources/whatsnew/2.1.rst.txt +couchdb/share/www/docs/_sources/whatsnew/2.2.rst.txt +couchdb/share/www/docs/_sources/whatsnew/2.3.rst.txt couchdb/share/www/docs/_sources/whatsnew/index.rst.txt couchdb/share/www/docs/_static/ajax-loader.gif couchdb/share/www/docs/_static/basic.css @@ -209,6 +228,7 @@ couchdb/share/www/docs/api/database/find.html couchdb/share/www/docs/api/database/index.html couchdb/share/www/docs/api/database/misc.html couchdb/share/www/docs/api/database/security.html +couchdb/share/www/docs/api/database/shard.html couchdb/share/www/docs/api/ddoc/common.html couchdb/share/www/docs/api/ddoc/index.html couchdb/share/www/docs/api/ddoc/render.html @@ -223,10 +243,17 @@ couchdb/share/www/docs/api/server/authn.html couchdb/share/www/docs/api/server/common.html couchdb/share/www/docs/api/server/configuration.html couchdb/share/www/docs/api/server/index.html +couchdb/share/www/docs/best-practices/documents.html +couchdb/share/www/docs/best-practices/forms.html +couchdb/share/www/docs/best-practices/index.html +couchdb/share/www/docs/best-practices/iso-date.html +couchdb/share/www/docs/best-practices/jsdevel.html +couchdb/share/www/docs/best-practices/reverse-proxies.html +couchdb/share/www/docs/best-practices/views.html couchdb/share/www/docs/cluster/databases.html couchdb/share/www/docs/cluster/index.html couchdb/share/www/docs/cluster/nodes.html -couchdb/share/www/docs/cluster/setup.html +couchdb/share/www/docs/cluster/purging.html couchdb/share/www/docs/cluster/sharding.html couchdb/share/www/docs/cluster/theory.html couchdb/share/www/docs/config-ref.html @@ -235,14 +262,11 @@ couchdb/share/www/docs/config/cluster.html couchdb/share/www/docs/config/compaction.html couchdb/share/www/docs/config/couch-peruser.html couchdb/share/www/docs/config/couchdb.html -couchdb/share/www/docs/config/externals.html -couchdb/share/www/docs/config/http-handlers.html couchdb/share/www/docs/config/http.html couchdb/share/www/docs/config/index.html couchdb/share/www/docs/config/intro.html couchdb/share/www/docs/config/logging.html couchdb/share/www/docs/config/misc.html -couchdb/share/www/docs/config/proxying.html couchdb/share/www/docs/config/query-servers.html couchdb/share/www/docs/config/replicator.html couchdb/share/www/docs/config/services.html @@ -254,6 +278,11 @@ couchdb/share/www/docs/cve/2012-5641.html couchdb/share/www/docs/cve/2012-5649.html couchdb/share/www/docs/cve/2012-5650.html couchdb/share/www/docs/cve/2014-2668.html +couchdb/share/www/docs/cve/2017-12635.html +couchdb/share/www/docs/cve/2017-12636.html +couchdb/share/www/docs/cve/2018-11769.html +couchdb/share/www/docs/cve/2018-17188.html +couchdb/share/www/docs/cve/2018-8007.html couchdb/share/www/docs/cve/index.html couchdb/share/www/docs/ddocs/ddocs.html couchdb/share/www/docs/ddocs/index.html @@ -265,7 +294,6 @@ couchdb/share/www/docs/ddocs/views/nosql.html couchdb/share/www/docs/ddocs/views/pagination.html couchdb/share/www/docs/download.html couchdb/share/www/docs/experimental.html -couchdb/share/www/docs/externals.html couchdb/share/www/docs/fauxton/index.html couchdb/share/www/docs/fauxton/install.html couchdb/share/www/docs/http-api.html @@ -274,7 +302,6 @@ couchdb/share/www/docs/install/docker.html couchdb/share/www/docs/install/freebsd.html couchdb/share/www/docs/install/index.html couchdb/share/www/docs/install/mac.html -couchdb/share/www/docs/install/setup.html couchdb/share/www/docs/install/snap.html couchdb/share/www/docs/install/troubleshooting.html couchdb/share/www/docs/install/unix.html @@ -289,6 +316,7 @@ couchdb/share/www/docs/intro/security.html couchdb/share/www/docs/intro/tour.html couchdb/share/www/docs/intro/why.html couchdb/share/www/docs/json-structure.html +couchdb/share/www/docs/maintenance/backups.html couchdb/share/www/docs/maintenance/compaction.html couchdb/share/www/docs/maintenance/index.html couchdb/share/www/docs/maintenance/performance.html @@ -304,6 +332,9 @@ couchdb/share/www/docs/replication/protocol.html couchdb/share/www/docs/replication/replicator.html couchdb/share/www/docs/search.html couchdb/share/www/docs/searchindex.js +couchdb/share/www/docs/setup/cluster.html +couchdb/share/www/docs/setup/index.html +couchdb/share/www/docs/setup/single-node.html couchdb/share/www/docs/whatsnew/0.10.html couchdb/share/www/docs/whatsnew/0.11.html couchdb/share/www/docs/whatsnew/0.8.html @@ -315,8 +346,11 @@ couchdb/share/www/docs/whatsnew/1.3.html couchdb/share/www/docs/whatsnew/1.4.html couchdb/share/www/docs/whatsnew/1.5.html couchdb/share/www/docs/whatsnew/1.6.html +couchdb/share/www/docs/whatsnew/1.7.html couchdb/share/www/docs/whatsnew/2.0.html couchdb/share/www/docs/whatsnew/2.1.html +couchdb/share/www/docs/whatsnew/2.2.html +couchdb/share/www/docs/whatsnew/2.3.html couchdb/share/www/docs/whatsnew/index.html couchdb/share/www/index.html man/man1/couchdb.1 @@ -324,3 +358,4 @@ share/examples/couchdb/default.ini share/examples/couchdb/local.ini share/examples/couchdb/vm.args @pkgdir couchdb/erts-${VERSION.erts}/man +@pkgdir couchdb/erts-${VERSION.erts}/doc diff --git a/databases/couchdb/distinfo b/databases/couchdb/distinfo index adcb92b9310..6700ec205fb 100644 --- a/databases/couchdb/distinfo +++ b/databases/couchdb/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.17 2018/09/27 20:12:02 tnn Exp $ +$NetBSD: distinfo,v 1.18 2019/09/06 09:10:47 jperkin Exp $ -SHA1 (apache-couchdb-2.1.1.tar.gz) = 794db4292b4772bdb9f199d906a368b8ff7499f3 -RMD160 (apache-couchdb-2.1.1.tar.gz) = 99e47849d631d9e3f9ae7e65f1af31ebc2c6263f -SHA512 (apache-couchdb-2.1.1.tar.gz) = 01fc71a85455e72319004cc9bf4afc66d03293ed465719598b040291e3f7f80ed93f612076ce76b961046ebeca437289c5399ecbe267b1dc0301ecb622a7bc26 -Size (apache-couchdb-2.1.1.tar.gz) = 12132981 bytes -SHA1 (patch-aa) = 0c6531bb466ca2ee96a9fc2a6bc11e2e80ca3027 -SHA1 (patch-rebar.config.script) = 4412b72d9425e8bd1f196282f88844e831a372bd -SHA1 (patch-rel_overlay_bin_couchdb) = 51106f746b5ecedf27b1f607ec9a8b8dfe4518c9 -SHA1 (patch-rel_overlay_etc_default.ini) = 9df3705739753733f4e42779acff7d2c874996f8 -SHA1 (patch-src_config_src_config__app.erl) = 6c0be4a23c47973234ede0435fe4573a620fae6f -SHA1 (patch-src_couch_rebar.config.script) = d68ffff8e0d368e8f071293b9bcb5525acc2b30f -SHA1 (patch-src_snappy_rebar.config) = 6c92be6ca70a7742cdd42c6fa817c2702a297e2e +SHA1 (apache-couchdb-2.3.1.tar.gz) = 075a4f2fa2b1f2274f089593338e9ee86b61ee62 +RMD160 (apache-couchdb-2.3.1.tar.gz) = 2d43affc236c536694c061ef7c1a89b489ef6bc9 +SHA512 (apache-couchdb-2.3.1.tar.gz) = a34a8775b2be3c51f48c9f45c5ccaa01fbd8435d58aa326e1e53f1c82678fdbf657f90003d476ad43d3898bbd3cbedfc2dd9adbd2d98cec31f850ca743c8c64c +Size (apache-couchdb-2.3.1.tar.gz) = 13473795 bytes +SHA1 (patch-aa) = 29ed1e926047bf69501249434664a5243a26c831 +SHA1 (patch-rebar.config.script) = 628340e6a8085e92d4193ac11905eebd8377a6b6 +SHA1 (patch-rel_files_couchdb.in) = d94bf0e54657fea26dd42e807cc2de36a67e8fda +SHA1 (patch-rel_overlay_etc_default.ini) = 203af5ee1684288b66103842c30fa0f9135abd4b +SHA1 (patch-src_config_src_config__app.erl) = 62c15c6e48961736dab4dd0d27b0c968847df323 +SHA1 (patch-src_couch_rebar.config.script) = 75f1d2d8aaa32d87f79c1c9820fad9b1d7b2b03b +SHA1 (patch-src_snappy_rebar.config) = 767157cd1ff73267d8b023c2902d3861aedbc61b diff --git a/databases/couchdb/patches/patch-aa b/databases/couchdb/patches/patch-aa index 694e812d852..8d40eac1ac7 100644 --- a/databases/couchdb/patches/patch-aa +++ b/databases/couchdb/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.10 2017/11/07 15:33:27 fhajny Exp $ +$NetBSD: patch-aa,v 1.11 2019/09/06 09:10:48 jperkin Exp $ Set pkgsrc standard paths. Portability. ---- configure.orig 2017-11-01 02:52:10.000000000 +0000 +--- configure.orig 2019-03-05 22:42:20.000000000 +0000 +++ configure -@@ -85,7 +85,7 @@ parse_opts() { +@@ -102,7 +102,7 @@ parse_opts() { --rebar) if [ -x "$2" ]; then @@ -13,7 +13,7 @@ Set pkgsrc standard paths. Portability. if [ $? -ne 0 ]; then printf 'Rebar >=2.6.0 and <3.0.0 required' >&2 exit 1 -@@ -150,11 +150,11 @@ cat > rel/couchdb.config << EOF +@@ -167,11 +167,11 @@ cat > rel/couchdb.config << EOF % The contents of this file are auto-generated by configure % {package_author_name, "$PACKAGE_AUTHOR_NAME"}. @@ -22,11 +22,11 @@ Set pkgsrc standard paths. Portability. -{view_index_dir, "./data"}. -{log_file, "$LOG_FILE"}. -{fauxton_root, "./share/www"}. -+{prefix, "@PREFIX@/couchdb"}. -+{data_dir, "@COUCH_DBDIR@"}. -+{view_index_dir, "@COUCH_DBDIR@"}. -+{log_file, "@COUCH_LOGDIR@/couch.log"}. -+{fauxton_root, "@PREFIX@/couchdb/share/www"}. ++{prefix, "/opt/local/couchdb"}. ++{data_dir, "/var/db/couchdb"}. ++{view_index_dir, "/var/db/couchdb"}. ++{log_file, "/var/log/couchdb/couch.log"}. ++{fauxton_root, "/opt/local/couchdb/share/www"}. {user, "$COUCHDB_USER"}. {node_name, "-name couchdb@127.0.0.1"}. {cluster_port, 5984}. diff --git a/databases/couchdb/patches/patch-rebar.config.script b/databases/couchdb/patches/patch-rebar.config.script index f92a060ddb8..c84059f0247 100644 --- a/databases/couchdb/patches/patch-rebar.config.script +++ b/databases/couchdb/patches/patch-rebar.config.script @@ -1,15 +1,15 @@ -$NetBSD: patch-rebar.config.script,v 1.1 2018/09/27 20:12:02 tnn Exp $ +$NetBSD: patch-rebar.config.script,v 1.2 2019/09/06 09:10:48 jperkin Exp $ -accept OTP 21 +Support newer OTP. ---- rebar.config.script.orig 2017-11-01 02:52:10.000000000 +0000 +--- rebar.config.script.orig 2019-03-05 22:42:20.000000000 +0000 +++ rebar.config.script -@@ -85,7 +85,7 @@ MakeDep = fun +@@ -128,7 +128,7 @@ ErlOpts = case os:getenv("ERL_OPTS") of end, AddConfig = [ -- {require_otp_vsn, "R16B03|R16B03-1|17|18|19|20"}, -+ {require_otp_vsn, "R16B03|R16B03-1|17|18|19|20|21"}, +- {require_otp_vsn, "17|18|19|20|21"}, ++ {require_otp_vsn, "17|18|19|20|21|22"}, {deps_dir, "src"}, {deps, lists:map(MakeDep, DepDescs)}, {sub_dirs, SubDirs}, diff --git a/databases/couchdb/patches/patch-rel_overlay_bin_couchdb b/databases/couchdb/patches/patch-rel_files_couchdb.in index 3990ba06344..6c80dc1131c 100644 --- a/databases/couchdb/patches/patch-rel_overlay_bin_couchdb +++ b/databases/couchdb/patches/patch-rel_files_couchdb.in @@ -1,9 +1,9 @@ -$NetBSD: patch-rel_overlay_bin_couchdb,v 1.2 2017/11/07 15:33:27 fhajny Exp $ +$NetBSD: patch-rel_files_couchdb.in,v 1.1 2019/09/06 09:10:48 jperkin Exp $ -Set pkgsrc standard paths. +Support pkgsrc layout. ---- rel/overlay/bin/couchdb.orig 2017-07-30 22:11:20.000000000 +0000 -+++ rel/overlay/bin/couchdb +--- rel/files/couchdb.in.orig 2019-03-05 22:42:20.000000000 +0000 ++++ rel/files/couchdb.in @@ -12,11 +12,7 @@ # License for the specific language governing permissions and limitations under # the License. @@ -13,14 +13,14 @@ Set pkgsrc standard paths. -cd "$COUCHDB_BIN_DIR/../" - -export ROOTDIR=${ERTS_BIN_DIR%/*} -+export ROOTDIR=@PREFIX@/couchdb ++export ROOTDIR="@PREFIX@/couchdb" START_ERL=`cat "$ROOTDIR/releases/start_erl.data"` ERTS_VSN=${START_ERL% *} -@@ -27,5 +23,5 @@ export EMU=beam - export PROGNAME=`echo $0 | sed 's/.*\///'` +@@ -33,5 +29,5 @@ ARGS_FILE="${COUCHDB_ARGS_FILE:-$ROOTDIR + SYSCONFIG_FILE="${COUCHDB_SYSCONFIG_FILE:-$ROOTDIR/releases/$APP_VSN/sys.config}" exec "$BINDIR/erlexec" -boot "$ROOTDIR/releases/$APP_VSN/couchdb" \ -- -args_file "$ROOTDIR/etc/vm.args" \ +- -args_file "${ARGS_FILE}" \ + -args_file "@PKG_SYSCONFDIR@/vm.args" \ - -config "$ROOTDIR/releases/$APP_VSN/sys.config" "$@" + -config "${SYSCONFIG_FILE}" "$@" diff --git a/databases/couchdb/patches/patch-rel_overlay_etc_default.ini b/databases/couchdb/patches/patch-rel_overlay_etc_default.ini index 8eb2b6a1816..15e594469e0 100644 --- a/databases/couchdb/patches/patch-rel_overlay_etc_default.ini +++ b/databases/couchdb/patches/patch-rel_overlay_etc_default.ini @@ -1,21 +1,10 @@ -$NetBSD: patch-rel_overlay_etc_default.ini,v 1.2 2017/11/07 15:33:27 fhajny Exp $ +$NetBSD: patch-rel_overlay_etc_default.ini,v 1.3 2019/09/06 09:10:48 jperkin Exp $ Set pkgsrc standard paths. ---- rel/overlay/etc/default.ini.orig 2017-07-30 22:11:20.000000000 +0000 +--- rel/overlay/etc/default.ini.orig 2019-03-05 22:42:20.000000000 +0000 +++ rel/overlay/etc/default.ini -@@ -203,8 +203,8 @@ credentials = false - ; hosts = - - [query_servers] --javascript = {{prefix}}/bin/couchjs {{prefix}}/share/server/main.js --coffeescript = {{prefix}}/bin/couchjs {{prefix}}/share/server/main-coffee.js -+javascript = {{prefix}}/../bin/couchjs {{prefix}}/share/server/main.js -+coffeescript = {{prefix}}/../bin/couchjs {{prefix}}/share/server/main-coffee.js - - ; enable mango query engine - [native_query_servers] -@@ -492,7 +492,7 @@ level = info +@@ -532,7 +532,7 @@ level = info ; rsyslog writer for deployments that need to have logs sent ; over the network. ; @@ -24,7 +13,7 @@ Set pkgsrc standard paths. ; ; File Writer Options: ; -@@ -500,7 +500,7 @@ writer = stderr +@@ -540,7 +540,7 @@ writer = stderr ; to reopen its file. This is useful for people that configure ; logrotate to move log files periodically. ; diff --git a/databases/couchdb/patches/patch-src_config_src_config__app.erl b/databases/couchdb/patches/patch-src_config_src_config__app.erl index 9cf399fd454..1d3711ca014 100644 --- a/databases/couchdb/patches/patch-src_config_src_config__app.erl +++ b/databases/couchdb/patches/patch-src_config_src_config__app.erl @@ -1,8 +1,8 @@ -$NetBSD: patch-src_config_src_config__app.erl,v 1.1 2016/11/16 15:59:29 fhajny Exp $ +$NetBSD: patch-src_config_src_config__app.erl,v 1.2 2019/09/06 09:10:48 jperkin Exp $ Set pkgsrc standard paths. ---- src/config/src/config_app.erl.orig 2016-08-24 19:21:47.000000000 +0000 +--- src/config/src/config_app.erl.orig 2018-11-13 07:09:52.000000000 +0000 +++ src/config/src/config_app.erl @@ -48,7 +48,7 @@ command_line() -> end. diff --git a/databases/couchdb/patches/patch-src_couch_rebar.config.script b/databases/couchdb/patches/patch-src_couch_rebar.config.script index 45d25239b56..18fa1319e8b 100644 --- a/databases/couchdb/patches/patch-src_couch_rebar.config.script +++ b/databases/couchdb/patches/patch-src_couch_rebar.config.script @@ -1,13 +1,13 @@ -$NetBSD: patch-src_couch_rebar.config.script,v 1.1 2016/11/16 15:59:29 fhajny Exp $ +$NetBSD: patch-src_couch_rebar.config.script,v 1.2 2019/09/06 09:10:48 jperkin Exp $ Set pkgsrc standard paths. Use pkg-config to set SpiderMonkey CFLAGS/LDFLAGS. ---- src/couch/rebar.config.script.orig 2016-09-12 09:28:51.000000000 +0000 +--- src/couch/rebar.config.script.orig 2019-03-05 22:42:20.000000000 +0000 +++ src/couch/rebar.config.script -@@ -64,23 +64,28 @@ ConfigSrc = [["#define ", K, " ", V, $\n - ConfigBin = iolist_to_binary(ConfigSrc), - ok = CopyIfDifferent(CouchJSConfig, ConfigBin), +@@ -78,23 +78,26 @@ MD5Config = case lists:keyfind(erlang_md + [] + end, +CFLAGS = [os:getenv("CFLAGS")], +LDFLAGS = [os:getenv("LDFLAGS")], @@ -22,8 +22,6 @@ Use pkg-config to set SpiderMonkey CFLAGS/LDFLAGS. {"/DHAVE_CURL /IC:\\relax\\curl\\include", "/LIBPATH:C:\\relax\\js-1.8.5\\js\\src /LIBPATH:C:\\Relax\\curl\\lib\\release-ssl mozjs185-1.0.lib libcurl_imp.lib"}; - {unix, freebsd} -> - {"-DHAVE_CURL -I/usr/local/include", "-DHAVE_CURL -lmozjs185 -lcurl"}; -+ {unix, bsd} -> -+ {"$CFLAGS -DHAVE_CURL " ++ JSFLAGS, "$LDFLAGS -DHAVE_CURL -lcurl " ++ JSLIBS}; _ -> - {"-DHAVE_CURL", "-DHAVE_CURL -lmozjs185 -lcurl"} + {"$CFLAGS -DHAVE_CURL " ++ JSFLAGS, "$LDFLAGS -DHAVE_CURL -lcurl " ++ JSLIBS} @@ -38,7 +36,7 @@ Use pkg-config to set SpiderMonkey CFLAGS/LDFLAGS. end end, -@@ -88,33 +93,38 @@ CouchJSSrc = ["priv/couch_js/*.c"], +@@ -102,33 +105,38 @@ CouchJSSrc = ["priv/couch_js/*.c"], IcuPath = "priv/couch_icu_driver.so", IcuSrc = ["priv/icu_driver/*.c"], @@ -63,28 +61,28 @@ Use pkg-config to set SpiderMonkey CFLAGS/LDFLAGS. - {"darwin", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ " -DXP_UNIX -I/usr/local/include/js"}, {"LDFLAGS", JS_LDFLAGS ++ " -L/usr/local/lib"}]}]}, - {"linux", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ " -DXP_UNIX -I/usr/include/js"}, {"LDFLAGS", JS_LDFLAGS ++ " -lm"}]}]}, - {"bsd", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ " -DXP_UNIX -I/usr/local/include/js"}, {"LDFLAGS", JS_LDFLAGS ++ " -L/usr/local/lib -lm"}]}]}, -+ {"darwin", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ " -DXP_UNIX"}, {"LDFLAGS", JS_LDFLAGS}]}]}, -+ {"linux", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ " -DXP_UNIX"}, {"LDFLAGS", JS_LDFLAGS ++ " -lm"}]}]}, -+ {"bsd", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ " -DXP_UNIX"}, {"LDFLAGS", JS_LDFLAGS ++ " -lm"}]}]}, -+ {"solaris", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ " -DXP_UNIX"}, {"LDFLAGS", JS_LDFLAGS ++ " -lm"}]}]}, ++ {"darwin", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ " -DXP_UNIX"}, {"LDFLAGS", JS_LDFLAGS}]}]}, ++ {"linux", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ " -DXP_UNIX"}, {"LDFLAGS", JS_LDFLAGS ++ " -lm"}]}]}, ++ {"bsd", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ " -DXP_UNIX"}, {"LDFLAGS", JS_LDFLAGS ++ " -lm"}]}]}, ++ {"solaris", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ " -DXP_UNIX"}, {"LDFLAGS", JS_LDFLAGS ++ " -lm"}]}]}, {"win32", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ " /DXP_WIN /IC:\\relax\\js-1.8.5\\js\\src"}, {"LDFLAGS", JS_LDFLAGS}]}]}, % ICU - {"darwin", IcuPath, IcuSrc, [{env, IcuEnv ++ IcuDarwinEnv}]}, - {"linux", IcuPath, IcuSrc, [{env, IcuEnv}]}, - {"bsd", IcuPath, IcuSrc, [{env, IcuEnv ++ IcuBsdEnv}]}, -+ {"darwin", IcuPath, IcuSrc, [{env, IcuEnv ++ UnixEnv}]}, -+ {"linux", IcuPath, IcuSrc, [{env, IcuEnv ++ UnixEnv}]}, -+ {"bsd", IcuPath, IcuSrc, [{env, IcuEnv ++ UnixEnv}]}, -+ {"solaris", IcuPath, IcuSrc, [{env, IcuEnv ++ UnixEnv}]}, ++ {"darwin", IcuPath, IcuSrc, [{env, IcuEnv ++ UnixEnv}]}, ++ {"linux", IcuPath, IcuSrc, [{env, IcuEnv ++ UnixEnv}]}, ++ {"bsd", IcuPath, IcuSrc, [{env, IcuEnv ++ UnixEnv}]}, ++ {"solaris", IcuPath, IcuSrc, [{env, IcuEnv ++ UnixEnv}]}, {"win32", IcuPath, IcuSrc, [{env, IcuWinEnv}]}, % ejson_compare - {"darwin", ComparePath, CompareSrc, [{env, IcuEnv ++ IcuDarwinEnv}]}, - {"linux", ComparePath, CompareSrc, [{env, IcuEnv}]}, - {"bsd", ComparePath, CompareSrc, [{env, IcuEnv ++ IcuBsdEnv}]}, -+ {"darwin", ComparePath, CompareSrc, [{env, IcuEnv ++ UnixEnv}]}, -+ {"linux", ComparePath, CompareSrc, [{env, IcuEnv ++ UnixEnv}]}, -+ {"bsd", ComparePath, CompareSrc, [{env, IcuEnv ++ UnixEnv}]}, -+ {"solaris", ComparePath, CompareSrc, [{env, IcuEnv ++ UnixEnv}]}, ++ {"darwin", ComparePath, CompareSrc, [{env, IcuEnv ++ UnixEnv}]}, ++ {"linux", ComparePath, CompareSrc, [{env, IcuEnv ++ UnixEnv}]}, ++ {"bsd", ComparePath, CompareSrc, [{env, IcuEnv ++ UnixEnv}]}, ++ {"solaris", ComparePath, CompareSrc, [{env, IcuEnv ++ UnixEnv}]}, {"win32", ComparePath, CompareSrc, [{env, IcuWinEnv}]} ], diff --git a/databases/couchdb/patches/patch-src_snappy_rebar.config b/databases/couchdb/patches/patch-src_snappy_rebar.config index ac1d8447714..196f85357f4 100644 --- a/databases/couchdb/patches/patch-src_snappy_rebar.config +++ b/databases/couchdb/patches/patch-src_snappy_rebar.config @@ -1,12 +1,12 @@ -$NetBSD: patch-src_snappy_rebar.config,v 1.1 2018/09/27 20:12:02 tnn Exp $ +$NetBSD: patch-src_snappy_rebar.config,v 1.2 2019/09/06 09:10:48 jperkin Exp $ -accept OTP 21 +Support newer OTP. ---- src/snappy/rebar.config.orig 2017-06-23 20:21:36.000000000 +0000 +--- src/snappy/rebar.config.orig 2018-10-16 16:07:58.000000000 +0000 +++ src/snappy/rebar.config @@ -1,4 +1,4 @@ --{require_otp_vsn, "R14|R15|R16|17|18|19|20"}. -+{require_otp_vsn, "R14|R15|R16|17|18|19|20|21"}. +-{require_otp_vsn, "R14|R15|R16|17|18|19|20|21"}. ++{require_otp_vsn, "R14|R15|R16|17|18|19|20|21|22"}. {erl_opts, [debug_info, warn_unused_vars, warn_shadow_vars, warn_unused_import]}. {port_sources, ["c_src/*.cc", |