From owner-svn-ports-all@freebsd.org Tue Jul 19 11:25:16 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4F189B9ECC4; Tue, 19 Jul 2016 11:25:16 +0000 (UTC) (envelope-from olgeni@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 mx1.freebsd.org (Postfix) with ESMTPS id 05D091CA1; Tue, 19 Jul 2016 11:25:15 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6JBPF0m046244; Tue, 19 Jul 2016 11:25:15 GMT (envelope-from olgeni@FreeBSD.org) Received: (from olgeni@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6JBPFEl046242; Tue, 19 Jul 2016 11:25:15 GMT (envelope-from olgeni@FreeBSD.org) Message-Id: <201607191125.u6JBPFEl046242@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olgeni set sender to olgeni@FreeBSD.org using -f From: Jimmy Olgeni Date: Tue, 19 Jul 2016 11:25:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r418768 - in head/databases/couchdb: . files X-SVN-Group: ports-head 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.22 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: Tue, 19 Jul 2016 11:25:16 -0000 Author: olgeni Date: Tue Jul 19 11:25:14 2016 New Revision: 418768 URL: https://svnweb.freebsd.org/changeset/ports/418768 Log: Prepare databases/couchdb for Erlang 19. PR: 211012 Submitted by: Dave Cottlehuber Modified: head/databases/couchdb/Makefile head/databases/couchdb/files/patch-configure Modified: head/databases/couchdb/Makefile ============================================================================== --- head/databases/couchdb/Makefile Tue Jul 19 11:04:13 2016 (r418767) +++ head/databases/couchdb/Makefile Tue Jul 19 11:25:14 2016 (r418768) @@ -3,7 +3,7 @@ PORTNAME= couchdb PORTVERSION= 1.6.1 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 2 CATEGORIES= databases MASTER_SITES= APACHE/couchdb/source/${PORTVERSION} Modified: head/databases/couchdb/files/patch-configure ============================================================================== --- head/databases/couchdb/files/patch-configure Tue Jul 19 11:04:13 2016 (r418767) +++ head/databases/couchdb/files/patch-configure Tue Jul 19 11:25:14 2016 (r418768) @@ -5,7 +5,7 @@ { $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 =< 18 (erts-8.0)" version="`${ERL} -version 2>&1 | ${SED} 's/[^0-9]/ /g'` 0 0 0" major_version=`echo $version | ${AWK} "{print \\$1}"` @@ -14,7 +14,7 @@ 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 @@ -23,7 +23,7 @@ - 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 @@ -32,7 +32,7 @@ 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