Date: Thu, 27 May 2021 19:37:18 GMT From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 247067631c56 - main - textproc/gi-docgen: make port more pythonish Message-ID: <202105271937.14RJbIcb091749@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=247067631c56c9835926f65d3d60c493b954bb74 commit 247067631c56c9835926f65d3d60c493b954bb74 Author: Sergey Akhmatov <sergey@akhmatov.ru> AuthorDate: 2021-05-27 08:03:01 +0000 Commit: Tobias C. Berner <tcberner@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105271937.14RJbIcb091749>