Improve doc handling, from Niclas Rosenvik in PR 48454.

Really fixes packaging when doxygen already is installed.

No change by default, so no PKGREVISION++.

3 files changed, 108 insertions, 3 deletions

diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
index a432be0be29..caadef16305 100644
--- a/x11/libxkbcommon/Makefile
+++ b/x11/libxkbcommon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/12/13 23:14:47 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2013/12/18 18:51:03 wiz Exp $
 
 DISTNAME=	libxkbcommon-0.3.2
 PKGREVISION=	1
@@ -18,6 +18,6 @@ USE_LIBTOOL=	yes
 PKGCONFIG_OVERRIDE+=	xkbcommon.pc.in
 
 CONFIGURE_ARGS+=	--with-xkb-config-root=${X11BASE}/lib/X11/xkb
-CONFIGURE_ARGS+=	--disable-doxygen
 
+.include "options.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/libxkbcommon/PLIST b/x11/libxkbcommon/PLIST
index e69e6e6948f..4396952a014 100644
--- a/x11/libxkbcommon/PLIST
+++ b/x11/libxkbcommon/PLIST
@@ -1,7 +1,96 @@
-@comment $NetBSD: PLIST,v 1.2 2013/12/13 23:14:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/12/18 18:51:03 wiz Exp $
 include/xkbcommon/xkbcommon-compat.h
 include/xkbcommon/xkbcommon-keysyms.h
 include/xkbcommon/xkbcommon-names.h
 include/xkbcommon/xkbcommon.h
 lib/libxkbcommon.la
 lib/pkgconfig/xkbcommon.pc
+${PLIST.doc}share/doc/libxkbcommon/annotated.html
+${PLIST.doc}share/doc/libxkbcommon/annotated.js
+${PLIST.doc}share/doc/libxkbcommon/bc_s.png
+${PLIST.doc}share/doc/libxkbcommon/bdwn.png
+${PLIST.doc}share/doc/libxkbcommon/classes.html
+${PLIST.doc}share/doc/libxkbcommon/closed.png
+${PLIST.doc}share/doc/libxkbcommon/dir_000000.html
+${PLIST.doc}share/doc/libxkbcommon/dir_000000.js
+${PLIST.doc}share/doc/libxkbcommon/doxygen.css
+${PLIST.doc}share/doc/libxkbcommon/doxygen.png
+${PLIST.doc}share/doc/libxkbcommon/dynsections.js
+${PLIST.doc}share/doc/libxkbcommon/files.html
+${PLIST.doc}share/doc/libxkbcommon/files.js
+${PLIST.doc}share/doc/libxkbcommon/ftv2blank.png
+${PLIST.doc}share/doc/libxkbcommon/ftv2cl.png
+${PLIST.doc}share/doc/libxkbcommon/ftv2doc.png
+${PLIST.doc}share/doc/libxkbcommon/ftv2folderclosed.png
+${PLIST.doc}share/doc/libxkbcommon/ftv2folderopen.png
+${PLIST.doc}share/doc/libxkbcommon/ftv2lastnode.png
+${PLIST.doc}share/doc/libxkbcommon/ftv2link.png
+${PLIST.doc}share/doc/libxkbcommon/ftv2mlastnode.png
+${PLIST.doc}share/doc/libxkbcommon/ftv2mnode.png
+${PLIST.doc}share/doc/libxkbcommon/ftv2mo.png
+${PLIST.doc}share/doc/libxkbcommon/ftv2node.png
+${PLIST.doc}share/doc/libxkbcommon/ftv2ns.png
+${PLIST.doc}share/doc/libxkbcommon/ftv2plastnode.png
+${PLIST.doc}share/doc/libxkbcommon/ftv2pnode.png
+${PLIST.doc}share/doc/libxkbcommon/ftv2splitbar.png
+${PLIST.doc}share/doc/libxkbcommon/ftv2vertline.png
+${PLIST.doc}share/doc/libxkbcommon/functions.html
+${PLIST.doc}share/doc/libxkbcommon/functions_func.html
+${PLIST.doc}share/doc/libxkbcommon/functions_type.html
+${PLIST.doc}share/doc/libxkbcommon/functions_vars.html
+${PLIST.doc}share/doc/libxkbcommon/globals.html
+${PLIST.doc}share/doc/libxkbcommon/globals_defs.html
+${PLIST.doc}share/doc/libxkbcommon/globals_enum.html
+${PLIST.doc}share/doc/libxkbcommon/globals_eval.html
+${PLIST.doc}share/doc/libxkbcommon/globals_func.html
+${PLIST.doc}share/doc/libxkbcommon/globals_type.html
+${PLIST.doc}share/doc/libxkbcommon/group__components.html
+${PLIST.doc}share/doc/libxkbcommon/group__components.js
+${PLIST.doc}share/doc/libxkbcommon/group__context.html
+${PLIST.doc}share/doc/libxkbcommon/group__context.js
+${PLIST.doc}share/doc/libxkbcommon/group__include-path.html
+${PLIST.doc}share/doc/libxkbcommon/group__include-path.js
+${PLIST.doc}share/doc/libxkbcommon/group__keymap.html
+${PLIST.doc}share/doc/libxkbcommon/group__keymap.js
+${PLIST.doc}share/doc/libxkbcommon/group__keysyms.html
+${PLIST.doc}share/doc/libxkbcommon/group__keysyms.js
+${PLIST.doc}share/doc/libxkbcommon/group__logging.html
+${PLIST.doc}share/doc/libxkbcommon/group__logging.js
+${PLIST.doc}share/doc/libxkbcommon/group__state.html
+${PLIST.doc}share/doc/libxkbcommon/group__state.js
+${PLIST.doc}share/doc/libxkbcommon/index.html
+${PLIST.doc}share/doc/libxkbcommon/jquery.js
+${PLIST.doc}share/doc/libxkbcommon/modules.html
+${PLIST.doc}share/doc/libxkbcommon/modules.js
+${PLIST.doc}share/doc/libxkbcommon/nav_f.png
+${PLIST.doc}share/doc/libxkbcommon/nav_g.png
+${PLIST.doc}share/doc/libxkbcommon/nav_h.png
+${PLIST.doc}share/doc/libxkbcommon/navtree.css
+${PLIST.doc}share/doc/libxkbcommon/navtree.js
+${PLIST.doc}share/doc/libxkbcommon/navtreeindex0.js
+${PLIST.doc}share/doc/libxkbcommon/navtreeindex1.js
+${PLIST.doc}share/doc/libxkbcommon/open.png
+${PLIST.doc}share/doc/libxkbcommon/resize.js
+${PLIST.doc}share/doc/libxkbcommon/structxkb__context.html
+${PLIST.doc}share/doc/libxkbcommon/structxkb__context.js
+${PLIST.doc}share/doc/libxkbcommon/structxkb__keymap.html
+${PLIST.doc}share/doc/libxkbcommon/structxkb__keymap.js
+${PLIST.doc}share/doc/libxkbcommon/structxkb__rule__names.html
+${PLIST.doc}share/doc/libxkbcommon/structxkb__rule__names.js
+${PLIST.doc}share/doc/libxkbcommon/structxkb__state.html
+${PLIST.doc}share/doc/libxkbcommon/structxkb__state.js
+${PLIST.doc}share/doc/libxkbcommon/sync_off.png
+${PLIST.doc}share/doc/libxkbcommon/sync_on.png
+${PLIST.doc}share/doc/libxkbcommon/tab_a.png
+${PLIST.doc}share/doc/libxkbcommon/tab_b.png
+${PLIST.doc}share/doc/libxkbcommon/tab_h.png
+${PLIST.doc}share/doc/libxkbcommon/tab_s.png
+${PLIST.doc}share/doc/libxkbcommon/tabs.css
+${PLIST.doc}share/doc/libxkbcommon/xkbcommon-compat_8h_source.html
+${PLIST.doc}share/doc/libxkbcommon/xkbcommon-keysyms_8h_source.html
+${PLIST.doc}share/doc/libxkbcommon/xkbcommon-names_8h.html
+${PLIST.doc}share/doc/libxkbcommon/xkbcommon-names_8h.js
+${PLIST.doc}share/doc/libxkbcommon/xkbcommon-names_8h_source.html
+${PLIST.doc}share/doc/libxkbcommon/xkbcommon_8h.html
+${PLIST.doc}share/doc/libxkbcommon/xkbcommon_8h.js
+${PLIST.doc}share/doc/libxkbcommon/xkbcommon_8h_source.html
diff --git a/x11/libxkbcommon/options.mk b/x11/libxkbcommon/options.mk
new file mode 100644
index 00000000000..ac5d01e6998
--- /dev/null
+++ b/x11/libxkbcommon/options.mk
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2013/12/18 18:51:03 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.libxkbcommon
+PKG_SUPPORTED_OPTIONS=	doc
+
+PLIST_VARS+=		doc
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdoc)
+BUILD_DEPENDS+= 	doxygen-[0-9]*:../../devel/doxygen
+PLIST.doc=		yes
+CONFIGURE_ARGS+= 	--enable-docs=yes
+.else
+CONFIGURE_ARGS+= 	--enable-docs=no
+.endif