3 files changed, 19 insertions, 25 deletions

diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 677e6c4c264e..e16ec4e25427 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -1,10 +1,10 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/x11/libxklavier/Makefile,v 1.53 2010/01/12 02:18:34 avl Exp $
+#   $MCom: ports/trunk/x11/libxklavier/Makefile 19813 2014-08-15 19:44:33Z gusi $
 
 PORTNAME=	libxklavier
-PORTVERSION=	5.0
-PORTREVISION=	3
+PORTVERSION=	5.2.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
@@ -12,29 +12,25 @@ MASTER_SITES=	GNOME
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Utility library to make XKB stuff easier
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+BUILD_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes
 RUN_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp \
-    		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+    		iso-codes>=0:${PORTSDIR}/misc/iso-codes
 
-USES=		gmake libtool:keepla pathfix pkgconfig tar:bzip2
-USE_XORG=	x11 xi xkbfile
-USE_GNOME=	libxml2 glib20
+USE_XORG=	x11 xkbfile
+USES=		gmake libtool pathfix pkgconfig tar:xz
+USE_GNOME=	libxml2 glib20 introspection:build
 USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
-CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-doxygen \
-		--with-xkb-base=${LOCALBASE}/share/X11/xkb \
+CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ARGS=	--with-xkb-base=${LOCALBASE}/share/X11/xkb \
 		--with-xkb-bin-base=${LOCALBASE}/bin \
 		--with-xmodmap-base=${LOCALBASE}/share/xmodmap \
 		--disable-gtk-doc \
 		--with-html-dir=${GNOME_HTML_DIR}
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|== "yes|= "yes|g' \
-		${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index a9860237bf5b..9ef4108962b1 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libxklavier-5.0.tar.bz2) = dfd94b17a752b2839281764f0a16af2b338024c8867c10fba7015f276dec4db0
-SIZE (libxklavier-5.0.tar.bz2) = 357862
+SHA256 (libxklavier-5.2.1.tar.xz) = a7a1ca8ae493fb652e3456a6b3a0b07514447161aab41feed96b968f2d338b5e
+SIZE (libxklavier-5.2.1.tar.xz) = 312944
diff --git a/x11/libxklavier/pkg-plist b/x11/libxklavier/pkg-plist
index 0bb6fc2dbc6f..246b6c1afb5c 100644
--- a/x11/libxklavier/pkg-plist
+++ b/x11/libxklavier/pkg-plist
@@ -1,31 +1,29 @@
+include/libxklavier/xkl-enum-types.h
 include/libxklavier/xkl_config_item.h
 include/libxklavier/xkl_config_rec.h
 include/libxklavier/xkl_config_registry.h
 include/libxklavier/xkl_engine.h
 include/libxklavier/xkl_engine_marshal.h
-include/libxklavier/xkl-enum-types.h
 include/libxklavier/xklavier.h
+lib/girepository-1.0/Xkl-1.0.typelib
 lib/libxklavier.a
-lib/libxklavier.la
 lib/libxklavier.so
 lib/libxklavier.so.16
-lib/libxklavier.so.16.0.0
+lib/libxklavier.so.16.2.0
 libdata/pkgconfig/libxklavier.pc
 %%DOCSDIR%%/XklConfigItem.html
 %%DOCSDIR%%/XklConfigRec.html
 %%DOCSDIR%%/XklConfigRegistry.html
-%%DOCSDIR%%/XklEngine.html
 %%DOCSDIR%%/ch01.html
 %%DOCSDIR%%/ch02.html
 %%DOCSDIR%%/home.png
 %%DOCSDIR%%/index.html
 %%DOCSDIR%%/index.sgml
 %%DOCSDIR%%/left.png
+%%DOCSDIR%%/libxklavier-xkl-engine.html
 %%DOCSDIR%%/libxklavier-xklavier.html
-%%DOCSDIR%%/libxklavier.devhelp
 %%DOCSDIR%%/libxklavier.devhelp2
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
-@dirrm %%DOCSDIR%%
-@dirrm include/libxklavier
+share/gir-1.0/Xkl-1.0.gir