Attachment #221683 for bug #252701




# $FreeBSD$

PORTNAME=	gtk-doc
DISTVERSION=	1.33.1
PORTREVISION=	1
CATEGORIES=	textproc
MASTER_SITES=	GNOME


LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	${PY_PYGMENTS} \
		highlight:textproc/highlight \
		docbook-xml>0:textproc/docbook-xml \
		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl \
		itstool:textproc/itstool \
		yelp-tools>=0:textproc/yelp-tools
RUN_DEPENDS=	${PY_PYGMENTS} \
		docbook-xml>0:textproc/docbook-xml \
		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl
RUN_DEPENDS=	docbook-xml>0:textproc/docbook-xml \
		highlight:textproc/highlight \
		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl

USES=		gettext-tools gnome meson python:3.6+ pkgconfig tar:xz
USE_GNOME=	libxml2 libxslt
USE_GNOME=	gnomeprefix libxslt

MESON_ARGS=	-Dtests=false
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-highlight=highlight \
		--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports

NO_ARCH=	yes

post-install:
	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
		-f -d ${DATADIR}/python/gtkdoc \

Lines 1-3 Link Here

(-)textproc/gtk-doc/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1539028527	1	TIMESTAMP = 1610870812
2	SHA256 (gtk-doc-1.29.tar.xz) = 14578e002496567276d310a62c9ffd6c56ee8806ce5079ffb0b81c4111f586b1	2	SHA256 (gtk-doc-1.33.1.tar.xz) = a5cfed2a0b73a09b796fff80ad6d8f040ab2b2655bdc941ac207ffe6d9c10f10
3	SIZE (gtk-doc-1.29.tar.xz) = 732376	3	SIZE (gtk-doc-1.33.1.tar.xz) = 768896




--- help/manual/LINGUAS.orig	2021-01-17 17:54:00 UTC
+++ help/manual/LINGUAS
@@ -0,0 +1,17 @@
+# Please keep this list sorted alphabetically.
+#
+bn_IN
+cs
+de
+el
+en_GB
+es
+fr
+gl
+gu
+pt_BR
+sl
+sv
+ta
+te
+zh_CN
\ No newline at end of file




--- meson.build.orig	2020-11-17 13:56:44 UTC
+++ meson.build
@@ -7,7 +7,7 @@ project('gtk-doc', 'c',
 gnome = import('gnome')
 python = import('python') # Meson new Python module https://mesonbuild.com/Python-module.html
 
-python3 = python.find_installation('python3')
+python3 = python.find_installation()
 
 version = meson.project_version()
 package_name = meson.project_name()
@@ -163,7 +163,7 @@ configure_file(
   output: 'gtk-doc.pc',
   configuration: gtkdoc_pc,
   install: true,
-  install_dir: pkgconfigdir,
+  install_dir: join_paths(libdir, 'pkgconfig'),
 )
 
 subdir('help')

Lines 19-24 Link Here

(-)textproc/gtk-doc/pkg-plist (+8 lines)
19	%%DATADIR%%/data/devhelp2.xsl	19	%%DATADIR%%/data/devhelp2.xsl
20	%%DATADIR%%/data/gtk-doc.flat.make	20	%%DATADIR%%/data/gtk-doc.flat.make
21	%%DATADIR%%/data/gtk-doc.make	21	%%DATADIR%%/data/gtk-doc.make
		22	%%DATADIR%%/data/gtk-doc.no-xslt-flat.make
		23	%%DATADIR%%/data/gtk-doc.no-xslt.make
22	%%DATADIR%%/data/gtk-doc.xsl	24	%%DATADIR%%/data/gtk-doc.xsl
23	%%DATADIR%%/data/home.png	25	%%DATADIR%%/data/home.png
24	%%DATADIR%%/data/left-insensitive.png	26	%%DATADIR%%/data/left-insensitive.png
Lines 38-45 Link Here
38	%%DATADIR%%/python/gtkdoc/__pycache__/common.cpython-%%PYTHON_SUFFIX%%.pyc	40	%%DATADIR%%/python/gtkdoc/__pycache__/common.cpython-%%PYTHON_SUFFIX%%.pyc
39	%%DATADIR%%/python/gtkdoc/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc	41	%%DATADIR%%/python/gtkdoc/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
40	%%DATADIR%%/python/gtkdoc/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc	42	%%DATADIR%%/python/gtkdoc/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc
		43	%%DATADIR%%/python/gtkdoc/__pycache__/config_data.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
		44	%%DATADIR%%/python/gtkdoc/__pycache__/config_data.cpython-%%PYTHON_SUFFIX%%.pyc
41	%%DATADIR%%/python/gtkdoc/__pycache__/fixxref.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc	45	%%DATADIR%%/python/gtkdoc/__pycache__/fixxref.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
42	%%DATADIR%%/python/gtkdoc/__pycache__/fixxref.cpython-%%PYTHON_SUFFIX%%.pyc	46	%%DATADIR%%/python/gtkdoc/__pycache__/fixxref.cpython-%%PYTHON_SUFFIX%%.pyc
		47	%%DATADIR%%/python/gtkdoc/__pycache__/highlight.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
		48	%%DATADIR%%/python/gtkdoc/__pycache__/highlight.cpython-%%PYTHON_SUFFIX%%.pyc
43	%%DATADIR%%/python/gtkdoc/__pycache__/md_to_db.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc	49	%%DATADIR%%/python/gtkdoc/__pycache__/md_to_db.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
44	%%DATADIR%%/python/gtkdoc/__pycache__/md_to_db.cpython-%%PYTHON_SUFFIX%%.pyc	50	%%DATADIR%%/python/gtkdoc/__pycache__/md_to_db.cpython-%%PYTHON_SUFFIX%%.pyc
45	%%DATADIR%%/python/gtkdoc/__pycache__/mkdb.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc	51	%%DATADIR%%/python/gtkdoc/__pycache__/mkdb.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
Lines 61-67 Link Here
61	%%DATADIR%%/python/gtkdoc/check.py	67	%%DATADIR%%/python/gtkdoc/check.py
62	%%DATADIR%%/python/gtkdoc/common.py	68	%%DATADIR%%/python/gtkdoc/common.py
63	%%DATADIR%%/python/gtkdoc/config.py	69	%%DATADIR%%/python/gtkdoc/config.py
		70	%%DATADIR%%/python/gtkdoc/config_data.py
64	%%DATADIR%%/python/gtkdoc/fixxref.py	71	%%DATADIR%%/python/gtkdoc/fixxref.py
		72	%%DATADIR%%/python/gtkdoc/highlight.py
65	%%DATADIR%%/python/gtkdoc/md_to_db.py	73	%%DATADIR%%/python/gtkdoc/md_to_db.py
66	%%DATADIR%%/python/gtkdoc/mkdb.py	74	%%DATADIR%%/python/gtkdoc/mkdb.py
67	%%DATADIR%%/python/gtkdoc/mkhtml.py	75	%%DATADIR%%/python/gtkdoc/mkhtml.py

Return to bug 252701

Lines 2-9 Link Here

(-)textproc/gtk-doc/Makefile (-14 / +12 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= gtk-doc	4	PORTNAME= gtk-doc
5	PORTVERSION= 1.29	5	DISTVERSION= 1.33.1
6	PORTREVISION= 1
7	CATEGORIES= textproc	6	CATEGORIES= textproc
8	MASTER_SITES= GNOME	7	MASTER_SITES= GNOME
9		8
Lines 13-35 Link Here
13	LICENSE= GPLv2	12	LICENSE= GPLv2
14	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
15		14
16	BUILD_DEPENDS= itstool:textproc/itstool \	15	BUILD_DEPENDS= ${PY_PYGMENTS} \
17	highlight:textproc/highlight \
18	docbook-xml>0:textproc/docbook-xml \	16	docbook-xml>0:textproc/docbook-xml \
		17	${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl \
		18	itstool:textproc/itstool \
		19	yelp-tools>=0:textproc/yelp-tools
		20	RUN_DEPENDS= ${PY_PYGMENTS} \
		21	docbook-xml>0:textproc/docbook-xml \
19	${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl	22	${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl
20	RUN_DEPENDS= docbook-xml>0:textproc/docbook-xml \
21	highlight:textproc/highlight \
22	${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl
23		23
24	USES= gettext-tools gmake gnome pathfix perl5 pkgconfig \	24	USES= gettext-tools gnome meson python:3.6+ pkgconfig tar:xz
25	python:3.4+ tar:xz	25	USE_GNOME= libxml2 libxslt
26	USE_GNOME= gnomeprefix libxslt
27		26
28	DOCBOOK_VERSION= 4.1.2	27	MESON_ARGS= -Dtests=false
29	GNU_CONFIGURE= yes
30	CONFIGURE_ARGS= --with-highlight=highlight \
31	--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
32		28
		29	NO_ARCH= yes
		30
33	post-install:	31	post-install:
34	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \	32	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
35	-f -d ${DATADIR}/python/gtkdoc \	33	-f -d ${DATADIR}/python/gtkdoc \

Line 0 Link Here

(-)textproc/gtk-doc/files/patch-help_manual_LINGUAS (+21 lines)
	1	--- help/manual/LINGUAS.orig 2021-01-17 17:54:00 UTC
	2	+++ help/manual/LINGUAS
	3	@@ -0,0 +1,17 @@
	4	+# Please keep this list sorted alphabetically.
	5	+#
	6	+bn_IN
	7	+cs
	8	+de
	9	+el
	10	+en_GB
	11	+es
	12	+fr
	13	+gl
	14	+gu
	15	+pt_BR
	16	+sl
	17	+sv
	18	+ta
	19	+te
	20	+zh_CN
	21	\ No newline at end of file

Line 0 Link Here

(-)textproc/gtk-doc/files/patch-meson.build (+20 lines)
	1	--- meson.build.orig 2020-11-17 13:56:44 UTC
	2	+++ meson.build
	3	@@ -7,7 +7,7 @@ project('gtk-doc', 'c',
	4	gnome = import('gnome')
	5	python = import('python') # Meson new Python module https://mesonbuild.com/Python-module.html
	6
	7	-python3 = python.find_installation('python3')
	8	+python3 = python.find_installation()
	9
	10	version = meson.project_version()
	11	package_name = meson.project_name()
	12	@@ -163,7 +163,7 @@ configure_file(
	13	output: 'gtk-doc.pc',
	14	configuration: gtkdoc_pc,
	15	install: true,
	16	- install_dir: pkgconfigdir,
	17	+ install_dir: join_paths(libdir, 'pkgconfig'),
	18	)
	19
	20	subdir('help')