From owner-dev-commits-ports-main@freebsd.org Thu May 27 19:37:18 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 63559643CFB; Thu, 27 May 2021 19:37:18 +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 4FrdPV23vkz4kfc; Thu, 27 May 2021 19:37:18 +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 2AD3F19AB; Thu, 27 May 2021 19:37:18 +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 14RJbIgi091750; Thu, 27 May 2021 19:37:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14RJbIcb091749; Thu, 27 May 2021 19:37:18 GMT (envelope-from git) Date: Thu, 27 May 2021 19:37:18 GMT Message-Id: <202105271937.14RJbIcb091749@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 247067631c56 - main - textproc/gi-docgen: make port more pythonish MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 247067631c56c9835926f65d3d60c493b954bb74 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 May 2021 19:37:18 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=247067631c56c9835926f65d3d60c493b954bb74 commit 247067631c56c9835926f65d3d60c493b954bb74 Author: Sergey Akhmatov AuthorDate: 2021-05-27 08:03:01 +0000 Commit: Tobias C. Berner CommitDate: 2021-05-27 19:35:52 +0000 textproc/gi-docgen: make port more pythonish - The port was not quite following the standard python port paradigms. PR: 256161 Reported by: tech-lists@zyxst.net --- textproc/gi-docgen/Makefile | 10 ++-- textproc/gi-docgen/files/patch-meson.build | 11 ----- textproc/gi-docgen/files/patch-setup.py | 11 +++++ textproc/gi-docgen/pkg-plist | 73 ------------------------------ 4 files changed, 15 insertions(+), 90 deletions(-) diff --git a/textproc/gi-docgen/Makefile b/textproc/gi-docgen/Makefile index 7f49c0648113..bcec475e4cc9 100644 --- a/textproc/gi-docgen/Makefile +++ b/textproc/gi-docgen/Makefile @@ -1,7 +1,8 @@ PORTNAME= gi-docgen PORTVERSION= 2021.5 -CATEGORIES= textproc +CATEGORIES= textproc python MASTER_SITES= GNOME +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= desktop@FreeBSD.org COMMENT= Documentation generator for GObject-based libraries @@ -11,7 +12,6 @@ LICENSE_COMB= dual LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSES/Apache-2.0.txt LICENSE_FILE_GPLv3= ${WRKSRC}/LICENSES/GPL-3.0-or-later.txt -BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markupsafe>0:textproc/py-markupsafe@${PY_FLAVOR} \ @@ -20,10 +20,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}toml>0:textproc/py-toml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typogrify>0:textproc/py-typogrify@${PY_FLAVOR} -USES= meson python:3.6+ shebangfix - -SHEBANG_FILES= gi-docgen.py -BINARY_ALIAS= python3=${PYTHON_CMD} +USES= python:3.6+ +USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/textproc/gi-docgen/files/patch-meson.build b/textproc/gi-docgen/files/patch-meson.build deleted file mode 100644 index 241e6e95da5d..000000000000 --- a/textproc/gi-docgen/files/patch-meson.build +++ /dev/null @@ -1,11 +0,0 @@ ---- meson.build.orig 2021-04-17 05:31:14 UTC -+++ meson.build -@@ -37,7 +37,7 @@ configure_file( - output: 'gi-docgen.pc', - configuration: pkgconf, - install: not meson.is_subproject(), -- install_dir: get_option('datadir') / 'pkgconfig', -+ install_dir: 'libdata/pkgconfig', - ) - - if not meson.is_subproject() diff --git a/textproc/gi-docgen/files/patch-setup.py b/textproc/gi-docgen/files/patch-setup.py new file mode 100644 index 000000000000..85f0826e2892 --- /dev/null +++ b/textproc/gi-docgen/files/patch-setup.py @@ -0,0 +1,11 @@ +--- setup.py.orig 2021-05-26 15:29:06 UTC ++++ setup.py +@@ -55,7 +55,7 @@ package_data = { + } + + data_files = [ +- ('share/pkgconfig', ['gi-docgen.pc']), ++ ('libdata/pkgconfig', ['gi-docgen.pc']), + ('share/man/man1', ['docs/gi-docgen.1']), + ] + diff --git a/textproc/gi-docgen/pkg-plist b/textproc/gi-docgen/pkg-plist deleted file mode 100644 index 68037e201468..000000000000 --- a/textproc/gi-docgen/pkg-plist +++ /dev/null @@ -1,73 +0,0 @@ -bin/gi-docgen -%%PYTHON_SITELIBDIR%%/gidocgen/__init__.py -%%PYTHON_SITELIBDIR%%/gidocgen/config.py -%%PYTHON_SITELIBDIR%%/gidocgen/core.py -%%PYTHON_SITELIBDIR%%/gidocgen/gdgendeps.py -%%PYTHON_SITELIBDIR%%/gidocgen/gdgenerate.py -%%PYTHON_SITELIBDIR%%/gidocgen/gdgenindices.py -%%PYTHON_SITELIBDIR%%/gidocgen/gdindex.py -%%PYTHON_SITELIBDIR%%/gidocgen/gdsearch.py -%%PYTHON_SITELIBDIR%%/gidocgen/gidocmain.py -%%PYTHON_SITELIBDIR%%/gidocgen/gir/__init__.py -%%PYTHON_SITELIBDIR%%/gidocgen/gir/ast.py -%%PYTHON_SITELIBDIR%%/gidocgen/gir/parser.py -%%PYTHON_SITELIBDIR%%/gidocgen/log.py -%%PYTHON_SITELIBDIR%%/gidocgen/mdext.py -%%PYTHON_SITELIBDIR%%/gidocgen/porter.py -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatDisplay-Black.woff -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatDisplay-Black.woff2 -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatDisplay-BlackItalic.woff -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatDisplay-BlackItalic.woff2 -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatDisplay-Bold.woff -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatDisplay-Bold.woff2 -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatDisplay-BoldItalic.woff -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatDisplay-BoldItalic.woff2 -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatDisplay-Italic.woff -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatDisplay-Italic.woff2 -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatDisplay-Medium.woff -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatDisplay-Medium.woff2 -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatDisplay-MediumItalic.woff -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatDisplay-MediumItalic.woff2 -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatDisplay-Regular.woff -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatDisplay-Regular.woff2 -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatText-Bold.woff -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatText-Bold.woff2 -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatText-BoldItalic.woff -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatText-BoldItalic.woff2 -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatText-Italic.woff -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatText-Italic.woff2 -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatText-Medium.woff -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatText-Medium.woff2 -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatText-MediumItalic.woff -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatText-MediumItalic.woff2 -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatText-Regular.woff -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/RedHatText-Regular.woff2 -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/SourceCodePro-It.ttf.woff -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/SourceCodePro-Regular.ttf.woff -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/SourceCodePro-Semibold.ttf.woff -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/base.html -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/basic.toml -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/class.html -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/class_method.html -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/constant.html -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/content.html -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/ctor.html -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/enum.html -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/fonts.css -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/function.html -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/fzy.js -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/go-up-symbolic.png -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/interface.html -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/main.js -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/method.html -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/namespace.html -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/property.html -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/pygment.css -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/search.js -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/signal.html -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/struct.html -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/style.css -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/type_func.html -%%PYTHON_SITELIBDIR%%/gidocgen/templates/basic/vfunc.html -%%PYTHON_SITELIBDIR%%/gidocgen/utils.py -libdata/pkgconfig/gi-docgen.pc