[Midnightbsd-cvs] mports [20315] trunk/textproc/ibus/Makefile: fix depends

[laffer1 at midnightbsd.org]

Revision: 20315
          http://svnweb.midnightbsd.org/mports/?rev=20315
Author:   laffer1
Date:     2015-09-27 14:41:45 -0400 (Sun, 27 Sep 2015)
Log Message:
-----------
fix depends

Modified Paths:
--------------
    trunk/textproc/ibus/Makefile

Modified: trunk/textproc/ibus/Makefile
===================================================================
--- trunk/textproc/ibus/Makefile	2015-09-27 18:40:58 UTC (rev 20314)
+++ trunk/textproc/ibus/Makefile	2015-09-27 18:41:45 UTC (rev 20315)
@@ -3,6 +3,7 @@
 
 PORTNAME=	ibus
 PORTVERSION=	1.5.9
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/ \
 		http://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/
@@ -13,30 +14,31 @@
 LICENSE=	lgpl2.1
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:${PORTSDIR}/devel/py-dbus
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:${PORTSDIR}/devel/py-dbus \
+		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:${PORTSDIR}/devel/py-dbus \
 		${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:${PORTSDIR}/devel/py-notify \
 		${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \
+		${LOCALBASE}/share/xml/iso-codes/iso_639.xml:${PORTSDIR}/misc/iso-codes \
 		setxkbmap:${PORTSDIR}/x11/setxkbmap
 LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
 USES=		compiler cpe gmake libtool pathfix pkgconfig python
-USE_GNOME=	glib20 librsvg2 pygobject3
+USE_GNOME=	glib20 intltool librsvg2 pygobject3
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 OPTIONS_SUB=	yes
 INSTALL_TARGET=	install-strip
-CONFIGURE_ARGS=	--disable-tests
+CONFIGURE_ARGS=	--disable-tests --with-html-dir=${PREFIX}/share/doc
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	ISOCODES NLS GTK2 GTK3 VALA GINTRO PYTHON_LIB DOCS XIM ENGINE
+OPTIONS_DEFINE=	NLS GTK2 GTK3 VALA GINTRO PYTHON_LIB DOCS XIM ENGINE
 OPTIONS_RADIO=	CONFIG
 OPTIONS_RADIO_CONFIG=	GCONF DCONF
-OPTIONS_DEFAULT=	ISOCODES NLS GTK2 GTK3 VALA GINTRO PYTHON_LIB DCONF XIM ENGINE
+OPTIONS_DEFAULT=	NLS GTK2 GTK3 VALA GINTRO PYTHON_LIB DCONF XIM ENGINE
 
-ISOCODES_DESC=	Use isocodecs
 GTK2_DESC=	Install GTK2 client
 GTK3_DESC=	Install GTK3 client and panel
 VALA_DESC=	Install vala binding
@@ -48,19 +50,17 @@
 ENGINE_DESC=	Install ibus simple engine
 CPE_VENDOR=	ibus_project
 
-ISOCODES_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-ISOCODES_RUN_DEPENDS=	${LOCALBASE}/share/xml/iso-codes/iso_639.xml:${PORTSDIR}/misc/iso-codes
-ISOCODES_CONFIGURE_OFF=	--disable-iso-codes-check
-
 NLS_USES=		gettext
-NLS_CONFIGURE_WITH=	nls
+NLS_USES_OFF=		gettext-tools
+NLS_CONFIGURE_ENABLE=	nls
 
 GTK2_USE=		GNOME=gtk20
 GTK2_CONFIGURE_ENABLE=	gtk2
 
-GTK3_USE=		GNOME=gtk30
+GTK3_USE=		GNOME=gtk30 XORG=x11
 GTK3_CONFIGURE_ENABLE=	gtk3 libnotify
 GTK3_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+GTK3_LIBS=		-lX11
 
 VALA_BUILD_DEPENDS=	vala>=0.20:${PORTSDIR}/lang/vala
 VALA_CONFIGURE_ENABLE=	vala
@@ -80,12 +80,17 @@
 DCONF_CONFIGURE_ENABLE=	dconf
 
 DOCS_CONFIGURE_ENABLE=	gtk-doc-html
-DOCS_CONFIGURE_ON=	--with-html-dir=${PREFIX}/share/doc
 
 XIM_CONFIGURE_ENABLE=	xim
 
 ENGINE_CONFIGURE_ENABLE=	engine
 
+.include <bsd.mport.options.mk>
+
+.if empty(PORT_OPTIONS:MGINTRO) && !empty(PORT_OPTIONS:MVALA)
+BROKEN=		Vala bindings require GObject Introspection
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 46