Index: head/devel/gn/Makefile =================================================================== --- head/devel/gn/Makefile (revision 526937) +++ head/devel/gn/Makefile (revision 526938) @@ -1,40 +1,39 @@ # $FreeBSD$ PORTNAME= gn DISTVERSIONPREFIX= v -DISTVERSION= 1600 -PORTREVISION= 1 +DISTVERSION= 1714 CATEGORIES= devel MAINTAINER= o.hushchenkov@gmail.com COMMENT= Gn meta build framework - standalone version LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE CONFLICTS_INSTALL= chromium-gn -USES= alias compiler:c++14-lang ninja python:build shebangfix +USES= alias compiler:c++17-lang ninja python:build shebangfix USE_GITHUB= yes GH_ACCOUNT= cglogic # mirror SHEBANG_FILES= ${CONFIGURE_SCRIPT} HAS_CONFIGURE= yes CONFIGURE_OUTSOURCE= yes CONFIGURE_SCRIPT= build/gen.py CONFIGURE_WRKSRC= ${WRKSRC}/out # --out-path breaks "make test" CONFIGURE_ENV= GN_VERSION=${PORTVERSION} CONFIGURE_ARGS= --platform freebsd ${WITH_DEBUG:D--debug} ALL_TARGET= # empty PLIST_FILES= bin/${PORTNAME} post-patch: @${REINPLACE_CMD} 's/"python"/"${PYTHON_CMD:T}"/' \ - ${WRKSRC}/tools/gn/exec_process_unittest.cc + ${WRKSRC}/src/gn/exec_process_unittest.cc do-install: ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin do-test: ${TEST_WRKSRC}/gn_unittests .include Index: head/devel/gn/distinfo =================================================================== --- head/devel/gn/distinfo (revision 526937) +++ head/devel/gn/distinfo (revision 526938) @@ -1,3 +1,3 @@ -TIMESTAMP = 1560866156 -SHA256 (cglogic-gn-v1600_GH0.tar.gz) = c821d57848a7b7b6ee33333db827abb34545fd939ab7bc3b27f1a64e0a8e1da2 -SIZE (cglogic-gn-v1600_GH0.tar.gz) = 942568 +TIMESTAMP = 1582365298 +SHA256 (cglogic-gn-v1714_GH0.tar.gz) = 6b98b752ef16ab50c45123deb5893ddef6598a5ebac6191efba162c9689ef20c +SIZE (cglogic-gn-v1714_GH0.tar.gz) = 941711 Index: head/devel/gn/files/patch-build_gen.py =================================================================== --- head/devel/gn/files/patch-build_gen.py (revision 526937) +++ head/devel/gn/files/patch-build_gen.py (revision 526938) @@ -1,31 +1,32 @@ - .git/ is missing in archive, so use version from environment ---- build/gen.py.orig 2019-05-30 09:42:43 UTC +--- build/gen.py.orig 2020-02-22 10:07:32 UTC +++ build/gen.py -@@ -117,24 +117,15 @@ def main(argv): +@@ -124,25 +124,16 @@ def main(argv): def GenerateLastCommitPosition(host, header): - ROOT_TAG = 'initial-commit' - describe_output = subprocess.check_output( - ['git', 'describe', 'HEAD', '--match', ROOT_TAG], shell=host.is_windows(), - cwd=REPO_ROOT) - mo = re.match(ROOT_TAG + '-(\d+)-g([0-9a-f]+)', describe_output.decode()) - if not mo: - raise ValueError( - 'Unexpected output from git describe when generating version header') - contents = '''// Generated by build/gen.py. #ifndef OUT_LAST_COMMIT_POSITION_H_ #define OUT_LAST_COMMIT_POSITION_H_ + #define LAST_COMMIT_POSITION_NUM %s -#define LAST_COMMIT_POSITION "%s (%s)" +#define LAST_COMMIT_POSITION "%s" #endif // OUT_LAST_COMMIT_POSITION_H_ --''' % (mo.group(1), mo.group(2)) -+''' % (os.environ['GN_VERSION']) +-''' % (mo.group(1), mo.group(1), mo.group(2)) ++''' % (os.environ['GN_VERSION'], os.environ['GN_VERSION']) # Only write/touch this file if the commit position has changed. old_contents = ''