CVS commit: pkgsrc/databases/couchdb

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Thu Sep  8 16:03:55 UTC 2016

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

Log Message:
Fix build with Erlang 19.0 (in line with how upstream handles).


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/databases/couchdb/distinfo
cvs rdiff -u -r1.7 -r1.8 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/distinfo
diff -u pkgsrc/databases/couchdb/distinfo:1.13 pkgsrc/databases/couchdb/distinfo:1.14
--- pkgsrc/databases/couchdb/distinfo:1.13      Tue Nov  3 01:56:10 2015
+++ pkgsrc/databases/couchdb/distinfo   Thu Sep  8 16:03:55 2016
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2015/11/03 01:56:10 agc Exp $
+$NetBSD: distinfo,v 1.14 2016/09/08 16:03:55 fhajny Exp $
 
 SHA1 (apache-couchdb-1.6.1.tar.gz) = 6275f3818579d7b307052e9735c42a8a64313229
 RMD160 (apache-couchdb-1.6.1.tar.gz) = 9701c8cb7f712ce792ede3fc73e9cf028cea54b5
 SHA512 (apache-couchdb-1.6.1.tar.gz) = 70630a27dec7281fa5bdca0601796baa28fba1d7c9975d8f38b9623bbeedd62b26081118357886c7be00b7769360238b2c99695234e13cecb15a210eb986eadc
 Size (apache-couchdb-1.6.1.tar.gz) = 12085350 bytes
-SHA1 (patch-aa) = 57db9ee375e15667b6a653d2440be5dcad0cca5a
+SHA1 (patch-aa) = 67c5fa5f8bb084302a416bb838c08db378200fcd
 SHA1 (patch-ab) = f07acca555013b1bfde95bdd056cccd9a551440a
 SHA1 (patch-ac) = b5dd1be18110655b1494278b168cf1971e1ca872
 SHA1 (patch-ad) = ce73b043244b5a3f657bd7e13e11d686d8f77f92

Index: pkgsrc/databases/couchdb/patches/patch-aa
diff -u pkgsrc/databases/couchdb/patches/patch-aa:1.7 pkgsrc/databases/couchdb/patches/patch-aa:1.8
--- pkgsrc/databases/couchdb/patches/patch-aa:1.7       Sat Jul 18 07:36:35 2015
+++ pkgsrc/databases/couchdb/patches/patch-aa   Thu Sep  8 16:03:55 2016
@@ -1,6 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2015/07/18 07:36:35 fhajny Exp $
+$NetBSD: patch-aa,v 1.8 2016/09/08 16:03:55 fhajny Exp $
 
 Set pkgsrc standard paths.
+Expand compatibility to Erlang 18 and 19.
+
 --- configure.orig     2014-08-21 23:15:40.000000000 +0000
 +++ configure
 @@ -647,6 +647,7 @@ localstatelogdir
@@ -43,7 +45,7 @@ Set pkgsrc standard paths.
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang version compatibility" >&5
  $as_echo_n "checking Erlang version compatibility... " >&6; }
 -erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 17 (erts-6.0)"
-+erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 18 (erts-7.0)"
++erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 19 (erts-8.0)"
  
  version="`${ERL} -version 2>&1 | ${SED} 's/[^0-9]/ /g'` 0 0 0"
  major_version=`echo $version | ${AWK} "{print \\$1}"`
@@ -52,7 +54,7 @@ Set pkgsrc standard paths.
  echo -n "detected Erlang version: $major_version.$minor_version.$patch_version..."
  
 -if test $major_version -lt 5 -o $major_version -gt 6; then
-+if test $major_version -lt 5 -o $major_version -gt 7; then
++if test $major_version -lt 5 -o $major_version -gt 8; then
      as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5
  fi
  
@@ -61,7 +63,7 @@ Set pkgsrc standard paths.
  
  
 - if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17)"); then
-+ if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18)"); then
++ if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18|19)"); then
    USE_OTP_NIFS_TRUE=
    USE_OTP_NIFS_FALSE='#'
  else
@@ -70,7 +72,7 @@ Set pkgsrc standard paths.
  fi
  
 - if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17)"); then
-+ if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18)"); then
++ if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18|19)"); then
    USE_EJSON_COMPARE_NIF_TRUE=
    USE_EJSON_COMPARE_NIF_FALSE='#'
  else