Attachment 172386 Details for Bug 211012 – patch v1 https://github.com/skunkwerks/ports/commit/f0b2c77.patch

patch v1 https://github.com/skunkwerks/ports/commit/f0b2c77.patch

file_211012.txt (text/plain), 2.59 KB, created by Dave Cottlehuber on 2016-07-11 17:30:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Cottlehuber

Created: 2016-07-11 17:30:39 UTC

Size: 2.59 KB

patch

obsolete

>From f0b2c776ac915aad1c52fc406668322c3c539bd4 Mon Sep 17 00:00:00 2001
>From: Dave Cottlehuber <dch@skunkwerks.at>
>Date: Mon, 11 Jul 2016 16:50:43 +0000
>Subject: [PATCH] databases/couchdb: patch for OTP 19 releases
>
>---
> databases/couchdb/Makefile              | 2 +-
> databases/couchdb/files/patch-configure | 8 ++++----
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile
>index 3afbd19..2c0725b 100644
>--- a/databases/couchdb/Makefile
>+++ b/databases/couchdb/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	couchdb
> PORTVERSION=	1.6.1
>-PORTREVISION=	6
>+PORTREVISION=	7
> PORTEPOCH=	2
> CATEGORIES=	databases
> MASTER_SITES=	APACHE/couchdb/source/${PORTVERSION}
>diff --git a/databases/couchdb/files/patch-configure b/databases/couchdb/files/patch-configure
>index c994b52..399a9d7 100644
>--- a/databases/couchdb/files/patch-configure
>+++ b/databases/couchdb/files/patch-configure
>@@ -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

Actions: View

Attachments on bug 211012: 172386