CVS commit: pkgsrc/databases/couchdb

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Jan 27 16:20:20 UTC 2021

Modified Files:
        pkgsrc/databases/couchdb: Makefile distinfo
        pkgsrc/databases/couchdb/patches: patch-aa

Log Message:
couchdb: Build against lang/erlang21.

This version of couchdb, as well as the current version of couchdb 3.x, is
incompatible with OTP 23.  While here fix hardcoded paths in patch-aa, making
it clear that this package can't be all that popular ;-)

Bump PKGREVISION for good measure even though this package previously could not
build, in case someone still has a version from before lang/erlang was bumped
lying around.


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 pkgsrc/databases/couchdb/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/databases/couchdb/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/databases/couchdb/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/couchdb/Makefile
diff -u pkgsrc/databases/couchdb/Makefile:1.71 pkgsrc/databases/couchdb/Makefile:1.72
--- pkgsrc/databases/couchdb/Makefile:1.71      Thu Nov  5 09:07:40 2020
+++ pkgsrc/databases/couchdb/Makefile   Wed Jan 27 16:20:20 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2020/11/05 09:07:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.72 2021/01/27 16:20:20 jperkin Exp $
 
 DISTNAME=              apache-couchdb-2.3.1
 PKGNAME=               ${DISTNAME:S/apache-//}
-PKGREVISION=           9
+PKGREVISION=           10
 CATEGORIES=            databases
 MASTER_SITES=          ${MASTER_SITE_APACHE:=couchdb/source/${PKGVERSION_NOREV}/}
 
@@ -18,7 +18,9 @@ USE_LIBTOOL=          yes
 BUILD_DEFS+=           VARBASE
 
 BUILD_DEPENDS+=                help2man-[0-9]*:../../converters/help2man
-BUILD_DEPENDS+=                rebar>=2.6.0<3:../../devel/rebar
+BUILD_DEPENDS+=                rebar21>=2.6.0<3:../../devel/rebar21
+
+MAKE_ENV+=             REBAR=${PREFIX}/bin/rebar
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -97,7 +99,7 @@ PRINT_PLIST_AWK+=     /^couchdb\/erts-/ { ne
 PRINT_PLIST_AWK+=      /^couchdb\/lib\// { next; }
 
 # We need to know the version of erts and subst it inside the SMF manifest
-.include "../../lang/erlang/Makefile.versions"
+.include "../../lang/erlang21/Makefile.versions"
 
 do-install:
        cd ${WRKSRC}/rel/couchdb &&                                             \
@@ -117,7 +119,7 @@ do-install:
 # The erlang VM gets embedded, but it may still need the curses lib
 BUILDLINK_DEPMETHOD.erlang=    build
 .include "../../mk/termcap.buildlink3.mk"
-.include "../../lang/erlang/buildlink3.mk"
+.include "../../lang/erlang21/buildlink3.mk"
 .include "../../lang/spidermonkey185/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"

Index: pkgsrc/databases/couchdb/distinfo
diff -u pkgsrc/databases/couchdb/distinfo:1.18 pkgsrc/databases/couchdb/distinfo:1.19
--- pkgsrc/databases/couchdb/distinfo:1.18      Fri Sep  6 09:10:47 2019
+++ pkgsrc/databases/couchdb/distinfo   Wed Jan 27 16:20:20 2021
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.18 2019/09/06 09:10:47 jperkin Exp $
+$NetBSD: distinfo,v 1.19 2021/01/27 16:20:20 jperkin Exp $
 
 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-aa) = c657ce706e3ba0487aff6ac96628ebf3c97b1475
 SHA1 (patch-rebar.config.script) = 628340e6a8085e92d4193ac11905eebd8377a6b6
 SHA1 (patch-rel_files_couchdb.in) = d94bf0e54657fea26dd42e807cc2de36a67e8fda
 SHA1 (patch-rel_overlay_etc_default.ini) = 203af5ee1684288b66103842c30fa0f9135abd4b

Index: pkgsrc/databases/couchdb/patches/patch-aa
diff -u pkgsrc/databases/couchdb/patches/patch-aa:1.11 pkgsrc/databases/couchdb/patches/patch-aa:1.12
--- pkgsrc/databases/couchdb/patches/patch-aa:1.11      Fri Sep  6 09:10:48 2019
+++ pkgsrc/databases/couchdb/patches/patch-aa   Wed Jan 27 16:20:20 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.11 2019/09/06 09:10:48 jperkin Exp $
+$NetBSD: patch-aa,v 1.12 2021/01/27 16:20:20 jperkin Exp $
 
 Set pkgsrc standard paths. Portability.
 
@@ -22,11 +22,11 @@ Set pkgsrc standard paths. Portability.
 -{view_index_dir, "./data"}.
 -{log_file, "$LOG_FILE"}.
 -{fauxton_root, "./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"}.
++{prefix, "@PREFIX@/couchdb"}.
++{data_dir, "@COUCH_DBDIR@"}.
++{view_index_dir, "@COUCH_DBDIR@"}.
++{log_file, "@COUCH_LOGDIR@/couch.log"}.
++{fauxton_root, "@PREFIX@/couchdb/share/www"}.
  {user, "$COUCHDB_USER"}.
  {node_name, "-name couchdb@127.0.0.1"}.
  {cluster_port, 5984}.