CVS commit: pkgsrc/databases

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Fri May  4 14:26:42 UTC 2018

Modified Files:
        pkgsrc/databases/sqlrelay: distinfo
        pkgsrc/databases/sqlrelay-nodejs: Makefile
Added Files:
        pkgsrc/databases/sqlrelay/patches: patch-src_api_nodejs_Makefile

Log Message:
databases/sqlrelay-nodejs: Fix nodejs support, avoid built-time fetching.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/databases/sqlrelay/distinfo
cvs rdiff -u -r1.13 -r1.14 pkgsrc/databases/sqlrelay-nodejs/Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/sqlrelay/patches/patch-src_api_nodejs_Makefile

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

Modified files:

Index: pkgsrc/databases/sqlrelay/distinfo
diff -u pkgsrc/databases/sqlrelay/distinfo:1.23 pkgsrc/databases/sqlrelay/distinfo:1.24
--- pkgsrc/databases/sqlrelay/distinfo:1.23     Mon Jun 12 17:06:18 2017
+++ pkgsrc/databases/sqlrelay/distinfo  Fri May  4 14:26:41 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2017/06/12 17:06:18 taca Exp $
+$NetBSD: distinfo,v 1.24 2018/05/04 14:26:41 fhajny Exp $
 
 SHA1 (sqlrelay-1.0.0.tar.gz) = 3f350a71fea8177a8e003524b6833347f741153b
 RMD160 (sqlrelay-1.0.0.tar.gz) = 1bc6c1ac02eb8a58c1aa8e2bacd0c8662a283aad
@@ -8,6 +8,7 @@ SHA1 (patch-ad) = cc4a94941ec737abede98b
 SHA1 (patch-config.mk.in) = 22e8459f49e20529289e1a99b10cebaa449af0c0
 SHA1 (patch-configure) = 689820a84f671923b96f64a62de08ce266f55501
 SHA1 (patch-etc_Makefile) = 28e9cac18314f1fc725603d47cb92ec6e54d7c63
+SHA1 (patch-src_api_nodejs_Makefile) = fd932cd1c76a34cc5decbe4060fc7c37174631bb
 SHA1 (patch-src_api_nodejs_package__in.json) = 76e2ebc4e47d5ef38d0c96059b62460fef687d1e
 SHA1 (patch-src_api_php_sql__relay.cpp) = 9e33260f4e4331874187e5b30db17d4478710385
 SHA1 (patch-src_api_ruby_getcflags.rb) = 033e26ef03db4851f493d831c37ec947662d47ee

Index: pkgsrc/databases/sqlrelay-nodejs/Makefile
diff -u pkgsrc/databases/sqlrelay-nodejs/Makefile:1.13 pkgsrc/databases/sqlrelay-nodejs/Makefile:1.14
--- pkgsrc/databases/sqlrelay-nodejs/Makefile:1.13      Sun Apr 29 21:31:31 2018
+++ pkgsrc/databases/sqlrelay-nodejs/Makefile   Fri May  4 14:26:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2018/04/29 21:31:31 adam Exp $
+# $NetBSD: Makefile,v 1.14 2018/05/04 14:26:42 fhajny Exp $
 
 PKGNAME=               ${DISTNAME:S/sqlrelay/sqlrelay-nodejs/}
 PKGREVISION=           4
@@ -8,11 +8,13 @@ COMMENT=              node.js API for SQL Relay
 
 USE_LANGUAGES+=                c++11
 
-DEPENDS+=              nodejs-[0-9]*:../../lang/nodejs
-
 LICENSE=               gnu-lgpl-v2
 
-CONFIGURE_ARGS+=       --with-nodejs-prefix=${PREFIX}
+BUILD_DEPENDS+=                npm-[0-9]*:../../lang/npm
+
+NODE_VERSIONS_ACCEPTED=        8 6
+
+CONFIGURE_ARGS+=       --with-nodejs-prefix=${BUILDLINK_PREFIX.nodejs}
 CONFIGURE_ARGS+=       --disable-postgresql
 CONFIGURE_ARGS+=       --disable-sqlite
 CONFIGURE_ARGS+=       --disable-freetds
@@ -24,5 +26,6 @@ BUILD_DIRS=           src/api/nodejs
 CHECK_WRKREF_SKIP+=    lib/node_modules/sqlrelay/sqlrelay.node
 
 .include "../../databases/sqlrelay/buildlink3.mk"
+.include "../../lang/nodejs/nodeversion.mk"
 .include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/databases/sqlrelay/patches/patch-src_api_nodejs_Makefile
diff -u /dev/null pkgsrc/databases/sqlrelay/patches/patch-src_api_nodejs_Makefile:1.1
--- /dev/null   Fri May  4 14:26:42 2018
+++ pkgsrc/databases/sqlrelay/patches/patch-src_api_nodejs_Makefile     Fri May  4 14:26:42 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_api_nodejs_Makefile,v 1.1 2018/05/04 14:26:42 fhajny Exp $
+
+Reuse existing nodejs headers, do not fetch.
+
+--- src/api/nodejs/Makefile.orig       2016-12-20 08:40:41.000000000 +0000
++++ src/api/nodejs/Makefile
+@@ -12,7 +12,7 @@ clean:
+       $(RM) temp1.gyp temp2.gyp
+ 
+ build/Release/sqlrelay.node: binding.gyp sqlrelay.cpp package.json
+-      $(NODEGYP) -v configure build
++      $(NODEGYP) -v --nodedir $(PREFIX) configure build
+ 
+ binding.gyp: binding_in.gyp
+       $(REPLACE) @NODEJSINCLUDEDIRS@ "$(NODEJSINCLUDEDIRS)" binding_in.gyp > temp1.gyp