- Move russian/xneur to deskutils - it is more suitable category as the tool already supports many languages beside russian

Suggested by:	Alexander Logvinov <ports at logvinov dot com>
Approved by:	Alex Keda <admin at lissyara dot su> (maintainer via private email)

10 files changed, 5 insertions, 288 deletions

diff --git a/MOVED b/MOVED
index acadc4518a55..d3674f6ee76b 100644
--- a/MOVED
+++ b/MOVED
@@ -3940,3 +3940,4 @@ x11/nvidia-driver-71xx|x11/nvidia-driver-71|2009-04-13|Renamed
 x11/nvidia-driver-96xx|x11/nvidia-driver-96|2009-04-13|Renamed
 emulators/cpmtools27|emulators/cpmtools2|2009-04-25|Renamed
 games/chromium|games/chromium-bsu|2009-04-26|Renamed
+russian/xneur|deskutils/xneur|2009-04-27|Better category: supports many languages
diff --git a/deskutils/Makefile b/deskutils/Makefile
index f04033108632..567a27b9df84 100644
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@@ -262,6 +262,7 @@
     SUBDIR += xfce4-xkb-plugin
     SUBDIR += xmaddressbook
     SUBDIR += xmdiary
+    SUBDIR += xneur
     SUBDIR += xopps
     SUBDIR += xpad
     SUBDIR += xpostit
diff --git a/deskutils/gxneur/Makefile b/deskutils/gxneur/Makefile
index 85e9be113859..bcde68fcdfd9 100644
--- a/deskutils/gxneur/Makefile
+++ b/deskutils/gxneur/Makefile
@@ -13,8 +13,8 @@ MASTER_SITES=	http://dists.xneur.ru/release-${PORTVERSION}/tgz/
 MAINTAINER=	ports@logvinov.com
 COMMENT=	GTK frontend for XNeur keyboard layout switcher
 
-BUILD_DEPENDS=	xneur:${PORTSDIR}/russian/xneur
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	xneur:${PORTSDIR}/deskutils/xneur
+RUN_DEPENDS=	xneur:${PORTSDIR}/deskutils/xneur
 
 MAKE_JOBS_SAFE=	yes
 
diff --git a/deskutils/xneur/Makefile b/deskutils/xneur/Makefile
index 82e5e9702e8e..188954c93a1a 100644
--- a/deskutils/xneur/Makefile
+++ b/deskutils/xneur/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xneur
 PORTVERSION=	0.9.4
-CATEGORIES=	russian deskutils
+CATEGORIES=	deskutils
 MASTER_SITES=	http://dists.xneur.ru/release-${DISTVERSION}/tgz/ \
 		http://mirror.amdmi3.ru/
 
diff --git a/russian/Makefile b/russian/Makefile
index db9dd222397e..13a1bf0d932a 100644
--- a/russian/Makefile
+++ b/russian/Makefile
@@ -42,7 +42,6 @@
     SUBDIR += xcode
     SUBDIR += xcyrBGR
     SUBDIR += xmms
-    SUBDIR += xneur
     SUBDIR += xpi-tabextensions
     SUBDIR += xruskb
 
diff --git a/russian/xneur/Makefile b/russian/xneur/Makefile
deleted file mode 100644
index 82e5e9702e8e..000000000000
--- a/russian/xneur/Makefile
+++ /dev/null
@@ -1,99 +0,0 @@
-# New ports collection makefile for:	xneur
-# Date created:		19 January 2007
-# Whom:			Alex "lissyara" Keda <admin@lissyara.su>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xneur
-PORTVERSION=	0.9.4
-CATEGORIES=	russian deskutils
-MASTER_SITES=	http://dists.xneur.ru/release-${DISTVERSION}/tgz/ \
-		http://mirror.amdmi3.ru/
-
-MAINTAINER=	admin@lissyara.su
-COMMENT=	Auto keyboard switcher
-
-USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
-USE_GNOME=	pkgconfig gnomehack
-USE_ICONV=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ARGS=	--disable-static --libdir=${PREFIX}/lib/xneur
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-
-USE_LDCONFIG=	yes
-
-MAN1=		xneur.1
-MAN5=		xneurrc.5
-
-OPTIONS=	GSTREAMER	"Build with GStreamer sound support"	on \
-		OPENAL		"Build with OpenAL sound support"	off \
-		PCRE		"Build with libpcre support"		on \
-		ASPELL		"Build with aspell support"		on \
-		XOSD		"Build with xosd support"		off
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-LDFLAGS+=	-lintl
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+=	--with-x=no
-.else
-USE_XORG+=	x11
-CONFIGURE_ARGS+=	--with-x
-.endif
-
-.if !defined(WITHOUT_GSTREAMER) && defined(WITH_OPENAL)
-IGNORE=	please select support one of the sound library
-.else
-.if !defined(WITHOUT_GSTREAMER)
-USE_GSTREAMER=	yes
-CONFIGURE_ARGS+=	--with-sound=gstreamer
-.endif
-.if defined(WITH_OPENAL)
-LIB_DEPENDS+=	openal.0:${PORTSDIR}/audio/openal
-CONFIGURE_ARGS+=	--with-sound=openal
-.endif
-.if defined(WITHOUT_GSTREAMER) && !defined(WITH_OPENAL)
-CONFIGURE_ARGS+=	--with-sound=no
-.endif
-.endif
-
-.if defined(WITHOUT_PCRE)
-CONFIGURE_ARGS+=	--without-pcre
-.else
-LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
-.endif
-
-.if defined(WITHOUT_ASPELL)
-CONFIGURE_ARGS+=	--without-aspell
-.else
-LIB_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
-.endif
-
-.if !defined(WITH_XOSD)
-CONFIGURE_ARGS+=	--without-xosd
-.else
-LIB_DEPENDS+=	xosd.4:${PORTSDIR}/misc/xosd
-.endif
-
-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
-
-post-install:
-	@for i in ${PREFIX}/etc/xneur/*.dist ;\
-		do ${CP} -np $$i $${i%.dist}; done
-
-.include <bsd.port.post.mk>
diff --git a/russian/xneur/distinfo b/russian/xneur/distinfo
deleted file mode 100644
index 52c3f7949201..000000000000
--- a/russian/xneur/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xneur-0.9.4.tar.bz2) = 1e68ac654c148f2d064250d5f9ad98c2
-SHA256 (xneur-0.9.4.tar.bz2) = 244548027da8f50a1d72e1de44be351364d1be18c7135941c212e77ced55aec5
-SIZE (xneur-0.9.4.tar.bz2) = 1020509
diff --git a/russian/xneur/files/patch-lib__config__xnconfig_memory.c b/russian/xneur/files/patch-lib__config__xnconfig_memory.c
deleted file mode 100644
index ffd68331c4b2..000000000000
--- a/russian/xneur/files/patch-lib__config__xnconfig_memory.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./lib/config/xnconfig_memory.c.orig	Mon Jun 11 12:08:15 2007
-+++ ./lib/config/xnconfig_memory.c	Mon Jun 11 12:08:29 2007
-@@ -17,6 +17,7 @@
-  *
-  */
- 
-+#include <sys/_types.h>
- #include <sys/shm.h>
- #include <string.h>
- 
diff --git a/russian/xneur/pkg-descr b/russian/xneur/pkg-descr
deleted file mode 100644
index b5e46c6a9c76..000000000000
--- a/russian/xneur/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-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, Romanian, Bulgarian, Czech,
-Greek, Estonian, Armenian, Lithuanian, Latvian, Poland, Spanish and Uzbek
-languages.
-
-WWW: http://xneur.ru/
diff --git a/russian/xneur/pkg-plist b/russian/xneur/pkg-plist
deleted file mode 100644
index 40013cbc649b..000000000000
--- a/russian/xneur/pkg-plist
+++ /dev/null
@@ -1,160 +0,0 @@
-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
-lib/xneur/libxnconfig.so
-libdata/pkgconfig/xnconfig.pc
-@dirrm lib/xneur
-@dirrm include/xneur
-@dirrmtry etc/xneur
-%%DATADIR%%/sounds/layout1.wav
-%%DATADIR%%/sounds/layout2.wav
-%%DATADIR%%/sounds/layout1type.wav
-%%DATADIR%%/sounds/layout2type.wav
-%%DATADIR%%/sounds/replace.wav
-%%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
-@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