poppler-glib: do not fight gtk-doc. Just disable it.

Latest version broke the build.

Bump PKGREVISION.

2 files changed, 6 insertions, 43 deletions

diff --git a/print/poppler-glib/Makefile b/print/poppler-glib/Makefile
index 3a67b0a9054..24cbbc0968e 100644
--- a/print/poppler-glib/Makefile
+++ b/print/poppler-glib/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.68 2018/01/10 21:56:50 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2018/01/12 23:44:05 wiz Exp $
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=	poppler-glib-${POPPLER_VERS}
+PKGREVISION=	1
 
 COMMENT=	PDF rendering library (GLib wrapper)
 MAINTAINER=	reed@reedmedia.net
@@ -21,8 +22,8 @@ CMAKE_ARGS+=	-DENABLE_SPLASH=OFF
 CMAKE_ARGS+=	-DBUILD_GTK_TESTS=OFF
 # Compile GLib wrapper which also needs gtk2
 CMAKE_ARGS+=	-DENABLE_GLIB=ON
-# Generate glib API documentation.
-CMAKE_ARGS+=	-DENABLE_GTK_DOC=ON
+# Do not generate glib API documentation.
+CMAKE_ARGS+=	-DENABLE_GTK_DOC=OFF
 # Don't build and install the tools
 CMAKE_ARGS+=	-DENABLE_UTILS=OFF
 # Don't compile poppler cpp wrapper.
@@ -53,7 +54,7 @@ post-install:
 .include "../../lang/python/tool.mk"
 BUILDLINK_ABI_DEPENDS.glib2+=	glib2>=2.41.0
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../textproc/gtk-doc/buildlink3.mk"
+#.include "../../textproc/gtk-doc/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/print/poppler-glib/PLIST b/print/poppler-glib/PLIST
index 6ab5b288b60..86ebc94e60a 100644
--- a/print/poppler-glib/PLIST
+++ b/print/poppler-glib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2017/12/08 07:48:12 spz Exp $
+@comment $NetBSD: PLIST,v 1.23 2018/01/12 23:44:05 wiz Exp $
 include/poppler/glib/poppler-action.h
 include/poppler/glib/poppler-annot.h
 include/poppler/glib/poppler-attachment.h
@@ -18,41 +18,3 @@ lib/libpoppler-glib.so.8
 lib/libpoppler-glib.so.8.9.0
 lib/pkgconfig/poppler-cairo.pc
 lib/pkgconfig/poppler-glib.pc
-share/gtk-doc/html/poppler/PopplerAction.html
-share/gtk-doc/html/poppler/PopplerAnnot.html
-share/gtk-doc/html/poppler/PopplerAttachment.html
-share/gtk-doc/html/poppler/PopplerColor.html
-share/gtk-doc/html/poppler/PopplerDocument.html
-share/gtk-doc/html/poppler/PopplerFormField.html
-share/gtk-doc/html/poppler/PopplerLayer.html
-share/gtk-doc/html/poppler/PopplerMedia.html
-share/gtk-doc/html/poppler/PopplerMovie.html
-share/gtk-doc/html/poppler/PopplerPage.html
-share/gtk-doc/html/poppler/PopplerStructureElement.html
-share/gtk-doc/html/poppler/annotation-glossary.html
-share/gtk-doc/html/poppler/api-index-0-12.html
-share/gtk-doc/html/poppler/api-index-0-14.html
-share/gtk-doc/html/poppler/api-index-0-16.html
-share/gtk-doc/html/poppler/api-index-0-18.html
-share/gtk-doc/html/poppler/api-index-0-20.html
-share/gtk-doc/html/poppler/api-index-0-22.html
-share/gtk-doc/html/poppler/api-index-0-26.html
-share/gtk-doc/html/poppler/api-index-0-33.html
-share/gtk-doc/html/poppler/api-index-0-46.html
-share/gtk-doc/html/poppler/api-index-deprecated.html
-share/gtk-doc/html/poppler/api-index-full.html
-share/gtk-doc/html/poppler/ch01.html
-share/gtk-doc/html/poppler/home.png
-share/gtk-doc/html/poppler/index.html
-share/gtk-doc/html/poppler/left-insensitive.png
-share/gtk-doc/html/poppler/left.png
-share/gtk-doc/html/poppler/poppler-Error-handling.html
-share/gtk-doc/html/poppler/poppler-PDF-Utility-functions.html
-share/gtk-doc/html/poppler/poppler-Version-and-Features-Information.html
-share/gtk-doc/html/poppler/poppler-poppler-features.html
-share/gtk-doc/html/poppler/poppler.devhelp2
-share/gtk-doc/html/poppler/right-insensitive.png
-share/gtk-doc/html/poppler/right.png
-share/gtk-doc/html/poppler/style.css
-share/gtk-doc/html/poppler/up-insensitive.png
-share/gtk-doc/html/poppler/up.png