On Sat, Jun 30, 2012 at 09:58:15AM +0100, Stuart Henderson wrote:
> On 2012/06/29 23:07, Jeremy Evans wrote:
> >
> > Also, I'm not sure I agree with the @extraunexec line (even though
> > it's in the current port). We don't have something similar for other
> > most programming languages (php, railo, and node are the only lang
> > ports that use @extraunexec, and php and railo don't appear to go as
> > far). If I install a node library manually with npm, and then do
> >
> > pkg_delete node
> > pkg_add node
> >
> > I expect the library to be there after the pkg_add. AFAIK, one of the
> > guiding principles of the OpenBSD package system is that it does not
> > delete things it didn't create (espie@ can correct me if I'm wrong
> > here).
>
> @extraunexec isn't for normal pkg_delete, it's for pkg_delete -c,
> which is expected to be somewhat dangerous. As far as railo and php
> go, it's just used for deleting config files, so it's definitely
> wanted there. I think I agree with Jeremy that it's better not to
> use it for libraries/modules here.
>
Removed @extraunexec. The second diff had some extra PLIST stuff from some
testing I had done regarding the PLIST issue from the first diff. Below
is the fixed version of 0.8.1 with an extra update to MAINTAINER.
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/node/Makefile,v
retrieving revision 1.3
diff -N -u -p Makefile
--- Makefile 28 Jun 2012 08:30:28 -0000 1.3
+++ Makefile 5 Jul 2012 17:47:47 -0000
@@ -8,7 +8,7 @@ ONLY_FOR_ARCHS= amd64 i386
COMMENT= V8 JavaScript for clients and servers
-NODE_VERSION= v0.8.0
+NODE_VERSION= v0.8.1
DISTNAME= node-${NODE_VERSION}
PKGNAME= ${DISTNAME:S/v//g}
@@ -17,7 +17,7 @@ CATEGORIES= lang devel
HOMEPAGE= http://nodejs.org/
-MAINTAINER= Aaron Bieber <def...@gmail.com>
+MAINTAINER= Aaron Bieber <abie...@openbsd.org>
# MIT
PERMIT_PACKAGE_CDROM= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/node/distinfo,v
retrieving revision 1.3
diff -N -u -p distinfo
--- distinfo 28 Jun 2012 08:30:28 -0000 1.3
+++ distinfo 5 Jul 2012 17:47:47 -0000
@@ -1,5 +1,5 @@
-MD5 (node-v0.8.0.tar.gz) = fv3gCtMpLUxWrWB6tnbZNQ==
-RMD160 (node-v0.8.0.tar.gz) = rPBruqX+bnB+YMcZ8np6T58EEXI=
-SHA1 (node-v0.8.0.tar.gz) = UXH7Rvv+5axxKcSxcgej81ofV+g=
-SHA256 (node-v0.8.0.tar.gz) = 7K/KAYtRCaKFN2M9BDPVE/aLG65xkaGCHo6qhMzxKO4=
-SIZE (node-v0.8.0.tar.gz) = 11829547
+MD5 (node-v0.8.1.tar.gz) = Mqb3t88ZbLib2XN0GuWN0Q==
+RMD160 (node-v0.8.1.tar.gz) = Vvpl0F7wG30pA0W08L2F/8lgtJc=
+SHA1 (node-v0.8.1.tar.gz) = iSeQVTuBIbqGJNgpPQy32LAQlNc=
+SHA256 (node-v0.8.1.tar.gz) = DNoTJaAQzhj2hQGuaODOl/AJTnooLDSkUfVSYhZDqIQ=
+SIZE (node-v0.8.1.tar.gz) = 11806425
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/node/pkg/PLIST,v
retrieving revision 1.3
diff -N -u -p pkg/PLIST
--- pkg/PLIST 28 Jun 2012 08:30:28 -0000 1.3
+++ pkg/PLIST 5 Jul 2012 17:47:48 -0000
@@ -243,6 +243,11 @@ lib/node_modules/init-package-json/node_modules/promza
lib/node_modules/init-package-json/node_modules/promzard/test/simple.input
lib/node_modules/init-package-json/node_modules/promzard/test/simple.js
lib/node_modules/init-package-json/package.json
+lib/node_modules/lockfile/
+lib/node_modules/lockfile/LICENSE
+lib/node_modules/lockfile/README.md
+lib/node_modules/lockfile/lockfile.js
+lib/node_modules/lockfile/package.json
lib/node_modules/lru-cache/
lib/node_modules/lru-cache/.npmignore
lib/node_modules/lru-cache/AUTHORS
@@ -371,6 +376,7 @@ lib/node_modules/nopt/package.json
lib/node_modules/npm/
lib/node_modules/npm-registry-client/
lib/node_modules/npm-registry-client/.npmignore
+lib/node_modules/npm-registry-client/LICENSE
lib/node_modules/npm-registry-client/README.md
lib/node_modules/npm-registry-client/index.js
lib/node_modules/npm-registry-client/lib/
@@ -798,6 +804,7 @@ lib/node_modules/npm/node_modules/graceful-fs
lib/node_modules/npm/node_modules/inherits
lib/node_modules/npm/node_modules/ini
lib/node_modules/npm/node_modules/init-package-json
+lib/node_modules/npm/node_modules/lockfile
lib/node_modules/npm/node_modules/lru-cache
lib/node_modules/npm/node_modules/minimatch
lib/node_modules/npm/node_modules/mkdirp
@@ -812,6 +819,7 @@ lib/node_modules/npm/node_modules/read
lib/node_modules/npm/node_modules/read-installed
lib/node_modules/npm/node_modules/read-package-json
lib/node_modules/npm/node_modules/request
+lib/node_modules/npm/node_modules/retry
lib/node_modules/npm/node_modules/rimraf
lib/node_modules/npm/node_modules/semver
lib/node_modules/npm/node_modules/slide
@@ -943,6 +951,17 @@ lib/node_modules/request/vendor/
lib/node_modules/request/vendor/cookie/
lib/node_modules/request/vendor/cookie/index.js
lib/node_modules/request/vendor/cookie/jar.js
+lib/node_modules/retry/
+lib/node_modules/retry/.npmignore
+lib/node_modules/retry/License
+lib/node_modules/retry/Makefile
+lib/node_modules/retry/Readme.md
+lib/node_modules/retry/equation.gif
+lib/node_modules/retry/index.js
+lib/node_modules/retry/lib/
+lib/node_modules/retry/lib/retry.js
+lib/node_modules/retry/lib/retry_operation.js
+lib/node_modules/retry/package.json
lib/node_modules/rimraf/
lib/node_modules/rimraf/AUTHORS
lib/node_modules/rimraf/LICENSE
@@ -999,4 +1018,3 @@ lib/node_modules/which/bin/which
lib/node_modules/which/package.json
lib/node_modules/which/which.js
@man man/man1/node.1
-@extraunexec rm -rf %D/lib/node_modules
