108 lines
3.1 KiB
Plaintext
108 lines
3.1 KiB
Plaintext
$NetBSD: patch-aa,v 1.7 2015/07/18 07:36:35 fhajny Exp $
|
|
|
|
Set pkgsrc standard paths.
|
|
--- configure.orig 2014-08-21 23:15:40.000000000 +0000
|
|
+++ configure
|
|
@@ -647,6 +647,7 @@ localstatelogdir
|
|
localstatelibdir
|
|
locallibdir
|
|
localdocdir
|
|
+localegdir
|
|
localdatadir
|
|
localconfdir
|
|
bug_uri
|
|
@@ -18383,7 +18384,7 @@ fi
|
|
done
|
|
test -n "$CURL_CONFIG" || CURL_CONFIG="no"
|
|
|
|
- if test "$CURL_CONFIG" == "no"; then :
|
|
+ if test "$CURL_CONFIG" = "no"; then :
|
|
|
|
:
|
|
|
|
@@ -18395,7 +18396,7 @@ $as_echo "$as_me: WARNING: You will be u
|
|
|
|
else
|
|
|
|
- if test x"" == x; then :
|
|
+ if test x"" = x; then :
|
|
|
|
CURL_CFLAGS="`$CURL_CONFIG $curl_config_args --cflags`"
|
|
|
|
@@ -18405,7 +18406,7 @@ else
|
|
|
|
fi
|
|
|
|
- if test x"" == x; then :
|
|
+ if test x"" = x; then :
|
|
|
|
CURL_LIBS="`$CURL_CONFIG $curl_config_args --libs`"
|
|
|
|
@@ -18532,7 +18533,7 @@ esac
|
|
|
|
{ $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)"
|
|
|
|
version="`${ERL} -version 2>&1 | ${SED} 's/[^0-9]/ /g'` 0 0 0"
|
|
major_version=`echo $version | ${AWK} "{print \\$1}"`
|
|
@@ -18540,7 +18541,7 @@ minor_version=`echo $version | ${AWK} "{
|
|
patch_version=`echo $version | ${AWK} "{print \\$3}"`
|
|
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
|
|
as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5
|
|
fi
|
|
|
|
@@ -18559,7 +18560,7 @@ otp_release="`\
|
|
|
|
|
|
|
|
- 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
|
|
USE_OTP_NIFS_TRUE=
|
|
USE_OTP_NIFS_FALSE='#'
|
|
else
|
|
@@ -18567,7 +18568,7 @@ else
|
|
USE_OTP_NIFS_FALSE=
|
|
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
|
|
USE_EJSON_COMPARE_NIF_TRUE=
|
|
USE_EJSON_COMPARE_NIF_FALSE='#'
|
|
else
|
|
@@ -19212,13 +19213,15 @@ localdatadir=${datadir}/${package_identi
|
|
|
|
localdocdir=${datadir}/doc/${package_identifier}
|
|
|
|
+localegdir=@COUCH_EGDIR@
|
|
+
|
|
locallibdir=${libdir}/${package_identifier}
|
|
|
|
-localstatelibdir=${localstatedir}/lib/${package_identifier}
|
|
+localstatelibdir=@COUCH_DBDIR@
|
|
|
|
-localstatelogdir=${localstatedir}/log/${package_identifier}
|
|
+localstatelogdir=@COUCH_LOGDIR@
|
|
|
|
-localstaterundir=${localstatedir}/run/${package_identifier}
|
|
+localstaterundir=@COUCH_RUNDIR@
|
|
|
|
erlangversion=${erlangversion}
|
|
|
|
@@ -19233,9 +19236,9 @@ if test x${IS_WINDOWS} = xTRUE; then
|
|
localerlanglibdir=${libdir}
|
|
|
|
else
|
|
- locallibbindir=${locallibdir}/bin
|
|
+ locallibbindir=${libexecdir}/${package_identifier}
|
|
|
|
- localerlanglibdir=${locallibdir}/erlang/lib
|
|
+ localerlanglibdir=@ERLANG_PREFIX@/lib/erlang/lib
|
|
|
|
fi
|
|
|