CVS commit: pkgsrc/textproc/gtk-doc

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Dec 18 11:27:59 UTC 2017

Modified Files:
        pkgsrc/textproc/gtk-doc: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 pkgsrc/textproc/gtk-doc/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/gtk-doc/Makefile
diff -u pkgsrc/textproc/gtk-doc/Makefile:1.65 pkgsrc/textproc/gtk-doc/Makefile:1.66
--- pkgsrc/textproc/gtk-doc/Makefile:1.65       Wed Nov  8 14:29:50 2017
+++ pkgsrc/textproc/gtk-doc/Makefile    Mon Dec 18 11:27:59 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2017/11/08 14:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2017/12/18 11:27:59 jperkin Exp $
 
 DISTNAME=      gtk-doc-1.26
+PKGREVISION=   1
 CATEGORIES=    textproc gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gtk-doc/${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=  .tar.xz
@@ -18,6 +19,7 @@ BUILD_DEPENDS+=       ${PYPKGPREFIX}-mock-[0-9
 
 GNU_CONFIGURE=         YES
 PKGCONFIG_OVERRIDE=    gtk-doc.pc.in
+CONFIGURE_ARGS+=       --with-highlight=source-highlight
 CONFIGURE_ARGS+=       --with-xml-catalog=${XML_DEFAULT_CATALOG:Q}
 USE_TOOLS+=            gmake pkg-config:run msgfmt
 
@@ -45,6 +47,7 @@ REPLACE_PYTHON+=      tests/mk_to_db.py
 # needed together with pkg-config by gtkdoc-depscan at runtime
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
+.include "../../textproc/source-highlight/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../mk/bsd.pkg.mk"