From 6fc941c9b4f8238bab90ff4f48377ad543aabb9f Mon Sep 17 00:00:00 2001
From: Trent Mick <trentm@gmail.com>
Date: Wed, 15 Oct 2014 22:18:11 -0700
Subject: [PATCH] Restore dtrace-provider in optionalDependencies

dtrace-provider v0.3.0 fixes build issues of yore. This fixes things
for node 0.11/0.12 usage.

Fixes #157
---
 CHANGES.md    | 14 ++++++++++++--
 Makefile      |  8 ++++++--
 bin/bunyan    |  2 +-
 lib/bunyan.js |  2 +-
 package.json  | 13 ++++++-------
 5 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index f1e6921..5e6555d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,9 +6,19 @@ Known issues:
   bug](https://github.com/TooTallNate/node-gyp/issues/65).
 
 
-## bunyan 1.1.4 (not yet released)
+## bunyan 1.2.0 (not yet released)
 
-(nothing yet)
+- [issue #157] Restore dtrace-provider as a dependency (in
+  "optionalDependencies").
+
+  Dtrace-provider version 0.3.0 add build sugar that should eliminate the
+  problems from older versions:
+  The build is not attempted on Linux and Windows. The build spew is
+  *not* emitted by default (use `V=1 npm install` to see it); instead a
+  short warning is emitted if the build fails. 
+  
+  Also, importantly, the new dtrace-provider fixes working with node
+  v0.11/0.12.
 
 
 ## bunyan 1.1.3
diff --git a/Makefile b/Makefile
index 1d78df8..b7ec4f0 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,6 @@ NON_DTRACE_TEST_FILES := $(shell ls -1 test/*.test.js | grep -v dtrace | xargs)
 
 all $(NODEUNIT):
 	npm install
-	npm install dtrace-provider
 
 # Ensure all version-carrying files have the same version.
 .PHONY: versioncheck
@@ -87,8 +86,13 @@ test: $(NODEUNIT)
 # Note: 'test10' is last so (if all is well) I end up with a binary
 # dtrace-provider build for node 0.10 (my current version).
 .PHONY: testall
-testall: test08 test10
+testall: test11 test08 test10
 
+.PHONY: test11
+test11:
+	@echo "# Test node 0.11.x (with node `$(NODEOPT)/node-0.11/bin/node --version`)"
+	@$(NODEOPT)/node-0.11/bin/node --version
+	PATH="$(NODEOPT)/node-0.11/bin:$(PATH)" make distclean all test
 .PHONY: test10
 test10:
 	@echo "# Test node 0.10.x (with node `$(NODEOPT)/node-0.10/bin/node --version`)"
diff --git a/bin/bunyan b/bin/bunyan
index d273697..56b7b09 100755
--- a/bin/bunyan
+++ b/bin/bunyan
@@ -11,7 +11,7 @@
  * vim: expandtab:ts=4:sw=4
  */
 
-var VERSION = '1.1.4';
+var VERSION = '1.2.0';
 
 var p = console.log;
 var util = require('util');
diff --git a/lib/bunyan.js b/lib/bunyan.js
index 9e885da..df950c1 100644
--- a/lib/bunyan.js
+++ b/lib/bunyan.js
@@ -8,7 +8,7 @@
  * vim: expandtab:ts=4:sw=4
  */
 
-var VERSION = '1.1.4';
+var VERSION = '1.2.0';
 
 // Bunyan log format version. This becomes the 'v' field on all log records.
 // `0` is until I release a version '1.0.0' of node-bunyan. Thereafter,
diff --git a/package.json b/package.json
index 85cf8fa..0aa5c38 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bunyan",
-  "version": "1.1.4",
+  "version": "1.2.0",
   "description": "a JSON logging library for node.js services",
   "author": "Trent Mick <trentm@gmail.com> (http://trentm.com)",
   "main": "./lib/bunyan.js",
@@ -13,17 +13,16 @@
     "url": "git://github.com/trentm/node-bunyan.git"
   },
   "engines": ["node >=0.8.0"],
-  "keywords": ["log", "logging", "log4j", "json"],
+  "keywords": ["log", "logging", "log4j", "json", "bunyan"],
 
-  "dependencies": {
-  },
-  "// comment: mv": "'mv' required for RotatingFileStream",
-  "// comment: dtrace": "dtrace-provider required for Bunyan dtrace features, but install is notoriously problematic on some plats (#135)",
+  "// comment1": "'dtrace-provider' required for dtrace features",
+  "// comment2": "'mv' required for RotatingFileStream",
   "optionalDependencies": {
+    "dtrace-provider": "0.3.0",
     "mv": "~2"
   },
   "devDependencies": {
-    "nodeunit": "0.7.4",
+    "nodeunit": "0.9.*",
     "ben": "0.0.0",
     "verror": "1.3.3",
     "vasync": "1.4.3"