Fix build/install with newer DTrace

[Filip Hajny <filip%joyent.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Filip Hajny <filip%joyent.com@localhost>
Pushed By:	fhajny
Date:		Wed Apr 6 14:29:39 2016 +0000
Changeset:	42c3cf7437ed96a96824ced37ce0fc3132aea3a5

Modified Files:
	erlang-basho/PLIST
	erlang-basho/distinfo
Added Files:
	erlang-basho/patches/patch-erts_configure.in

Log Message:
Fix build/install with newer DTrace

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=42c3cf7437ed96a96824ced37ce0fc3132aea3a5

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

diffstat:
 erlang-basho/PLIST                           |  1 -
 erlang-basho/distinfo                        |  1 +
 erlang-basho/patches/patch-erts_configure.in | 16 ++++++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diffs:
diff --git a/erlang-basho/PLIST b/erlang-basho/PLIST
index 27949c6..797f196 100644
--- a/erlang-basho/PLIST
+++ b/erlang-basho/PLIST
@@ -3400,7 +3400,6 @@ lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/include/observer_backend.h
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/priv/lib/dyntrace.so
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/priv/lib/trace_file_drv.so
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/priv/lib/trace_ip_drv.so
-${PLIST.dtrace}lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/priv/obj/dtrace_user.o
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/priv/obj/dyntrace.o
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/appmon_info.erl
 lib/erlang/lib/runtime_tools-${VERSION.runtime_tools}/src/dbg.erl
diff --git a/erlang-basho/distinfo b/erlang-basho/distinfo
index 40a25c3..e3f1668 100644
--- a/erlang-basho/distinfo
+++ b/erlang-basho/distinfo
@@ -10,4 +10,5 @@ SHA1 (patch-am) = 11ff769b6954f950d6447e69b033cdc0bfa767e9
 SHA1 (patch-ao) = a4ee17b0a81415d541cb55d76b3c1ecc3148c2c2
 SHA1 (patch-ay) = 7d1a7f79e8c3ea909b2f4476d9ff271ed1318234
 SHA1 (patch-configure.in) = 4a36245a6a6b6dc4804cbb899c7e824ec1fe61e0
+SHA1 (patch-erts_configure.in) = 49041c24904bc9013946ed8d1c4f031221ae9ee6
 SHA1 (patch-lib_diameter_src_Makefile) = 9e2d96d19ff4cc4be5f2b31a554e8e48f69c9478
diff --git a/erlang-basho/patches/patch-erts_configure.in b/erlang-basho/patches/patch-erts_configure.in
new file mode 100644
index 0000000..c4e4239
--- /dev/null
+++ b/erlang-basho/patches/patch-erts_configure.in
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Fix for DTrace 1.11 and newer.
+
+--- erts/configure.in.orig	2015-04-02 17:49:24.000000000 +0000
++++ erts/configure.in
+@@ -3791,6 +3791,9 @@ _DTEST
+                         DTRACE_ENABLED_2STEP=yes
+                         AC_MSG_NOTICE([dtrace precompilation for 2-stage DTrace successful])
+                 else
++                        case `dtrace -V 2>/dev/null` in
++                        *"Sun D "1.1[1-9]*) DTRACE_ENABLED_2STEP=yes;;
++                        esac
+                         AC_MSG_NOTICE([dtrace precompilation for 1-stage DTrace successful])
+                 fi
+                 $RM -f dtest.{o,c} foo-dtrace.h