CVS commit: pkgsrc/devel/gyp

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jan 11 14:47:51 UTC 2017

Modified Files:
        pkgsrc/devel/gyp: Makefile Makefile.replace-python PLIST distinfo
        pkgsrc/devel/gyp/patches: patch-pylib_gyp_common.py
            patch-test_lib_TestGyp.py

Log Message:
Updated py-gyp to 0.1pre20161117.940a15ee3f1c89f193cb4c19373b3f6e9ad15b95.

Two years of development.

git log is here:
https://chromium.googlesource.com/external/gyp/+/master

No summary found.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/gyp/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/gyp/Makefile.replace-python
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/gyp/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/gyp/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/gyp/patches/patch-pylib_gyp_common.py
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/gyp/patches/patch-test_lib_TestGyp.py

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

Modified files:

Index: pkgsrc/devel/gyp/Makefile
diff -u pkgsrc/devel/gyp/Makefile:1.16 pkgsrc/devel/gyp/Makefile:1.17
--- pkgsrc/devel/gyp/Makefile:1.16      Sun Jan  1 14:43:30 2017
+++ pkgsrc/devel/gyp/Makefile   Wed Jan 11 14:47:51 2017
@@ -1,20 +1,22 @@
-# $NetBSD: Makefile,v 1.16 2017/01/01 14:43:30 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2017/01/11 14:47:51 wiz Exp $
 
-SVN_REVISION=  2019
+GIT_VERSION=   20161117.940a15ee3f1c89f193cb4c19373b3f6e9ad15b95
 DIST_VERSION=  0.1
-DISTNAME=      gyp-${DIST_VERSION}pre${SVN_REVISION}
+DISTNAME=      gyp-${DIST_VERSION}pre${GIT_VERSION}
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://code.google.com/p/gyp/
+HOMEPAGE=      https://gyp.gsrc.io/
 COMMENT=       GYP can Generate Your Projects
 LICENSE=       modified-bsd
 
-PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 # not yet ported as of 0.1pre1718
+PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 # not yet ported as of 0.1pre20161117.940a15ee3f1c89f193cb4c19373b3f6e9ad15b95
 EGG_NAME=      gyp-${DIST_VERSION}
 
+WRKSRC=                ${WRKDIR}/gyp
+
 # REPLACE_PYTHON settings farmed out due to size...
 .include "Makefile.replace-python"
 

Index: pkgsrc/devel/gyp/Makefile.replace-python
diff -u pkgsrc/devel/gyp/Makefile.replace-python:1.1 pkgsrc/devel/gyp/Makefile.replace-python:1.2
--- pkgsrc/devel/gyp/Makefile.replace-python:1.1        Thu Aug 21 14:49:43 2014
+++ pkgsrc/devel/gyp/Makefile.replace-python    Wed Jan 11 14:47:51 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.replace-python,v 1.1 2014/08/21 14:49:43 he Exp $
+# $NetBSD: Makefile.replace-python,v 1.2 2017/01/11 14:47:51 wiz Exp $
 
 REPLACE_PYTHON+= *.py
 REPLACE_PYTHON+= buildbot/buildbot_run.py
@@ -23,7 +23,6 @@ REPLACE_PYTHON+= test/actions/src/subdir
 REPLACE_PYTHON+= test/additional-targets/gyptest-additional.py
 REPLACE_PYTHON+= test/additional-targets/src/dir1/emit.py
 REPLACE_PYTHON+= test/analyzer/gyptest-analyzer.py
-REPLACE_PYTHON+= test/android/*.py
 REPLACE_PYTHON+= test/assembly/*.py
 REPLACE_PYTHON+= test/build-option/gyptest-build.py
 REPLACE_PYTHON+= test/builddir/*.py

Index: pkgsrc/devel/gyp/PLIST
diff -u pkgsrc/devel/gyp/PLIST:1.3 pkgsrc/devel/gyp/PLIST:1.4
--- pkgsrc/devel/gyp/PLIST:1.3  Sat Jul 19 09:08:36 2014
+++ pkgsrc/devel/gyp/PLIST      Wed Jan 11 14:47:51 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2014/07/19 09:08:36 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.4 2017/01/11 14:47:51 wiz Exp $
 bin/gyp
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -53,9 +53,6 @@ ${PYSITELIB}/gyp/generator/__init__.pyo
 ${PYSITELIB}/gyp/generator/analyzer.py
 ${PYSITELIB}/gyp/generator/analyzer.pyc
 ${PYSITELIB}/gyp/generator/analyzer.pyo
-${PYSITELIB}/gyp/generator/android.py
-${PYSITELIB}/gyp/generator/android.pyc
-${PYSITELIB}/gyp/generator/android.pyo
 ${PYSITELIB}/gyp/generator/cmake.py
 ${PYSITELIB}/gyp/generator/cmake.pyc
 ${PYSITELIB}/gyp/generator/cmake.pyo

Index: pkgsrc/devel/gyp/distinfo
diff -u pkgsrc/devel/gyp/distinfo:1.9 pkgsrc/devel/gyp/distinfo:1.10
--- pkgsrc/devel/gyp/distinfo:1.9       Tue Nov  3 03:27:31 2015
+++ pkgsrc/devel/gyp/distinfo   Wed Jan 11 14:47:51 2017
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 03:27:31 agc Exp $
+$NetBSD: distinfo,v 1.10 2017/01/11 14:47:51 wiz Exp $
 
-SHA1 (gyp-0.1pre2019.tar.gz) = 549e10b125271a5fdd07dc6db0877505f8cbdaa9
-RMD160 (gyp-0.1pre2019.tar.gz) = e2cfa0d8de6742219457afa42daf59f4d6da80a2
-SHA512 (gyp-0.1pre2019.tar.gz) = 2e4cb18690d9b4e58518ac9b1423c15d6526ff9f48882cceba487dd7220ed55bb676fe82afe1d724d5e46eee2a4db5d2e083b7614dedc46d399bbdd7f50cffcd
-Size (gyp-0.1pre2019.tar.gz) = 653486 bytes
+SHA1 (gyp-0.1pre20161117.940a15ee3f1c89f193cb4c19373b3f6e9ad15b95.tar.gz) = 2787473128d98a88d717b6b19c0ae03f0673f48a
+RMD160 (gyp-0.1pre20161117.940a15ee3f1c89f193cb4c19373b3f6e9ad15b95.tar.gz) = e58419e50f6c6c1da1ca994f359394b9f2adcce5
+SHA512 (gyp-0.1pre20161117.940a15ee3f1c89f193cb4c19373b3f6e9ad15b95.tar.gz) = 
8fcfc28d30990cf3e14cd107225f38e4b691a15c7966101b21d080a4bacadb1bf123045421de509dc053dea60c27427cf3649acdf63a25a2c637f140a770e492
+Size (gyp-0.1pre20161117.940a15ee3f1c89f193cb4c19373b3f6e9ad15b95.tar.gz) = 12195156 bytes
 SHA1 (patch-gyptest.py) = e33b65b31390fc5d4989e75f72f35b13055e3b41
-SHA1 (patch-pylib_gyp_common.py) = b074a71ca0f2a131ace33f35e3975239d9aa4b4d
+SHA1 (patch-pylib_gyp_common.py) = 8cad1bb72f23a7536cddf9fc2452c5623f4165cc
 SHA1 (patch-pylib_gyp_generator_make.py) = 1feb43b650a4dd8514e74e0c2bda41bde2243e03
-SHA1 (patch-test_lib_TestGyp.py) = 738f02641265a3c0ba7877d973ebe74490c6a862
+SHA1 (patch-test_lib_TestGyp.py) = e9a21bfc843b258de27f1eaa3628dbf9aff8fc45
 SHA1 (patch-test_library__dirs_subdir_test.gyp) = 9eb3b39f0bdbf54df6b45a3c613d83e9dfb68d8f
 SHA1 (patch-test_module_src_module.gyp) = 8016db83cce1244f17295d3dfd725f75ff78cb28
 SHA1 (patch-test_module_src_program.c) = ab55d357d9855f79f6fdfb151767f0521a217871

Index: pkgsrc/devel/gyp/patches/patch-pylib_gyp_common.py
diff -u pkgsrc/devel/gyp/patches/patch-pylib_gyp_common.py:1.3 pkgsrc/devel/gyp/patches/patch-pylib_gyp_common.py:1.4
--- pkgsrc/devel/gyp/patches/patch-pylib_gyp_common.py:1.3      Thu Aug 21 14:49:43 2014
+++ pkgsrc/devel/gyp/patches/patch-pylib_gyp_common.py  Wed Jan 11 14:47:51 2017
@@ -1,19 +1,10 @@
-$NetBSD: patch-pylib_gyp_common.py,v 1.3 2014/08/21 14:49:43 he Exp $
+$NetBSD: patch-pylib_gyp_common.py,v 1.4 2017/01/11 14:47:51 wiz Exp $
 
 * Add NetBSD support
 
---- pylib/gyp/common.py.orig   2014-07-14 14:19:49.000000000 +0000
+--- pylib/gyp/common.py.orig   2017-01-11 14:31:33.000000000 +0000
 +++ pylib/gyp/common.py
-@@ -420,6 +420,8 @@ def GetFlavor(params):
-     return 'openbsd'
-   if sys.platform.startswith('aix'):
-     return 'aix'
-+  if sys.platform.startswith('netbsd'):
-+    return 'netbsd'
- 
-   return 'linux'
- 
-@@ -432,6 +434,7 @@ def CopyTool(flavor, out_path):
+@@ -441,6 +441,7 @@ def CopyTool(flavor, out_path, generator
    prefix = {
        'aix': 'flock',
        'solaris': 'flock',

Index: pkgsrc/devel/gyp/patches/patch-test_lib_TestGyp.py
diff -u pkgsrc/devel/gyp/patches/patch-test_lib_TestGyp.py:1.1 pkgsrc/devel/gyp/patches/patch-test_lib_TestGyp.py:1.2
--- pkgsrc/devel/gyp/patches/patch-test_lib_TestGyp.py:1.1      Thu Aug 21 14:49:43 2014
+++ pkgsrc/devel/gyp/patches/patch-test_lib_TestGyp.py  Wed Jan 11 14:47:51 2017
@@ -1,19 +1,10 @@
-$NetBSD: patch-test_lib_TestGyp.py,v 1.1 2014/08/21 14:49:43 he Exp $
+$NetBSD: patch-test_lib_TestGyp.py,v 1.2 2017/01/11 14:47:51 wiz Exp $
 
-Our gnu make says "Nothing to be done" with just single quotes.
+NetBSD's make uses plain quotes.
 
---- test/lib/TestGyp.py.orig   2014-07-14 14:19:50.000000000 +0000
+--- test/lib/TestGyp.py.orig   2017-01-11 14:31:33.000000000 +0000
 +++ test/lib/TestGyp.py
-@@ -640,7 +640,7 @@ class TestGypAndroid(TestGypBase):
-     """
-     Verifies that a build of the specified target is up to date.
-     """
--    kw['stdout'] = ("make: Nothing to be done for `%s'." %
-+    kw['stdout'] = ("make: Nothing to be done for '%s'." %
-                     self.target_name(target))
- 
-     # We need to supply a custom matcher, since we don't want to depend on the
-@@ -784,7 +784,7 @@ class TestGypMake(TestGypBase):
+@@ -570,7 +570,7 @@ class TestGypMake(TestGypBase):
        message_target = 'all'
      else:
        message_target = target
@@ -22,7 +13,7 @@ Our gnu make says "Nothing to be done" w
      return self.build(gyp_file, target, **kw)
    def run_built_executable(self, name, *args, **kw):
      """
-@@ -1198,7 +1198,7 @@ class TestGypXcode(TestGypBase):
+@@ -1002,7 +1002,7 @@ class TestGypXcode(TestGypBase):
                              "PhaseScriptExecution /\\S+/Script-[0-9A-F]+\\.sh\n"
                              "    cd /\\S+\n"
                              "    /bin/sh -c /\\S+/Script-[0-9A-F]+\\.sh\n"