Index: head/x11/keybinder/Makefile
===================================================================
--- head/x11/keybinder/Makefile	(revision 448721)
+++ head/x11/keybinder/Makefile	(revision 448722)
@@ -1,52 +1,57 @@
 # $FreeBSD$
 
 PORTNAME=	keybinder
 PORTVERSION=	0.3.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	x11
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for registering keyboard shortcuts
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gtkdocize:textproc/gtk-doc
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	engla
 
 USES=		autoreconf gmake libtool pathfix pkgconfig
 USE_GNOME=	gtk20 introspection:build
 USE_XORG=	x11 xext xrender
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-gtk-doc
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=		EXAMPLES LUA PYTHON
+OPTIONS_DEFINE=	EXAMPLES GTKDOC LUA PYTHON
 OPTIONS_DEFAULT=	PYTHON
-OPTIONS_SUB=		yes
+OPTIONS_SUB=	yes
 
+GTKDOC_DESC=		Build API documentation (requires textproc/gtk-doc)
+GTKDOC_BUILD_DEPENDS=	gtkdocize:textproc/gtk-doc
+GTKDOC_CONFIGURE_ON=	--enable-gtk-doc
+
 # Override LUA description
 LUA_DESC=		Lua bindings
 LUA_USES=		lua:51
 LUA_CONFIGURE_ON=	--with-lua-includes=${LUA_INCDIR}
 LUA_CONFIGURE_OFF=	--disable-lua
+
 PYTHON_USES=		python:2
 PYTHON_USE=		gnome=pygtk2
 PYTHON_CONFIGURE_OFF=	--disable-python
 
-pre-configure:
+post-patch-GTKDOC-off:
+	@${REINPLACE_CMD} -E '/GTK_DOC_CHECK|docs/d' ${WRKSRC}/configure.ac
+	@${REINPLACE_CMD} -e '/^SUBDIRS/s, docs,,' ${WRKSRC}/Makefile.am
+
+pre-configure-GTKDOC-on:
 	@(cd ${CONFIGURE_WRKSRC} && ${LOCALBASE}/bin/gtkdocize)
 
 post-build-EXAMPLES-on:
 	@${REINPLACE_CMD} -i '' -e \
 		's|lua5.1|lua-${LUA_VER}|g' ${WRKSRC}/examples/Makefile
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	(cd ${WRKSRC}/examples && ${INSTALL_DATA} * \
-		${STAGEDIR}${EXAMPLESDIR})
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/x11/keybinder/pkg-descr
===================================================================
--- head/x11/keybinder/pkg-descr	(revision 448721)
+++ head/x11/keybinder/pkg-descr	(revision 448722)
@@ -1,11 +1,11 @@
 Keybinder is a library for registering global keyboard shortcuts.
 Keybinder works with GTK-based applications using the X Window System.
 
 The port provides the following:
 
   - A C library, libkeybinder
-  - Lua bindings, lua-keybinder
+  - Lua bindings, lua-keybinder (off by default)
   - Python bindings, python-keybinder
-  - An examples directory with programs in C, Lua, Python, and Vala
+  - Example programs in C, Lua, Python, and Vala
 
 WWW: https://github.com/engla/keybinder
Index: head/x11/keybinder/pkg-plist
===================================================================
--- head/x11/keybinder/pkg-plist	(revision 448721)
+++ head/x11/keybinder/pkg-plist	(revision 448722)
@@ -1,21 +1,37 @@
 include/keybinder.h
 lib/girepository-1.0/Keybinder-0.0.typelib
 lib/libkeybinder.so
 lib/libkeybinder.so.0
 lib/libkeybinder.so.0.1.0
 %%LUA%%%%LUA_MODLIBDIR%%/keybinder.so
 libdata/pkgconfig/keybinder.pc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/keybinder/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/keybinder/__init__.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/keybinder/__init__.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/keybinder/_keybinder.so
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.lua
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_gi.lua
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/keybinder.vapi
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lminigtk.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/main.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vexample.vala
 share/gir-1.0/Keybinder-0.0.gir
+%%GTKDOC%%share/gtk-doc/html/keybinder/annotation-glossary.html
+%%GTKDOC%%share/gtk-doc/html/keybinder/api-index-full.html
+%%GTKDOC%%share/gtk-doc/html/keybinder/ch01.html
+%%GTKDOC%%share/gtk-doc/html/keybinder/deprecated-api-index.html
+%%GTKDOC%%share/gtk-doc/html/keybinder/home.png
+%%GTKDOC%%share/gtk-doc/html/keybinder/index.html
+%%GTKDOC%%share/gtk-doc/html/keybinder/keybinder-keybinder.html
+%%GTKDOC%%share/gtk-doc/html/keybinder/keybinder.devhelp2
+%%GTKDOC%%share/gtk-doc/html/keybinder/left-insensitive.png
+%%GTKDOC%%share/gtk-doc/html/keybinder/left.png
+%%GTKDOC%%share/gtk-doc/html/keybinder/object-tree.html
+%%GTKDOC%%share/gtk-doc/html/keybinder/right-insensitive.png
+%%GTKDOC%%share/gtk-doc/html/keybinder/right.png
+%%GTKDOC%%share/gtk-doc/html/keybinder/style.css
+%%GTKDOC%%share/gtk-doc/html/keybinder/up-insensitive.png
+%%GTKDOC%%share/gtk-doc/html/keybinder/up.png