Index: head/devel/gn/Makefile =================================================================== --- head/devel/gn/Makefile (revision 503331) +++ head/devel/gn/Makefile (revision 503332) @@ -1,35 +1,35 @@ # $FreeBSD$ PORTNAME= gn DISTVERSIONPREFIX= v -DISTVERSION= 1529 +DISTVERSION= 1592 CATEGORIES= devel MAINTAINER= o.hushchenkov@gmail.com COMMENT= Gn meta build framework - standalone version LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USES= compiler:c++14-lang ninja python:2.7,build USE_GITHUB= yes GH_ACCOUNT= cglogic # mirror CONFLICTS_INSTALL= chromimum-gn* PLIST_FILES= bin/gn do-configure: cd ${WRKSRC} && GN_VERSION=${PORTVERSION} ${PYTHON_CMD} build/gen.py do-build: cd ${WRKSRC} && ninja -C out do-install: ${INSTALL_PROGRAM} ${WRKSRC}/out/gn ${STAGEDIR}${PREFIX}/bin do-test: build cd ${WRKSRC} && ./out/gn_unittests .include Index: head/devel/gn/distinfo =================================================================== --- head/devel/gn/distinfo (revision 503331) +++ head/devel/gn/distinfo (revision 503332) @@ -1,3 +1,3 @@ -TIMESTAMP = 1550242353 -SHA256 (cglogic-gn-v1529_GH0.tar.gz) = 8f292d3c3a6ea6d6f9b6d41f6e75c360414a7283796905d1b66f41617e2345d2 -SIZE (cglogic-gn-v1529_GH0.tar.gz) = 916888 +TIMESTAMP = 1559209288 +SHA256 (cglogic-gn-v1592_GH0.tar.gz) = 2a3ce6c6739b05ba09dcc8679a4d6ca3b96599c7777217af0563efd6c805f57f +SIZE (cglogic-gn-v1592_GH0.tar.gz) = 939749 Index: head/devel/gn/files/patch-build_gen.py =================================================================== --- head/devel/gn/files/patch-build_gen.py (revision 503331) +++ head/devel/gn/files/patch-build_gen.py (revision 503332) @@ -1,29 +1,29 @@ ---- build/gen.py.orig 2019-02-12 17:36:05 UTC +--- build/gen.py.orig 2019-05-30 09:42:43 UTC +++ build/gen.py -@@ -115,24 +115,15 @@ def main(argv): +@@ -117,24 +117,15 @@ 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) +- 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 "%s (%s)" +#define LAST_COMMIT_POSITION "%s" #endif // OUT_LAST_COMMIT_POSITION_H_ -''' % (mo.group(1), mo.group(2)) +''' % (os.environ['GN_VERSION']) # Only write/touch this file if the commit position has changed. old_contents = ''