- Update to 0.3.0

Approved by:	rene, miwi (mentors, implicit)

3 files changed, 54 insertions, 12 deletions

diff --git a/x11/keybinder/Makefile b/x11/keybinder/Makefile
index 59215af54e4e..ee872e93cbbe 100644
--- a/x11/keybinder/Makefile
+++ b/x11/keybinder/Makefile
@@ -2,24 +2,24 @@
 #
 
 PORTNAME=	keybinder
-PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTVERSION=	0.3.0
 CATEGORIES=	x11
 MASTER_SITES=	http://kaizer.se/publicfiles/${PORTNAME}/
 
 MAINTAINER=	olivierd@FreeBSD.org
 COMMENT=	Library for registering keyboard shortcuts
 
+BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gtk20
+USE_XORG=	x11 xext xrender
 USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 
-PORTEXAMPLES=	*
-
 OPTIONS_DEFINE=	PYTHON LUA
 OPTIONS_DEFAULT=	PYTHON
 
@@ -30,7 +30,7 @@ LUA_DESC=	Lua bindings
 
 .if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	yes
-USE_GNOME+=	pygtk2 pygobject
+USE_GNOME+=	pygtk2
 PLIST_SUB+=	PYTHON=""
 .else
 CONFIGURE_ARGS+=	--disable-python
@@ -46,11 +46,22 @@ CONFIGURE_ARGS+=	--disable-lua
 PLIST_SUB+=	LUA="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MDOCS}
+BUILD_DEPENDS+=	gtkdoc-check:${PORTSDIR}/textproc/gtk-doc
+CONFIGURE_ARGS+=--enable-gtk-doc \
+	--with-html-dir=${PREFIX}/share/gtk-doc/html
+PLIST_SUB+=	DOCS=""
+.else
+CONFIGURE_ARGS+=--disable-gtk-doc-html \
+	--without-html-dir
+PLIST_SUB+=	DOCS="@comment "
+.endif
+
 post-install:
-.if !defined(NOPORTEXAMPLES)
-	@${REINPLACE_CMD} -i '' -e 's,lua5,lua-5,' ${WRKSRC}/examples/Makefile
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${REINPLACE_CMD} -i '' -e 's|lua5.1|lua-5.1|g' ${WRKSRC}/examples/Makefile
 	@${MKDIR} ${EXAMPLESDIR}
-	${CP} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/keybinder/distinfo b/x11/keybinder/distinfo
index f76a5d4a415e..51509718e127 100644
--- a/x11/keybinder/distinfo
+++ b/x11/keybinder/distinfo
@@ -1,2 +1,2 @@
-SHA256 (keybinder-0.2.2.tar.gz) = 152846803f43bf5ad303809b15479fa5f2bc7a0c6e6e31353686c1429b81b363
-SIZE (keybinder-0.2.2.tar.gz) = 324264
+SHA256 (keybinder-0.3.0.tar.gz) = 42863ca0174d568a8c02c6fb243fee1681823825e8bcb1718c51611d8e9793bb
+SIZE (keybinder-0.3.0.tar.gz) = 377765
diff --git a/x11/keybinder/pkg-plist b/x11/keybinder/pkg-plist
index 1363d3a1d972..1dcc5ebe93fb 100644
--- a/x11/keybinder/pkg-plist
+++ b/x11/keybinder/pkg-plist
@@ -1,7 +1,8 @@
 include/keybinder.h
+lib/girepository-1.0/Keybinder-0.0.typelib
 lib/libkeybinder.la
 lib/libkeybinder.so
-lib/libkeybinder.so.0
+lib/libkeybinder.so.1
 %%LUA%%%%LUA_MODLIBDIR%%/keybinder.la
 %%LUA%%%%LUA_MODLIBDIR%%/keybinder.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/keybinder/__init__.py
@@ -9,5 +10,35 @@ lib/libkeybinder.so.0
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/keybinder/__init__.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/keybinder/_keybinder.la
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/keybinder/_keybinder.so
-%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/keybinder
 libdata/pkgconfig/keybinder.pc
+%%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
+%%DOCS%%share/gtk-doc/html/keybinder/annotation-glossary.html
+%%DOCS%%share/gtk-doc/html/keybinder/api-index-full.html
+%%DOCS%%share/gtk-doc/html/keybinder/ch01.html
+%%DOCS%%share/gtk-doc/html/keybinder/deprecated-api-index.html
+%%DOCS%%share/gtk-doc/html/keybinder/home.png
+%%DOCS%%share/gtk-doc/html/keybinder/index.html
+%%DOCS%%share/gtk-doc/html/keybinder/index.sgml
+%%DOCS%%share/gtk-doc/html/keybinder/keybinder-keybinder.html
+%%DOCS%%share/gtk-doc/html/keybinder/keybinder.devhelp2
+%%DOCS%%share/gtk-doc/html/keybinder/left.png
+%%DOCS%%share/gtk-doc/html/keybinder/object-tree.html
+%%DOCS%%share/gtk-doc/html/keybinder/right.png
+%%DOCS%%share/gtk-doc/html/keybinder/style.css
+%%DOCS%%share/gtk-doc/html/keybinder/up.png
+%%DOCS%%@dirrm share/gtk-doc/html/keybinder
+%%DOCS%%@dirrmtry share/gtk-doc/html
+%%DOCS%%@dirrmtry share/gtk-doc
+@dirrmtry share/gir-1.0
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/keybinder
+@dirrmtry lib/girepository-1.0