From 3018cf273979d75d92512a9603abdf269a959ea6 Mon Sep 17 00:00:00 2001 From: abieber Date: Fri, 24 May 2013 13:45:36 +0000 Subject: [PATCH] Bump daemon to the latest version for node 0.10.7 compat, also no longer ext OK jeremy@ --- sysutils/node-daemon/Makefile | 7 +++-- sysutils/node-daemon/distinfo | 7 ++--- sysutils/node-daemon/patches/patch-install | 17 ------------ .../node-daemon/patches/patch-lib_daemon_js | 13 --------- .../node-daemon/patches/patch-package_json | 12 --------- sysutils/node-daemon/pkg/PLIST | 27 +++++-------------- 6 files changed, 11 insertions(+), 72 deletions(-) delete mode 100644 sysutils/node-daemon/patches/patch-install delete mode 100644 sysutils/node-daemon/patches/patch-lib_daemon_js delete mode 100644 sysutils/node-daemon/patches/patch-package_json diff --git a/sysutils/node-daemon/Makefile b/sysutils/node-daemon/Makefile index 635d4704e7c..50338cd6f5c 100644 --- a/sysutils/node-daemon/Makefile +++ b/sysutils/node-daemon/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 2013/03/11 11:41:31 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2013/05/24 13:45:36 abieber Exp $ COMMENT = add-on for creating *nix daemons -NPM_VERSION = 0.5.1 +NPM_VERSION = 1.1.0 NPM_NAME = daemon CATEGORIES = sysutils devel -REVISION = 1 HOMEPAGE = https://github.com/indexzero/daemon.node/ @@ -14,7 +13,7 @@ PERMIT_PACKAGE_CDROM = Yes MODULES = lang/node -CONFIGURE_STYLE = npm ext +CONFIGURE_STYLE = npm # Needs a new devel/node-vows NO_TEST = Yes diff --git a/sysutils/node-daemon/distinfo b/sysutils/node-daemon/distinfo index 438daa7cbbd..c04dbd04288 100644 --- a/sysutils/node-daemon/distinfo +++ b/sysutils/node-daemon/distinfo @@ -1,5 +1,2 @@ -MD5 (daemon-0.5.1.tgz) = MXMNAwjv3JQ1RA4YgOgrnQ== -RMD160 (daemon-0.5.1.tgz) = Xf2xSLN3o+J5S2b23+xn6H1z6s8= -SHA1 (daemon-0.5.1.tgz) = wWYRtvMFf9bDTExmzmCtHLx0WrY= -SHA256 (daemon-0.5.1.tgz) = DfRweoabdkIDDQ1hK47wfk+XxKqwSlIlfjc1IcT0B3k= -SIZE (daemon-0.5.1.tgz) = 7544 +SHA256 (daemon-1.1.0.tgz) = ozPwldverKIFwXBfZMvNoebAVr0gVxTfBHHySNSZbOM= +SIZE (daemon-1.1.0.tgz) = 3686 diff --git a/sysutils/node-daemon/patches/patch-install b/sysutils/node-daemon/patches/patch-install deleted file mode 100644 index 3fc3a1b27ba..00000000000 --- a/sysutils/node-daemon/patches/patch-install +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-install,v 1.1 2012/06/08 05:54:04 jasper Exp $ ---- install.orig Thu Jun 7 14:24:08 2012 -+++ install Thu Jun 7 14:24:46 2012 -@@ -1,9 +1,9 @@ --#!/usr/bin/env bash -+#!/bin/sh - --version=`node -v` -+# remove version string for OpenBSD PLIST compat - node-waf configure build - if [ -f build/Release/daemon.node ]; then -- cp build/Release/daemon.node "lib/daemon.$version.node" -+ cp build/Release/daemon.node "lib/daemon.node" - elif [ -f build/default/daemon.node ]; then -- cp build/default/daemon.node "lib/daemon.$version.node" -+ cp build/default/daemon.node "lib/daemon.node" - fi diff --git a/sysutils/node-daemon/patches/patch-lib_daemon_js b/sysutils/node-daemon/patches/patch-lib_daemon_js deleted file mode 100644 index 303cbaba165..00000000000 --- a/sysutils/node-daemon/patches/patch-lib_daemon_js +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-lib_daemon_js,v 1.1 2012/06/08 05:54:04 jasper Exp $ ---- lib/daemon.js.orig Thu Jun 7 14:29:46 2012 -+++ lib/daemon.js Thu Jun 7 14:30:40 2012 -@@ -9,7 +9,8 @@ - var fs = require('fs'), - binding; - --binding = require('./daemon.' + process.version); -+// Remove version for OpenBSD PLIST Compatibility -+binding = require('./daemon'); - - var daemon = exports; - diff --git a/sysutils/node-daemon/patches/patch-package_json b/sysutils/node-daemon/patches/patch-package_json deleted file mode 100644 index 056f7a25e12..00000000000 --- a/sysutils/node-daemon/patches/patch-package_json +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-package_json,v 1.1.1.1 2012/05/29 11:29:35 jasper Exp $ ---- package.json.orig Sat May 26 17:41:27 2012 -+++ package.json Sat May 26 17:41:33 2012 -@@ -21,7 +21,7 @@ - }, - "main": "./lib/daemon", - "scripts" : { -- "preinstall" : "bash ./install" -+ "preinstall" : "sh ./install" - }, - "engines" : { - "node" : ">= 0.4.0" diff --git a/sysutils/node-daemon/pkg/PLIST b/sysutils/node-daemon/pkg/PLIST index fcbe6276a5e..810984350df 100644 --- a/sysutils/node-daemon/pkg/PLIST +++ b/sysutils/node-daemon/pkg/PLIST @@ -1,31 +1,16 @@ -@comment $OpenBSD: PLIST,v 1.2 2012/06/08 05:54:04 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.3 2013/05/24 13:45:36 abieber Exp $ lib/node_modules/daemon/ -lib/node_modules/daemon/.lock-wscript lib/node_modules/daemon/.npmignore +lib/node_modules/daemon/.travis.yml lib/node_modules/daemon/LICENSE lib/node_modules/daemon/README.md -lib/node_modules/daemon/build/ -lib/node_modules/daemon/build/.wafpickle-7 -lib/node_modules/daemon/build/Release/ -@bin lib/node_modules/daemon/build/Release/daemon.node -lib/node_modules/daemon/build/Release/src/ -lib/node_modules/daemon/build/Release/src/daemon_1.o -lib/node_modules/daemon/build/c4che/ -lib/node_modules/daemon/build/c4che/Release.cache.py -lib/node_modules/daemon/build/c4che/build.config.py -lib/node_modules/daemon/build/config.log lib/node_modules/daemon/examples/ -lib/node_modules/daemon/examples/bindings.js -lib/node_modules/daemon/examples/wrapper.js -lib/node_modules/daemon/install -lib/node_modules/daemon/lib/ -lib/node_modules/daemon/lib/daemon.js -@bin lib/node_modules/daemon/lib/daemon.node +lib/node_modules/daemon/examples/cluster.js +lib/node_modules/daemon/index.js lib/node_modules/daemon/package.json -lib/node_modules/daemon/src/ -lib/node_modules/daemon/src/daemon.cc lib/node_modules/daemon/test/ lib/node_modules/daemon/test/daemon-test.js lib/node_modules/daemon/test/fixtures/ lib/node_modules/daemon/test/fixtures/.gitkeep -lib/node_modules/daemon/wscript +lib/node_modules/daemon/test/fixtures/nodaemon.js +lib/node_modules/daemon/test/fixtures/simple.js