From owner-dev-commits-ports-all@freebsd.org Mon Jul 26 14:31:58 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6F75C66D364; Mon, 26 Jul 2021 14:31:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GYMnV2lyLz4pHT; Mon, 26 Jul 2021 14:31:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 44E3F18C8A; Mon, 26 Jul 2021 14:31:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16QEVwfY068825; Mon, 26 Jul 2021 14:31:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16QEVwcR068824; Mon, 26 Jul 2021 14:31:58 GMT (envelope-from git) Date: Mon, 26 Jul 2021 14:31:58 GMT Message-Id: <202107261431.16QEVwcR068824@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Vanilla I. Shu" Subject: git: ad9a6e6c14ca - main - textproc/google-ctemplate: update to 2.4. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vanilla X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad9a6e6c14caa0b1eba5b47ed8b6fc58cd2596f9 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Jul 2021 14:31:58 -0000 The branch main has been updated by vanilla: URL: https://cgit.FreeBSD.org/ports/commit/?id=ad9a6e6c14caa0b1eba5b47ed8b6fc58cd2596f9 commit ad9a6e6c14caa0b1eba5b47ed8b6fc58cd2596f9 Author: Vanilla I. Shu AuthorDate: 2021-07-26 14:27:43 +0000 Commit: Vanilla I. Shu CommitDate: 2021-07-26 14:29:37 +0000 textproc/google-ctemplate: update to 2.4. --- textproc/google-ctemplate/Makefile | 11 +++--- textproc/google-ctemplate/distinfo | 6 ++-- .../files/patch-src_base_small__map.h | 11 ------ .../files/patch-src_htmlparser_fsm__config.py | 15 -------- .../files/patch-src_htmlparser_generate__fsm.py | 41 ---------------------- textproc/google-ctemplate/pkg-plist | 3 -- 6 files changed, 7 insertions(+), 80 deletions(-) diff --git a/textproc/google-ctemplate/Makefile b/textproc/google-ctemplate/Makefile index 3544e8506c3d..3023bd1c7d4d 100644 --- a/textproc/google-ctemplate/Makefile +++ b/textproc/google-ctemplate/Makefile @@ -1,7 +1,7 @@ # Created by: ijliao PORTNAME= ctemplate -PORTVERSION= 2.3 +PORTVERSION= 2.4 DISTVERSIONPREFIX= ${PORTNAME}- CATEGORIES= textproc PKGNAMEPREFIX= google- @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING OPTIONS_DEFINE= DOCS -USES= libtool pathfix pkgconfig python:build shebangfix +USES= autoreconf gmake libtool pathfix pkgconfig python:build shebangfix GNU_CONFIGURE= yes SHEBANG_FILES= src/template-converter src/htmlparser/generate_fsm.py src/htmlparser/fsm_config.py USE_LDCONFIG= yes @@ -24,16 +24,13 @@ INSTALL_TARGET= install-strip TEST_TARGET= check post-patch: - @${REINPLACE_CMD} -e \ - 's|$$(prefix)/share/doc/$$(PACKAGE)-$$(VERSION)|${DOCSDIR}|' \ - ${WRKSRC}/Makefile.in # XXX: undefining BSWAP32 breaks builds on big-endian systems for some reason @${REINPLACE_CMD} -e 's|# undef BSWAP32|//&|' \ ${WRKSRC}/src/base/macros.h post-patch-DOCS-off: @${REINPLACE_CMD} -e \ - '/install-data-am/ s|install-dist_docDATA||' \ - ${WRKSRC}/Makefile.in + 's|dist_doc_DATA|noinst_DOCDATA|' \ + ${WRKSRC}/Makefile.am .include diff --git a/textproc/google-ctemplate/distinfo b/textproc/google-ctemplate/distinfo index 55353775188d..0350e1ba3ef3 100644 --- a/textproc/google-ctemplate/distinfo +++ b/textproc/google-ctemplate/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1464784826 -SHA256 (OlafvdSpek-ctemplate-ctemplate-2.3_GH0.tar.gz) = 99e5cb6d3f8407d5b1ffef96b1d59ce3981cda3492814e5ef820684ebb782556 -SIZE (OlafvdSpek-ctemplate-ctemplate-2.3_GH0.tar.gz) = 720717 +TIMESTAMP = 1627287136 +SHA256 (OlafvdSpek-ctemplate-ctemplate-2.4_GH0.tar.gz) = ccc4105b3dc51c82b0f194499979be22d5a14504f741115be155bd991ee93cfa +SIZE (OlafvdSpek-ctemplate-ctemplate-2.4_GH0.tar.gz) = 391923 diff --git a/textproc/google-ctemplate/files/patch-src_base_small__map.h b/textproc/google-ctemplate/files/patch-src_base_small__map.h deleted file mode 100644 index 4f9352bbda37..000000000000 --- a/textproc/google-ctemplate/files/patch-src_base_small__map.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/base/small_map.h.orig 2014-03-19 19:34:51 UTC -+++ src/base/small_map.h -@@ -52,6 +52,8 @@ - #include - #include // for make_pair() - #include "base/manual_constructor.h" -+using std::make_pair; -+ - _START_GOOGLE_NAMESPACE_ - - template struct CompileAssert { }; diff --git a/textproc/google-ctemplate/files/patch-src_htmlparser_fsm__config.py b/textproc/google-ctemplate/files/patch-src_htmlparser_fsm__config.py deleted file mode 100644 index 4a4dd4c619d5..000000000000 --- a/textproc/google-ctemplate/files/patch-src_htmlparser_fsm__config.py +++ /dev/null @@ -1,15 +0,0 @@ ---- src/htmlparser/fsm_config.py.orig 2020-09-26 14:52:15 UTC -+++ src/htmlparser/fsm_config.py -@@ -210,7 +210,11 @@ class FSMConfig(object): - - self.sm['state'] = self.AddState - self.sm['condition'] = self.AddCondition -- execfile(filename, self.sm) -+ -+ with open(filename) as f: -+ code = compile(f.read(), filename, 'exec') -+ exec(code, self.sm) -+ - self.name = self.sm['name'] - if not self.name.isalnum(): - raise Exception("State machine name must consist of only alphanumeric" diff --git a/textproc/google-ctemplate/files/patch-src_htmlparser_generate__fsm.py b/textproc/google-ctemplate/files/patch-src_htmlparser_generate__fsm.py deleted file mode 100644 index 952a2f6b6aba..000000000000 --- a/textproc/google-ctemplate/files/patch-src_htmlparser_generate__fsm.py +++ /dev/null @@ -1,41 +0,0 @@ ---- src/htmlparser/generate_fsm.py.orig 2020-09-26 14:51:40 UTC -+++ src/htmlparser/generate_fsm.py -@@ -264,7 +264,7 @@ class FSMGenerateC(FSMGenerateAbstract): - state_table = {} - - for state in self._config.states: -- state_table[state] = [default_state for col in xrange(255)] -+ state_table[state] = [default_state for col in range(255)] - - # We process the transition in reverse order while updating the table. - for i_transition in range(len(self._config.transitions) - 1, -1, -1): -@@ -281,7 +281,7 @@ class FSMGenerateC(FSMGenerateAbstract): - # Create the inner lists which map input characters to destination states. - for state in self._config.states: - transition_row = [] -- for c in xrange(0, 255): -+ for c in range(0, 255): - transition_row.append(' /* %06s */ %s' % (repr(chr(c)), - state_table[state][c])) - -@@ -306,17 +306,17 @@ class FSMGenerateC(FSMGenerateAbstract): - def Generate(self): - """Returns the generated the C include statements for the statemachine.""" - -- print '\n'.join((self._CreateHeader(), -+ print('\n'.join((self._CreateHeader(), - self._CreateNumStates(), - self._CreateStatesEnum(), - self._CreateStatesExternal(), - self._CreateStatesInternalNames(), -- self._CreateTransitionTable())) -+ self._CreateTransitionTable()))) - - - def main(): - if len(sys.argv) != 2: -- print "usage: generate_fsm.py config_file" -+ print("usage: generate_fsm.py config_file") - sys.exit(1) - - config = FSMConfig() diff --git a/textproc/google-ctemplate/pkg-plist b/textproc/google-ctemplate/pkg-plist index b4a46b1c0ee2..7c375e799589 100644 --- a/textproc/google-ctemplate/pkg-plist +++ b/textproc/google-ctemplate/pkg-plist @@ -25,12 +25,9 @@ lib/libctemplate_nothreads.so.3.0.0 libdata/pkgconfig/libctemplate.pc libdata/pkgconfig/libctemplate_nothreads.pc %%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README_windows.txt %%PORTDOCS%%%%DOCSDIR%%/auto_escape.html %%PORTDOCS%%%%DOCSDIR%%/designstyle.css %%PORTDOCS%%%%DOCSDIR%%/example.html