- Update to 0.10.0

PR:		ports/151293
Submitted by:	Alex Keda <admin@lissyara.su> (maintainer)

3 files changed, 132 insertions, 149 deletions

diff --git a/deskutils/xneur/Makefile b/deskutils/xneur/Makefile
index ac1a836f2e42..29856cea7b41 100644
--- a/deskutils/xneur/Makefile
+++ b/deskutils/xneur/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xneur
-PORTVERSION=	0.9.4
-PORTREVISION=	2
+PORTVERSION=	0.10.0
 CATEGORIES=	deskutils
 MASTER_SITES=	http://dists.xneur.ru/release-${DISTVERSION}/tgz/ \
 		http://mirror.amdmi3.ru/distfiles/
@@ -15,6 +14,8 @@ MASTER_SITES=	http://dists.xneur.ru/release-${DISTVERSION}/tgz/ \
 MAINTAINER=	admin@lissyara.su
 COMMENT=	Auto keyboard switcher
 
+LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify
+
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	pkgconfig gnomehack
@@ -89,9 +90,8 @@ LIB_DEPENDS+=	xosd.4:${PORTSDIR}/misc/xosd
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^CFLAGS=/s|="|="$$CFLAGS |' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '/^am__strip_dir/s#`;#|sed -Ee \
-		"s/^(dict.dist|proto|proto3|langdef|regexp|xneurrc|xneurrc-be|xneurrc-bg|xneurrc-cs|xneurrc-el|xneurrc-es|xneurrc-et|xneurrc-kk|xneurrc-lt|xneurrc-lv|xneurrc-pl|xneurrc-uz|xneurrc-uk|xneurrc-fr|xneurrc-ro|xneurrc-de|xneurrc-kz|dict)$$$$/\\1.dist/"`;#' \
-		${WRKSRC}/etc/Makefile.in ${WRKSRC}/etc/Makefile.am
+	@${REINPLACE_CMD} -e 's|	xneurrc	|xneurrc.dist|g' ${WRKSRC}/etc/Makefile.in
+	${CP} -np ${WRKSRC}/etc/xneurrc ${WRKSRC}/etc/xneurrc.dist
 
 post-install:
 	@for i in ${PREFIX}/etc/xneur/*.dist ;\
diff --git a/deskutils/xneur/distinfo b/deskutils/xneur/distinfo
index 52c3f7949201..af65077f63c2 100644
--- a/deskutils/xneur/distinfo
+++ b/deskutils/xneur/distinfo
@@ -1,3 +1,3 @@
-MD5 (xneur-0.9.4.tar.bz2) = 1e68ac654c148f2d064250d5f9ad98c2
-SHA256 (xneur-0.9.4.tar.bz2) = 244548027da8f50a1d72e1de44be351364d1be18c7135941c212e77ced55aec5
-SIZE (xneur-0.9.4.tar.bz2) = 1020509
+MD5 (xneur-0.10.0.tar.bz2) = 256260b8fdafcffc786d0a1ee0525506
+SHA256 (xneur-0.10.0.tar.bz2) = 0e118ccf02a654c0c94e1faac254c9df224b63f5296d79806c7b1566b90204ca
+SIZE (xneur-0.10.0.tar.bz2) = 1120059
diff --git a/deskutils/xneur/pkg-plist b/deskutils/xneur/pkg-plist
index 40013cbc649b..620a5593f1ee 100644
--- a/deskutils/xneur/pkg-plist
+++ b/deskutils/xneur/pkg-plist
@@ -1,60 +1,25 @@
 bin/xneur
-@unexec if cmp -s %D/etc/xneur/xneurrc-bg %D/etc/xneur/xneurrc-bg.dist; then rm -f %D/etc/xneur/xneurrc-bg; fi
-etc/xneur/xneurrc-bg.dist
-@exec   if [ ! -f %D/etc/xneur/xneurrc-bg ] ; then cp -p %D/%F %B/xneurrc-bg; fi
-@unexec if cmp -s %D/etc/xneur/xneurrc-cs %D/etc/xneur/xneurrc-cs.dist; then rm -f %D/etc/xneur/xneurrc-cs; fi
-etc/xneur/xneurrc-cs.dist
-@exec   if [ ! -f %D/etc/xneur/xneurrc-cs ] ; then cp -p %D/%F %B/xneurrc-cs; fi
-@unexec if cmp -s %D/etc/xneur/xneurrc-el %D/etc/xneur/xneurrc-el.dist; then rm -f %D/etc/xneur/xneurrc-el; fi
-etc/xneur/xneurrc-el.dist
-@exec   if [ ! -f %D/etc/xneur/xneurrc-el ] ; then cp -p %D/%F %B/xneurrc-el; fi
-@unexec if cmp -s %D/etc/xneur/xneurrc-es %D/etc/xneur/xneurrc-es.dist; then rm -f %D/etc/xneur/xneurrc-es; fi
-etc/xneur/xneurrc-es.dist
-@exec   if [ ! -f %D/etc/xneur/xneurrc-es ] ; then cp -p %D/%F %B/xneurrc-es; fi
-@unexec if cmp -s %D/etc/xneur/xneurrc-et %D/etc/xneur/xneurrc-et.dist; then rm -f %D/etc/xneur/xneurrc-et; fi
-etc/xneur/xneurrc-et.dist
-@exec   if [ ! -f %D/etc/xneur/xneurrc-et ] ; then cp -p %D/%F %B/xneurrc-et; fi
-@unexec if cmp -s %D/etc/xneur/xneurrc-kk %D/etc/xneur/xneurrc-kk.dist; then rm -f %D/etc/xneur/xneurrc-kk; fi
-etc/xneur/xneurrc-kk.dist
-@exec   if [ ! -f %D/etc/xneur/xneurrc-kk ] ; then cp -p %D/%F %B/xneurrc-kk; fi
-@unexec if cmp -s %D/etc/xneur/xneurrc-lt %D/etc/xneur/xneurrc-lt.dist; then rm -f %D/etc/xneur/xneurrc-lt; fi
-etc/xneur/xneurrc-lt.dist
-@exec   if [ ! -f %D/etc/xneur/xneurrc-lt ] ; then cp -p %D/%F %B/xneurrc-lt; fi
-@unexec if cmp -s %D/etc/xneur/xneurrc-lv %D/etc/xneur/xneurrc-lv.dist; then rm -f %D/etc/xneur/xneurrc-lv; fi
-etc/xneur/xneurrc-lv.dist
-@exec   if [ ! -f %D/etc/xneur/xneurrc-lv ] ; then cp -p %D/%F %B/xneurrc-lv; fi
-@unexec if cmp -s %D/etc/xneur/xneurrc-pl %D/etc/xneur/xneurrc-pl.dist; then rm -f %D/etc/xneur/xneurrc-pl; fi
-etc/xneur/xneurrc-pl.dist
-@exec   if [ ! -f %D/etc/xneur/xneurrc-pl ] ; then cp -p %D/%F %B/xneurrc-pl; fi
-@unexec if cmp -s %D/etc/xneur/xneurrc-uz %D/etc/xneur/xneurrc-uz.dist; then rm -f %D/etc/xneur/xneurrc-uz; fi
-etc/xneur/xneurrc-uz.dist
-@exec   if [ ! -f %D/etc/xneur/xneurrc-uz ] ; then cp -p %D/%F %B/xneurrc-uz; fi
-@unexec if cmp -s %D/etc/xneur/xneurrc-de %D/etc/xneur/xneurrc-de.dist; then rm -f %D/etc/xneur/xneurrc-de; fi
-etc/xneur/xneurrc-de.dist
-@exec   if [ ! -f %D/etc/xneur/xneurrc-de ] ; then cp -p %D/%F %B/xneurrc-de; fi
 @unexec if cmp -s %D/etc/xneur/xneurrc %D/etc/xneur/xneurrc.dist; then rm -f %D/etc/xneur/xneurrc; fi
 etc/xneur/xneurrc.dist
-@exec	if [ ! -f %D/etc/xneur/xneurrc ] ; then cp -p %D/%F %B/xneurrc; fi
-@unexec if cmp -s %D/etc/xneur/xneurrc-be %D/etc/xneur/xneurrc-be.dist; then rm -f %D/etc/xneur/xneurrc-be; fi
-etc/xneur/xneurrc-be.dist
-@exec   if [ ! -f %D/etc/xneur/xneurrc-be ] ; then cp -p %D/%F %B/xneurrc-be; fi
-@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
-@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
-include/xneur/list_char.h
-lib/xneur/libxnconfig.la
-lib/xneur/libxnconfig.so.9
+@dirrmtry etc/xneur
+lib/xneur/libxneur.so.10
+lib/xneur/libxneur.so
+lib/xneur/libxneur.la
+lib/xneur/libxnconfig.so.10
 lib/xneur/libxnconfig.so
-libdata/pkgconfig/xnconfig.pc
+lib/xneur/libxnconfig.la
+lib/xneur/xneur/libxntest.so.0
+lib/xneur/xneur/libxntest.so
+lib/xneur/xneur/libxntest.la
+lib/xneur/xneur/libxnstatistic.so.0
+lib/xneur/xneur/libxnstatistic.so
+lib/xneur/xneur/libxnstatistic.la
+@dirrm lib/xneur/xneur
 @dirrm lib/xneur
+include/xneur/list_char.h
+include/xneur/xneur.h
+include/xneur/xnconfig.h
 @dirrm include/xneur
-@dirrmtry etc/xneur
 %%DATADIR%%/sounds/layout1.wav
 %%DATADIR%%/sounds/layout2.wav
 %%DATADIR%%/sounds/layout1type.wav
@@ -63,98 +28,116 @@ libdata/pkgconfig/xnconfig.pc
 %%DATADIR%%/sounds/switch.wav
 %%DATADIR%%/sounds/itemback.wav
 @dirrm %%DATADIR%%/sounds
-%%DATADIR%%/bg/dict
-%%DATADIR%%/bg/proto
-%%DATADIR%%/bg/proto3
-%%DATADIR%%/bg/regexp
-@dirrm %%DATADIR%%/bg
-%%DATADIR%%/cs/dict
-%%DATADIR%%/cs/proto
-%%DATADIR%%/cs/proto3
-%%DATADIR%%/cs/regexp
-@dirrm %%DATADIR%%/cs
-%%DATADIR%%/el/dict
-%%DATADIR%%/el/proto
-%%DATADIR%%/el/proto3
-%%DATADIR%%/el/regexp
-@dirrm %%DATADIR%%/el
-%%DATADIR%%/en/dict
-%%DATADIR%%/en/proto
-%%DATADIR%%/en/proto3
-%%DATADIR%%/en/regexp
-@dirrm %%DATADIR%%/en
-%%DATADIR%%/es/dict
-%%DATADIR%%/es/proto
-%%DATADIR%%/es/proto3
-%%DATADIR%%/es/regexp
-@dirrm %%DATADIR%%/es
-%%DATADIR%%/et/dict
-%%DATADIR%%/et/proto
-%%DATADIR%%/et/proto3
-%%DATADIR%%/et/regexp
-@dirrm %%DATADIR%%/et
-%%DATADIR%%/uk/dict
-%%DATADIR%%/uk/proto
-%%DATADIR%%/uk/proto3
-%%DATADIR%%/uk/regexp
-@dirrm %%DATADIR%%/uk
-%%DATADIR%%/ru/dict
-%%DATADIR%%/ru/proto
-%%DATADIR%%/ru/proto3
-%%DATADIR%%/ru/regexp
-@dirrm %%DATADIR%%/ru
-%%DATADIR%%/be/dict
-%%DATADIR%%/be/proto
-%%DATADIR%%/be/proto3
-%%DATADIR%%/be/regexp
-@dirrm %%DATADIR%%/be
-%%DATADIR%%/fr/dict
-%%DATADIR%%/fr/proto
-%%DATADIR%%/fr/proto3
-%%DATADIR%%/fr/regexp
-@dirrm %%DATADIR%%/fr
-%%DATADIR%%/hy/dict
-%%DATADIR%%/hy/proto
-%%DATADIR%%/hy/proto3
-%%DATADIR%%/hy/regexp
-@dirrm %%DATADIR%%/hy
-%%DATADIR%%/kk/dict
-%%DATADIR%%/kk/proto
-%%DATADIR%%/kk/proto3
-%%DATADIR%%/kk/regexp
-@dirrm %%DATADIR%%/kk
-%%DATADIR%%/lt/dict
-%%DATADIR%%/lt/proto
-%%DATADIR%%/lt/proto3
-%%DATADIR%%/lt/regexp
-@dirrm %%DATADIR%%/lt
-%%DATADIR%%/lv/dict
-%%DATADIR%%/lv/proto
-%%DATADIR%%/lv/proto3
-%%DATADIR%%/lv/regexp
-@dirrm %%DATADIR%%/lv
-%%DATADIR%%/pl/dict
-%%DATADIR%%/pl/proto
-%%DATADIR%%/pl/proto3
-%%DATADIR%%/pl/regexp
-@dirrm %%DATADIR%%/pl
-%%DATADIR%%/ro/dict
-%%DATADIR%%/ro/proto
-%%DATADIR%%/ro/proto3
-%%DATADIR%%/ro/regexp
-@dirrm %%DATADIR%%/ro
-%%DATADIR%%/de/dict
-%%DATADIR%%/de/proto
-%%DATADIR%%/de/proto3
-%%DATADIR%%/de/regexp
-@dirrm %%DATADIR%%/de
-%%DATADIR%%/uz/dict
-%%DATADIR%%/uz/proto
-%%DATADIR%%/uz/proto3
-%%DATADIR%%/uz/regexp
-@dirrm %%DATADIR%%/uz
+%%DATADIR%%/languages/am/dict
+%%DATADIR%%/languages/am/proto
+%%DATADIR%%/languages/am/proto3
+%%DATADIR%%/languages/am/regexp
+@dirrm %%DATADIR%%/languages/am
+%%DATADIR%%/languages/bg/dict
+%%DATADIR%%/languages/bg/proto
+%%DATADIR%%/languages/bg/proto3
+%%DATADIR%%/languages/bg/regexp
+@dirrm %%DATADIR%%/languages/bg
+%%DATADIR%%/languages/by/dict
+%%DATADIR%%/languages/by/proto
+%%DATADIR%%/languages/by/proto3
+%%DATADIR%%/languages/by/regexp
+@dirrm %%DATADIR%%/languages/by
+%%DATADIR%%/languages/cz/dict
+%%DATADIR%%/languages/cz/proto
+%%DATADIR%%/languages/cz/proto3
+%%DATADIR%%/languages/cz/regexp
+@dirrm %%DATADIR%%/languages/cz
+%%DATADIR%%/languages/de/dict
+%%DATADIR%%/languages/de/proto
+%%DATADIR%%/languages/de/proto3
+%%DATADIR%%/languages/de/regexp
+@dirrm %%DATADIR%%/languages/de
+%%DATADIR%%/languages/ge/dict
+%%DATADIR%%/languages/ge/proto
+%%DATADIR%%/languages/ge/proto3
+%%DATADIR%%/languages/ge/regexp
+@dirrm %%DATADIR%%/languages/ge
+%%DATADIR%%/languages/gr/dict
+%%DATADIR%%/languages/gr/proto
+%%DATADIR%%/languages/gr/proto3
+%%DATADIR%%/languages/gr/regexp
+@dirrm %%DATADIR%%/languages/gr
+%%DATADIR%%/languages/ee/dict
+%%DATADIR%%/languages/ee/proto
+%%DATADIR%%/languages/ee/proto3
+%%DATADIR%%/languages/ee/regexp
+@dirrm %%DATADIR%%/languages/ee
+%%DATADIR%%/languages/en/dict
+%%DATADIR%%/languages/en/proto
+%%DATADIR%%/languages/en/proto3
+%%DATADIR%%/languages/en/regexp
+@dirrm %%DATADIR%%/languages/en
+%%DATADIR%%/languages/es/dict
+%%DATADIR%%/languages/es/proto
+%%DATADIR%%/languages/es/proto3
+%%DATADIR%%/languages/es/regexp
+@dirrm %%DATADIR%%/languages/es
+%%DATADIR%%/languages/fr/dict
+%%DATADIR%%/languages/fr/proto
+%%DATADIR%%/languages/fr/proto3
+%%DATADIR%%/languages/fr/regexp
+@dirrm %%DATADIR%%/languages/fr
+%%DATADIR%%/languages/gb/dict
+%%DATADIR%%/languages/gb/proto
+%%DATADIR%%/languages/gb/proto3
+%%DATADIR%%/languages/gb/regexp
+@dirrm %%DATADIR%%/languages/gb
+%%DATADIR%%/languages/kz/dict
+%%DATADIR%%/languages/kz/proto
+%%DATADIR%%/languages/kz/proto3
+%%DATADIR%%/languages/kz/regexp
+@dirrm %%DATADIR%%/languages/kz
+%%DATADIR%%/languages/lt/dict
+%%DATADIR%%/languages/lt/proto
+%%DATADIR%%/languages/lt/proto3
+%%DATADIR%%/languages/lt/regexp
+@dirrm %%DATADIR%%/languages/lt
+%%DATADIR%%/languages/lv/dict
+%%DATADIR%%/languages/lv/proto
+%%DATADIR%%/languages/lv/proto3
+%%DATADIR%%/languages/lv/regexp
+@dirrm %%DATADIR%%/languages/lv
+%%DATADIR%%/languages/pl/dict
+%%DATADIR%%/languages/pl/proto
+%%DATADIR%%/languages/pl/proto3
+%%DATADIR%%/languages/pl/regexp
+@dirrm %%DATADIR%%/languages/pl
+%%DATADIR%%/languages/ro/dict
+%%DATADIR%%/languages/ro/proto
+%%DATADIR%%/languages/ro/proto3
+%%DATADIR%%/languages/ro/regexp
+@dirrm %%DATADIR%%/languages/ro
+%%DATADIR%%/languages/ru/dict
+%%DATADIR%%/languages/ru/proto
+%%DATADIR%%/languages/ru/proto3
+%%DATADIR%%/languages/ru/regexp
+@dirrm %%DATADIR%%/languages/ru
+%%DATADIR%%/languages/ua/dict
+%%DATADIR%%/languages/ua/proto
+%%DATADIR%%/languages/ua/proto3
+%%DATADIR%%/languages/ua/regexp
+@dirrm %%DATADIR%%/languages/ua
+%%DATADIR%%/languages/us/dict
+%%DATADIR%%/languages/us/proto
+%%DATADIR%%/languages/us/proto3
+%%DATADIR%%/languages/us/regexp
+@dirrm %%DATADIR%%/languages/us
+%%DATADIR%%/languages/uz/dict
+%%DATADIR%%/languages/uz/proto
+%%DATADIR%%/languages/uz/proto3
+%%DATADIR%%/languages/uz/regexp
+@dirrm %%DATADIR%%/languages/uz
+@dirrm %%DATADIR%%/languages
 @dirrm %%DATADIR%%
 %%NLS%%share/locale/de/LC_MESSAGES/xneur.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/xneur.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/xneur.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/xneur.mo
+libdata/pkgconfig/xneur.pc
+libdata/pkgconfig/xnconfig.pc