From owner-svn-ports-all@freebsd.org Thu Jan 23 15:40:12 2020 Return-Path: Delivered-To: svn-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 3757F1F5623; Thu, 23 Jan 2020 15:40:12 +0000 (UTC) (envelope-from lbartoletti@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 483RL407f3z3Hg0; Thu, 23 Jan 2020 15:40:12 +0000 (UTC) (envelope-from lbartoletti@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B92A818DAB; Thu, 23 Jan 2020 15:40:11 +0000 (UTC) (envelope-from lbartoletti@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00NFeBnD044430; Thu, 23 Jan 2020 15:40:11 GMT (envelope-from lbartoletti@FreeBSD.org) Received: (from lbartoletti@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00NFeAM8044423; Thu, 23 Jan 2020 15:40:10 GMT (envelope-from lbartoletti@FreeBSD.org) Message-Id: <202001231540.00NFeAM8044423@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lbartoletti set sender to lbartoletti@FreeBSD.org using -f From: =?UTF-8?Q?Lo=c3=afc_Bartoletti?= Date: Thu, 23 Jan 2020 15:40:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r523934 - in head: graphics/qgis graphics/qgis-ltr textproc/txt2tags X-SVN-Group: ports-head X-SVN-Commit-Author: lbartoletti X-SVN-Commit-Paths: in head: graphics/qgis graphics/qgis-ltr textproc/txt2tags X-SVN-Commit-Revision: 523934 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jan 2020 15:40:12 -0000 Author: lbartoletti Date: Thu Jan 23 15:40:10 2020 New Revision: 523934 URL: https://svnweb.freebsd.org/changeset/ports/523934 Log: textproc/txt2tags: Update to 3.4, fix graphics/qgis and graphics/qgis-ltr with this newest version - Use python3 only [1] - Fix graphics/qgis and graphics/qgis-ltr with txt2tags-3.4 (remove --css-sugar --css-inside) [2][3] Changelog: https://github.com/txt2tags/txt2tags/blob/v3/CHANGELOG.md [1] txt2tags v3 can use python2 too. But, only graphics/qgis* uses it and depends on python3. I want to avoid adding dependencies. And python2 is dead, isn't it? ;) [2] https://github.com/txt2tags/txt2tags#feature-differences-between-versions [3] https://github.com/qgis/QGIS/issues/33516 PR: 243368 Reviewed by: tcberner Approved by: Rainer Hurling (qgis maintainter), tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D23188 Modified: head/graphics/qgis-ltr/Makefile head/graphics/qgis/Makefile head/textproc/txt2tags/Makefile head/textproc/txt2tags/distinfo Modified: head/graphics/qgis-ltr/Makefile ============================================================================== --- head/graphics/qgis-ltr/Makefile Thu Jan 23 14:03:41 2020 (r523933) +++ head/graphics/qgis-ltr/Makefile Thu Jan 23 15:40:10 2020 (r523934) @@ -148,6 +148,9 @@ CXX= clang++${LLVM_DEFAULT} post-patch: @${REINPLACE_CMD} -e 's|markupsafe ||g' \ ${WRKSRC}/python/ext-libs/CMakeLists.txt +# Build failure with txt2tags > 3 (dropped --css-sugar & --css-inside) +# https://github.com/qgis/QGIS/issues/33516 + @${REINPLACE_CMD} -e 's|--css-sugar --css-inside||' ${WRKSRC}/doc/INSTALL.t2t ${WRKSRC}/doc/news.t2t pre-configure: ${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3 Modified: head/graphics/qgis/Makefile ============================================================================== --- head/graphics/qgis/Makefile Thu Jan 23 14:03:41 2020 (r523933) +++ head/graphics/qgis/Makefile Thu Jan 23 15:40:10 2020 (r523934) @@ -153,6 +153,9 @@ post-patch: @${REINPLACE_CMD} -e 's|"-mllvm -inline-threshold=128"|"-O1"|g' \ ${WRKSRC}/src/core/CMakeLists.txt .endif +# Build failure with txt2tags > 3 (dropped --css-sugar & --css-inside) +# https://github.com/qgis/QGIS/issues/33516 + @${REINPLACE_CMD} -e 's|--css-sugar --css-inside||' ${WRKSRC}/doc/INSTALL.t2t ${WRKSRC}/doc/news.t2t pre-configure: ${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3 Modified: head/textproc/txt2tags/Makefile ============================================================================== --- head/textproc/txt2tags/Makefile Thu Jan 23 14:03:41 2020 (r523933) +++ head/textproc/txt2tags/Makefile Thu Jan 23 15:40:10 2020 (r523934) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= txt2tags -PORTVERSION= 2.6 -PORTREVISION= 3 +PORTVERSION= 3.4 CATEGORIES= textproc MAINTAINER= lbartoletti@FreeBSD.org @@ -12,8 +11,8 @@ COMMENT= Convert simply formatted text into markup (e. LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= python:2.7 shebangfix -SHEBANG_FILES= extras/html-update.sh txt2tags +USES= python:3.6+ shebangfix +SHEBANG_FILES= txt2tags.py USE_GITHUB= yes NO_BUILD= yes NO_ARCH= yes @@ -25,7 +24,7 @@ PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/txt2tags ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/txt2tags.py ${STAGEDIR}${PREFIX}/bin/txt2tags do-install-EXAMPLES-on: @cd ${WRKSRC}/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} @@ -33,7 +32,10 @@ do-install-EXAMPLES-on: do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/*/*.pdf ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/CHANGELOG.md ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} +.for doc in markup rules userguide + @cd ${WRKSRC}/docs/${doc} && ${WRKSRC}/txt2tags.py ${doc}.t2t + ${INSTALL_DATA} ${WRKSRC}/docs/${doc}/${doc}.html ${STAGEDIR}${DOCSDIR} +.endfor .include Modified: head/textproc/txt2tags/distinfo ============================================================================== --- head/textproc/txt2tags/distinfo Thu Jan 23 14:03:41 2020 (r523933) +++ head/textproc/txt2tags/distinfo Thu Jan 23 15:40:10 2020 (r523934) @@ -1,3 +1,3 @@ -TIMESTAMP = 1474656184 -SHA256 (txt2tags-txt2tags-2.6_GH0.tar.gz) = c87b911ac5cc97dd2fdb6067601cf4fbd0094a065f6b7a593142fa75e3a924c1 -SIZE (txt2tags-txt2tags-2.6_GH0.tar.gz) = 4509515 +TIMESTAMP = 1577715579 +SHA256 (txt2tags-txt2tags-3.4_GH0.tar.gz) = 989c8cc0bc69c5b2acad92cc08e61786e06ee5093969c232adda2eb905f9a00d +SIZE (txt2tags-txt2tags-3.4_GH0.tar.gz) = 252256