4 files changed, 58 insertions, 12 deletions

diff --git a/deskutils/xneur/Makefile b/deskutils/xneur/Makefile
index fc03f5ec88ef..103927a4992a 100644
--- a/deskutils/xneur/Makefile
+++ b/deskutils/xneur/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	xneur
-PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTVERSION=	0.6.1
 CATEGORIES=	russian
-MASTER_SITES=	http://dists.xneur.ru/release-0.5.0/tgz/ CENKES
+MASTER_SITES=	http://dists.xneur.ru/release-0.6.1/tgz/ CENKES
 
 MAINTAINER=	admin@lissyara.su
 COMMENT=	Auto keyboard switcher
@@ -21,10 +20,11 @@ CONFIGURE_ARGS=	--disable-static
 USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
+MAKE_ARGS=	pkgconfigdir=${PREFIX}/libdata/pkgconfig
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^am__strip_dir/s#`;#|sed -Ee \
-		"s/^(dict.dist|proto|proto3|langdef|regexp|xneurrc|xneurrc-be|xneurrc-uk|dict)$$$$/\\1.dist/"`;#' \
+		"s/^(dict.dist|proto|proto3|langdef|regexp|xneurrc|xneurrc-be|xneurrc-uk|xneurrc-fr|xneurrc-ro|dict)$$$$/\\1.dist/"`;#' \
 		${WRKSRC}/etc/Makefile.in ${WRKSRC}/etc/*/Makefile.in
 
 post-install:
diff --git a/deskutils/xneur/distinfo b/deskutils/xneur/distinfo
index cfa9c298d255..cf7ae742e2f2 100644
--- a/deskutils/xneur/distinfo
+++ b/deskutils/xneur/distinfo
@@ -1,3 +1,3 @@
-MD5 (xneur-0.5.0.tar.bz2) = 5aa08a963f6c1edd082f98ce609cb32e
-SHA256 (xneur-0.5.0.tar.bz2) = 8e5e893102f8a3a74ee2979e86309815a253a1bf413f5e69889b596c3f2a3d0b
-SIZE (xneur-0.5.0.tar.bz2) = 381309
+MD5 (xneur-0.6.1.tar.bz2) = a0fc92a5ab32df22219005a22a4aba9b
+SHA256 (xneur-0.6.1.tar.bz2) = 36f8bb25d49930283c5731ae7e6265dd3e24baf5f0ebebffcb53273809f1bc60
+SIZE (xneur-0.6.1.tar.bz2) = 392429
diff --git a/deskutils/xneur/pkg-descr b/deskutils/xneur/pkg-descr
index db7b76bed90a..451c4e72e697 100644
--- a/deskutils/xneur/pkg-descr
+++ b/deskutils/xneur/pkg-descr
@@ -1,3 +1,10 @@
-XNeur - backend for gXNeur - automatic keyboard switcher
+In-place converter of text typed in with a wrong keyboard layout. When users
+work in multilingual environment (e.g. Russian+English), they sometimes type
+in text with wrong keyboard layout. In auto mode XNeur can automatically
+detect language of a word user typed, switch keyboard layout and convert the
+word from one keyboard layout into another. In manual mode user has ability
+to convert last typed word or some selected text using hot keys. The idea of
+this utility is similar to Punto Switcher for Windows. For now XNeur support
+English, Russian, Ukrainian, Belarusian, French and Romanian.
 
-WWW: http://www.xneur.ru/
+WWW: http://xneur.ru/
diff --git a/deskutils/xneur/pkg-plist b/deskutils/xneur/pkg-plist
index d49c74d08400..071ba099c141 100644
--- a/deskutils/xneur/pkg-plist
+++ b/deskutils/xneur/pkg-plist
@@ -29,6 +29,34 @@ etc/xneur/ru/proto3.dist
 @unexec if cmp -s %D/etc/xneur/ru/regexp %D/etc/xneur/ru/regexp.dist; then rm -f %D/etc/xneur/ru/regexp; fi
 etc/xneur/ru/regexp.dist
 @exec   if [ ! -f %D/etc/xneur/ru/regexp ] ; then cp -p %D/%F %B/regexp; fi
+@unexec if cmp -s %D/etc/xneur/fr/dict %D/etc/xneur/fr/dict.dist; then rm -f %D/etc/xneur/fr/dict; fi
+etc/xneur/fr/dict.dist
+@exec   if [ ! -f %D/etc/xneur/fr/dict ] ; then cp -p %D/%F %B/dict; fi
+@unexec if cmp -s %D/etc/xneur/fr/langdef %D/etc/xneur/fr/langdef.dist; then rm -f %D/etc/xneur/fr/langdef; fi
+etc/xneur/fr/langdef.dist
+@exec   if [ ! -f %D/etc/xneur/fr/langdef ] ; then cp -p %D/%F %B/langdef; fi
+@unexec if cmp -s %D/etc/xneur/fr/proto %D/etc/xneur/fr/proto.dist; then rm -f %D/etc/xneur/fr/proto; fi
+etc/xneur/fr/proto.dist
+@exec   if [ ! -f %D/etc/xneur/fr/proto ] ; then cp -p %D/%F %B/proto; fi
+@unexec if cmp -s %D/etc/xneur/fr/proto3 %D/etc/xneur/fr/proto3.dist; then rm -f %D/etc/xneur/fr/proto3; fi
+etc/xneur/fr/proto3.dist
+@exec   if [ ! -f %D/etc/xneur/fr/proto3 ] ; then cp -p %D/%F %B/proto3; fi
+@unexec if cmp -s %D/etc/xneur/fr/regexp %D/etc/xneur/fr/regexp.dist; then rm -f %D/etc/xneur/fr/regexp; fi
+etc/xneur/fr/regexp.dist
+@unexec if cmp -s %D/etc/xneur/ro/dict %D/etc/xneur/ro/dict.dist; then rm -f %D/etc/xneur/ro/dict; fi
+etc/xneur/ro/dict.dist
+@exec   if [ ! -f %D/etc/xneur/ro/dict ] ; then cp -p %D/%F %B/dict; fi
+@unexec if cmp -s %D/etc/xneur/ro/langdef %D/etc/xneur/ro/langdef.dist; then rm -f %D/etc/xneur/ro/langdef; fi
+etc/xneur/ro/langdef.dist
+@exec   if [ ! -f %D/etc/xneur/ro/langdef ] ; then cp -p %D/%F %B/langdef; fi
+@unexec if cmp -s %D/etc/xneur/ro/proto %D/etc/xneur/ro/proto.dist; then rm -f %D/etc/xneur/ro/proto; fi
+etc/xneur/ro/proto.dist
+@exec   if [ ! -f %D/etc/xneur/ro/proto ] ; then cp -p %D/%F %B/proto; fi
+@unexec if cmp -s %D/etc/xneur/ro/proto3 %D/etc/xneur/ro/proto3.dist; then rm -f %D/etc/xneur/ro/proto3; fi
+etc/xneur/ro/proto3.dist
+@exec   if [ ! -f %D/etc/xneur/ro/proto3 ] ; then cp -p %D/%F %B/proto3; fi
+@unexec if cmp -s %D/etc/xneur/ro/regexp %D/etc/xneur/ro/regexp.dist; then rm -f %D/etc/xneur/ro/regexp; fi
+etc/xneur/ro/regexp.dist
 @unexec if cmp -s %D/etc/xneur/uk/dict %D/etc/xneur/uk/dict.dist; then rm -f %D/etc/xneur/uk/dict; fi
 etc/xneur/uk/dict.dist
 @exec   if [ ! -f %D/etc/xneur/uk/dict ] ; then cp -p %D/%F %B/dict; fi
@@ -68,13 +96,24 @@ etc/xneur/xneurrc-be.dist
 @unexec if cmp -s %D/etc/xneur/xneurrc-uk %D/etc/xneur/xneurrc-uk.dist; then rm -f %D/etc/xneur/xneurrc-uk; fi
 etc/xneur/xneurrc-uk.dist
 @exec   if [ ! -f %D/etc/xneur/xneurrc-uk ] ; then cp -p %D/%F %B/xneurrc-uk; fi
+@unexec if cmp -s %D/etc/xneur/xneurrc-ro %D/etc/xneur/xneurrc-ro.dist; then rm -f %D/etc/xneur/xneurrc-ro; fi
+etc/xneur/xneurrc-ro.dist
+@exec   if [ ! -f %D/etc/xneur/xneurrc-ro ] ; then cp -p %D/%F %B/xneurrc-ro; fi
+@unexec if cmp -s %D/etc/xneur/xneurrc-fr %D/etc/xneur/xneurrc-fr.dist; then rm -f %D/etc/xneur/xneurrc-fr; fi
+etc/xneur/xneurrc-fr.dist
+@exec   if [ ! -f %D/etc/xneur/xneurrc-fr ] ; then cp -p %D/%F %B/xneurrc-fr; fi
 include/xneur/xnconfig.h
-lib/libxnconfig.so.3
-lib/libxnconfig.so
-lib/libxnconfig.la
+include/xneur/list_char.h
+lib/xneur/libxnconfig.la
+lib/xneur/libxnconfig.so.6
+lib/xneur/libxnconfig.so
+libdata/pkgconfig/xnconfig.pc
+@dirrm lib/xneur
 @dirrm include/xneur
 @dirrmtry etc/xneur/ru
 @dirrmtry etc/xneur/uk
 @dirrmtry etc/xneur/be
 @dirrmtry etc/xneur/en
+@dirrmtry etc/xneur/ro
+@dirrmtry etc/xneur/fr
 @dirrmtry etc/xneur