Mon Dec 18 11:27:59 2017 UTC ()
gtk-doc: Depend on source-highlight for highlighting.

The current default of vim (if found) is broken, but the upstream patch to
fix it doesn't work in isolation, and updating to the latest release breaks
other things, so this is currently the least-worst option to unbreak other
packages like poppler-glib unfortunately.

Really this should be a package option and set explicitly rather than
relying on finding random binaries on the system.  Bump PKGREVISION.


(jperkin)
diff -r1.65 -r1.66 pkgsrc/textproc/gtk-doc/Makefile
cvs diff -r1.65 -r1.66 pkgsrc/textproc/gtk-doc/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/gtk-doc/Makefile 2017/11/08 14:29:50 1.65
+++ pkgsrc/textproc/gtk-doc/Makefile 2017/12/18 11:27:59 1.66
@@ -1,33 +1,35 @@ @@ -1,33 +1,35 @@
1# $NetBSD: Makefile,v 1.65 2017/11/08 14:29:50 wiz Exp $ 1# $NetBSD: Makefile,v 1.66 2017/12/18 11:27:59 jperkin Exp $
2 2
3DISTNAME= gtk-doc-1.26 3DISTNAME= gtk-doc-1.26
 4PKGREVISION= 1
4CATEGORIES= textproc gnome 5CATEGORIES= textproc gnome
5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk-doc/${PKGVERSION_NOREV}/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk-doc/${PKGVERSION_NOREV}/}
6EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.gtk.org/gtk-doc/ 10HOMEPAGE= https://www.gtk.org/gtk-doc/
10COMMENT= Tools for authors of the GTK+ reference documentation 11COMMENT= Tools for authors of the GTK+ reference documentation
11LICENSE= gnu-gpl-v3 AND gnu-fdl-v1.1 12LICENSE= gnu-gpl-v3 AND gnu-fdl-v1.1
12 13
13DEPENDS+= docbook-xml>=4.4nb1:../../textproc/docbook-xml 14DEPENDS+= docbook-xml>=4.4nb1:../../textproc/docbook-xml
14DEPENDS+= docbook-xsl>=1.68.1:../../textproc/docbook-xsl 15DEPENDS+= docbook-xsl>=1.68.1:../../textproc/docbook-xsl
15DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six 16DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
16BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool 17BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
17BUILD_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock 18BUILD_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
18 19
19GNU_CONFIGURE= YES 20GNU_CONFIGURE= YES
20PKGCONFIG_OVERRIDE= gtk-doc.pc.in 21PKGCONFIG_OVERRIDE= gtk-doc.pc.in
 22CONFIGURE_ARGS+= --with-highlight=source-highlight
21CONFIGURE_ARGS+= --with-xml-catalog=${XML_DEFAULT_CATALOG:Q} 23CONFIGURE_ARGS+= --with-xml-catalog=${XML_DEFAULT_CATALOG:Q}
22USE_TOOLS+= gmake pkg-config:run msgfmt 24USE_TOOLS+= gmake pkg-config:run msgfmt
23 25
24# one test failure that's not there with python-2.x as of 1.26 26# one test failure that's not there with python-2.x as of 1.26
25# https://bugzilla.gnome.org/show_bug.cgi?id=786174 27# https://bugzilla.gnome.org/show_bug.cgi?id=786174
26PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 28PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36
27 29
28SUBST_CLASSES+= fix-pc 30SUBST_CLASSES+= fix-pc
29SUBST_STAGE.fix-pc= pre-configure 31SUBST_STAGE.fix-pc= pre-configure
30SUBST_MESSAGE.fix-pc= Unwrapping pkg-config path in installed helper tools. 32SUBST_MESSAGE.fix-pc= Unwrapping pkg-config path in installed helper tools.
31SUBST_FILES.fix-pc+= gtkdoc-depscan.in 33SUBST_FILES.fix-pc+= gtkdoc-depscan.in
32SUBST_FILES.fix-pc+= gtkdoc/config.py.in 34SUBST_FILES.fix-pc+= gtkdoc/config.py.in
33SUBST_SED.fix-pc= -e 's,@PKG_CONFIG@,pkg-config,g' 35SUBST_SED.fix-pc= -e 's,@PKG_CONFIG@,pkg-config,g'
@@ -35,17 +37,18 @@ SUBST_SED.fix-pc= -e 's,@PKG_CONFIG@,pkg @@ -35,17 +37,18 @@ SUBST_SED.fix-pc= -e 's,@PKG_CONFIG@,pkg
35MAKE_JOBS_SAFE= no 37MAKE_JOBS_SAFE= no
36 38
37TEST_TARGET= check 39TEST_TARGET= check
38 40
39REPLACE_PYTHON= tests/check.py 41REPLACE_PYTHON= tests/check.py
40REPLACE_PYTHON+= tests/common.py 42REPLACE_PYTHON+= tests/common.py
41REPLACE_PYTHON+= tests/mk_to_db.py 43REPLACE_PYTHON+= tests/mk_to_db.py
42 44
43.include "../../lang/python/application.mk" 45.include "../../lang/python/application.mk"
44.include "../../textproc/gnome-doc-utils/buildlink3.mk" 46.include "../../textproc/gnome-doc-utils/buildlink3.mk"
45# needed together with pkg-config by gtkdoc-depscan at runtime 47# needed together with pkg-config by gtkdoc-depscan at runtime
46.include "../../devel/glib2/buildlink3.mk" 48.include "../../devel/glib2/buildlink3.mk"
47.include "../../textproc/libxslt/buildlink3.mk" 49.include "../../textproc/libxslt/buildlink3.mk"
 50.include "../../textproc/source-highlight/buildlink3.mk"
48.include "../../mk/omf-scrollkeeper.mk" 51.include "../../mk/omf-scrollkeeper.mk"
49.include "../../textproc/xmlcatmgr/catalogs.mk" 52.include "../../textproc/xmlcatmgr/catalogs.mk"
50.include "../../mk/bsd.pkg.mk" 53.include "../../mk/bsd.pkg.mk"
51TEST_ENV+= LC_ALL=en_US.UTF-8 54TEST_ENV+= LC_ALL=en_US.UTF-8