Bug 133913

Summary: Update port russian/xneur 0.9.2-->0.9.4
Product: Ports & Packages Reporter: admin
Component: Individual Port(s)Assignee: Dmitry Marakasov <amdmi3>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description admin 2009-04-22 13:20:00 UTC
new version xneur.

Fix: see diff

Patch attached with submission follows:
How-To-Repeat: -
Comment 1 Dmitry Marakasov freebsd_committer freebsd_triage 2009-04-22 16:31:05 UTC
Responsible Changed
From-To: freebsd-ports-bugs->amdmi3

I'll take it.
Comment 2 Alexander Logvinov 2009-04-23 11:54:06 UTC
Hello!

  Please take a look on this patch with OPTIONS.

  As for your patch Alex. It seems you forgot to add *.mo files to pkg-plist
  or you have WITHOUT_NLS knob? And dependence from xpm was dropped in xneur.
  I can't find xneur-0.9.4.tar.bz2 on CENKES MASTER_SITES.

  What do you think about moving xneur to deskutils category?

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/russian/xneur/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	6 Jan 2009 17:59:17 -0000	1.9
+++ Makefile	23 Apr 2009 10:35:12 -0000
@@ -6,36 +6,93 @@
 #
 
 PORTNAME=	xneur
-PORTVERSION=	0.9.2
-CATEGORIES=	russian
-MASTER_SITES=	http://dists.xneur.ru/release-${DISTVERSION}/tgz/ CENKES
+PORTVERSION=	0.9.4
+CATEGORIES=	russian deskutils
+MASTER_SITES=	http://dists.xneur.ru/release-${DISTVERSION}/tgz/
 
 MAINTAINER=	admin@lissyara.su
 COMMENT=	Auto keyboard switcher
 
-LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre \
-		aspell:${PORTSDIR}/textproc/aspell
+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
 
+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
-USE_BZIP2=	yes
-USE_XORG=	x11 xpm
-USE_GCC=	4.2+
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+
 USE_LDCONFIG=	yes
-USE_GSTREAMER=	yes
-MAKE_ARGS=	pkgconfigdir=${PREFIX}/libdata/pkgconfig
-#DATADIR=	${SHAREDIR}/${PORTNAME}
+
 MAN1=		xneur.1
 MAN5=		xneurrc.5
 
+.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(WITH_GSTREAMER) && defined(WITH_OPENAL)
+IGNORE=	please select support one of the sound library
+.else
+.if defined(WITH_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(WITH_GSTREAMER) && !defined(WITH_OPENAL)
+CONFIGURE_ARGS+=	--with-sound=no
+.endif
+.endif
+
+.if !defined(WITH_PCRE)
+CONFIGURE_ARGS+=	--without-pcre
+.else
+LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
+.endif
+
+.if !defined(WITH_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-uk|xneurrc-fr|xneurrc-ro|xneurrc-de|xneurrc-kz|dict)$$$$/\\1.dist/"`;#' \
+		"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.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/russian/xneur/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo	7 Dec 2008 09:38:22 -0000	1.5
+++ distinfo	23 Apr 2009 10:35:12 -0000
@@ -1,3 +1,3 @@
-MD5 (xneur-0.9.2.tar.bz2) = c33c1a7e2a0b467c885cdbe27fa859b4
-SHA256 (xneur-0.9.2.tar.bz2) = 5882ecdccc41d0e89a15cbd5535cf3f046e1fb28b3d69f8542d80ad47a1c61fe
-SIZE (xneur-0.9.2.tar.bz2) = 587476
+MD5 (xneur-0.9.4.tar.bz2) = 1e68ac654c148f2d064250d5f9ad98c2
+SHA256 (xneur-0.9.4.tar.bz2) = 244548027da8f50a1d72e1de44be351364d1be18c7135941c212e77ced55aec5
+SIZE (xneur-0.9.4.tar.bz2) = 1020509
Index: pkg-descr
===================================================================
RCS file: /home/pcvs/ports/russian/xneur/pkg-descr,v
retrieving revision 1.2
diff -u -r1.2 pkg-descr
--- pkg-descr	9 Jun 2007 10:17:01 -0000	1.2
+++ pkg-descr	23 Apr 2009 10:35:12 -0000
@@ -5,6 +5,8 @@
 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.
+English, Russian, Ukrainian, Belarusian, French, Romanian, Bulgarian, Czech,
+Greek, Estonian, Armenian, Lithuanian, Latvian, Poland, Spanish and Uzbek
+languages.
 
 WWW: http://xneur.ru/
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/russian/xneur/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- pkg-plist	7 Dec 2008 09:38:22 -0000	1.5
+++ pkg-plist	23 Apr 2009 10:35:12 -0000
@@ -1,10 +1,37 @@
 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-kz %D/etc/xneur/xneurrc-kz.dist; then rm -f %D/etc/xneur/xneurrc-kz; fi
-etc/xneur/xneurrc-kz.dist
-@exec   if [ ! -f %D/etc/xneur/xneurrc-kz ] ; then cp -p %D/%F %B/xneurrc-kz; 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
@@ -36,61 +63,98 @@
 %%DATADIR%%/sounds/switch.wav
 %%DATADIR%%/sounds/itemback.wav
 @dirrm %%DATADIR%%/sounds
-%%DATADIR%%/pixmaps/Russian.xpm
-%%DATADIR%%/pixmaps/Ukrainian.xpm
-%%DATADIR%%/pixmaps/English.xpm
-%%DATADIR%%/pixmaps/Belarusian.xpm
-%%DATADIR%%/pixmaps/French.xpm
-%%DATADIR%%/pixmaps/Romanian.xpm
-%%DATADIR%%/pixmaps/Kazakh.xpm
-%%DATADIR%%/pixmaps/German.xpm
-@dirrm %%DATADIR%%/pixmaps
+%%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/langdef
 %%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/langdef
 %%DATADIR%%/uk/regexp
 @dirrm %%DATADIR%%/uk
 %%DATADIR%%/ru/dict
 %%DATADIR%%/ru/proto
 %%DATADIR%%/ru/proto3
-%%DATADIR%%/ru/langdef
 %%DATADIR%%/ru/regexp
 @dirrm %%DATADIR%%/ru
 %%DATADIR%%/be/dict
 %%DATADIR%%/be/proto
 %%DATADIR%%/be/proto3
-%%DATADIR%%/be/langdef
 %%DATADIR%%/be/regexp
 @dirrm %%DATADIR%%/be
 %%DATADIR%%/fr/dict
 %%DATADIR%%/fr/proto
 %%DATADIR%%/fr/proto3
-%%DATADIR%%/fr/langdef
 %%DATADIR%%/fr/regexp
 @dirrm %%DATADIR%%/fr
-%%DATADIR%%/kz/dict
-%%DATADIR%%/kz/proto
-%%DATADIR%%/kz/proto3
-%%DATADIR%%/kz/langdef
-%%DATADIR%%/kz/regexp
-@dirrm %%DATADIR%%/kz
+%%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/langdef
 %%DATADIR%%/ro/regexp
 @dirrm %%DATADIR%%/ro
 %%DATADIR%%/de/dict
 %%DATADIR%%/de/proto
 %%DATADIR%%/de/proto3
-%%DATADIR%%/de/langdef
 %%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
Comment 3 admin 2009-04-23 12:38:00 UTC
Alexander Logvinov ïèøåò:
> Hello!
>
>   Please take a look on this patch with OPTIONS.
>
>   As for your patch Alex. It seems you forgot to add *.mo files to pkg-plist
>   or you have WITHOUT_NLS knob?
I try on another machine - I do not have any *.mo files.
In make.conf I have only
LOCALIZED_LANG=ru
but, without it, i again do not have *.mo =(
> And dependence from xpm was dropped in xneur.
>   
OK
>   I can't find xneur-0.9.4.tar.bz2 on CENKES MASTER_SITES.
>   
possible, the developers have not yet been posted?
>   What do you think about moving xneur to deskutils category?
>   
OK
=========
thanks for patching my patch! =)
> Index: Makefile
> ===================================================================
> RCS file: /home/pcvs/ports/russian/xneur/Makefile,v
> retrieving revision 1.9
> diff -u -r1.9 Makefile
> --- Makefile	6 Jan 2009 17:59:17 -0000	1.9
> +++ Makefile	23 Apr 2009 10:35:12 -0000
> @@ -6,36 +6,93 @@
>  #
>  
>  PORTNAME=	xneur
> -PORTVERSION=	0.9.2
> -CATEGORIES=	russian
> -MASTER_SITES=	http://dists.xneur.ru/release-${DISTVERSION}/tgz/ CENKES
> +PORTVERSION=	0.9.4
> +CATEGORIES=	russian deskutils
> +MASTER_SITES=	http://dists.xneur.ru/release-${DISTVERSION}/tgz/
>  
>  MAINTAINER=	admin@lissyara.su
>  COMMENT=	Auto keyboard switcher
>  
> -LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre \
> -		aspell:${PORTSDIR}/textproc/aspell
> +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
>  
> +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
> -USE_BZIP2=	yes
> -USE_XORG=	x11 xpm
> -USE_GCC=	4.2+
> +CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
> +		LDFLAGS="${LDFLAGS}"
> +
>  USE_LDCONFIG=	yes
> -USE_GSTREAMER=	yes
> -MAKE_ARGS=	pkgconfigdir=${PREFIX}/libdata/pkgconfig
> -#DATADIR=	${SHAREDIR}/${PORTNAME}
> +
>  MAN1=		xneur.1
>  MAN5=		xneurrc.5
>  
> +.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(WITH_GSTREAMER) && defined(WITH_OPENAL)
> +IGNORE=	please select support one of the sound library
> +.else
> +.if defined(WITH_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(WITH_GSTREAMER) && !defined(WITH_OPENAL)
> +CONFIGURE_ARGS+=	--with-sound=no
> +.endif
> +.endif
> +
> +.if !defined(WITH_PCRE)
> +CONFIGURE_ARGS+=	--without-pcre
> +.else
> +LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
> +.endif
> +
> +.if !defined(WITH_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-uk|xneurrc-fr|xneurrc-ro|xneurrc-de|xneurrc-kz|dict)$$$$/\\1.dist/"`;#' \
> +		"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.mk>
> +.include <bsd.port.post.mk>
> Index: distinfo
> ===================================================================
> RCS file: /home/pcvs/ports/russian/xneur/distinfo,v
> retrieving revision 1.5
> diff -u -r1.5 distinfo
> --- distinfo	7 Dec 2008 09:38:22 -0000	1.5
> +++ distinfo	23 Apr 2009 10:35:12 -0000
> @@ -1,3 +1,3 @@
> -MD5 (xneur-0.9.2.tar.bz2) = c33c1a7e2a0b467c885cdbe27fa859b4
> -SHA256 (xneur-0.9.2.tar.bz2) = 5882ecdccc41d0e89a15cbd5535cf3f046e1fb28b3d69f8542d80ad47a1c61fe
> -SIZE (xneur-0.9.2.tar.bz2) = 587476
> +MD5 (xneur-0.9.4.tar.bz2) = 1e68ac654c148f2d064250d5f9ad98c2
> +SHA256 (xneur-0.9.4.tar.bz2) = 244548027da8f50a1d72e1de44be351364d1be18c7135941c212e77ced55aec5
> +SIZE (xneur-0.9.4.tar.bz2) = 1020509
> Index: pkg-descr
> ===================================================================
> RCS file: /home/pcvs/ports/russian/xneur/pkg-descr,v
> retrieving revision 1.2
> diff -u -r1.2 pkg-descr
> --- pkg-descr	9 Jun 2007 10:17:01 -0000	1.2
> +++ pkg-descr	23 Apr 2009 10:35:12 -0000
> @@ -5,6 +5,8 @@
>  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.
> +English, Russian, Ukrainian, Belarusian, French, Romanian, Bulgarian, Czech,
> +Greek, Estonian, Armenian, Lithuanian, Latvian, Poland, Spanish and Uzbek
> +languages.
>  
>  WWW: http://xneur.ru/
> Index: pkg-plist
> ===================================================================
> RCS file: /home/pcvs/ports/russian/xneur/pkg-plist,v
> retrieving revision 1.5
> diff -u -r1.5 pkg-plist
> --- pkg-plist	7 Dec 2008 09:38:22 -0000	1.5
> +++ pkg-plist	23 Apr 2009 10:35:12 -0000
> @@ -1,10 +1,37 @@
>  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-kz %D/etc/xneur/xneurrc-kz.dist; then rm -f %D/etc/xneur/xneurrc-kz; fi
> -etc/xneur/xneurrc-kz.dist
> -@exec   if [ ! -f %D/etc/xneur/xneurrc-kz ] ; then cp -p %D/%F %B/xneurrc-kz; 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
> @@ -36,61 +63,98 @@
>  %%DATADIR%%/sounds/switch.wav
>  %%DATADIR%%/sounds/itemback.wav
>  @dirrm %%DATADIR%%/sounds
> -%%DATADIR%%/pixmaps/Russian.xpm
> -%%DATADIR%%/pixmaps/Ukrainian.xpm
> -%%DATADIR%%/pixmaps/English.xpm
> -%%DATADIR%%/pixmaps/Belarusian.xpm
> -%%DATADIR%%/pixmaps/French.xpm
> -%%DATADIR%%/pixmaps/Romanian.xpm
> -%%DATADIR%%/pixmaps/Kazakh.xpm
> -%%DATADIR%%/pixmaps/German.xpm
> -@dirrm %%DATADIR%%/pixmaps
> +%%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/langdef
>  %%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/langdef
>  %%DATADIR%%/uk/regexp
>  @dirrm %%DATADIR%%/uk
>  %%DATADIR%%/ru/dict
>  %%DATADIR%%/ru/proto
>  %%DATADIR%%/ru/proto3
> -%%DATADIR%%/ru/langdef
>  %%DATADIR%%/ru/regexp
>  @dirrm %%DATADIR%%/ru
>  %%DATADIR%%/be/dict
>  %%DATADIR%%/be/proto
>  %%DATADIR%%/be/proto3
> -%%DATADIR%%/be/langdef
>  %%DATADIR%%/be/regexp
>  @dirrm %%DATADIR%%/be
>  %%DATADIR%%/fr/dict
>  %%DATADIR%%/fr/proto
>  %%DATADIR%%/fr/proto3
> -%%DATADIR%%/fr/langdef
>  %%DATADIR%%/fr/regexp
>  @dirrm %%DATADIR%%/fr
> -%%DATADIR%%/kz/dict
> -%%DATADIR%%/kz/proto
> -%%DATADIR%%/kz/proto3
> -%%DATADIR%%/kz/langdef
> -%%DATADIR%%/kz/regexp
> -@dirrm %%DATADIR%%/kz
> +%%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/langdef
>  %%DATADIR%%/ro/regexp
>  @dirrm %%DATADIR%%/ro
>  %%DATADIR%%/de/dict
>  %%DATADIR%%/de/proto
>  %%DATADIR%%/de/proto3
> -%%DATADIR%%/de/langdef
>  %%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
>
>
Comment 4 Dmitry Marakasov 2009-04-23 12:53:54 UTC
* Alexander Logvinov (ports@logvinov.com) wrote:

>   Please take a look on this patch with OPTIONS.

I like this more. Only fixed options checking a bit
(defined(WITH_GSTREAMER) -> !defined(WITHOUT_GSTREAMER), same for PCRE
and ASPELL).

>   As for your patch Alex. It seems you forgot to add *.mo files to pkg-plist
>   or you have WITHOUT_NLS knob? And dependence from xpm was dropped in xneur.
>   I can't find xneur-0.9.4.tar.bz2 on CENKES MASTER_SITES.

I can put it on mirror.amdmi3.ru for more availability, any objections?

>   What do you think about moving xneur to deskutils category?

Nice. It does belong there.

So, Alex, what do you think?

-- 
Dmitry Marakasov   .   55B5 0596 FF1E 8D84 5F56  9510 D35A 80DD F9D2 F77D
amdmi3@amdmi3.ru  ..:  jabber: amdmi3@jabber.ru    http://www.amdmi3.ru
Comment 5 admin 2009-04-23 13:05:12 UTC
Dmitry Marakasov пиÑеÑ:
> * Alexander Logvinov (ports@logvinov.com) wrote:
>
>   
>>   Please take a look on this patch with OPTIONS.
>>     
>
> I like this more. Only fixed options checking a bit
> (defined(WITH_GSTREAMER) -> !defined(WITHOUT_GSTREAMER), same for PCRE
> and ASPELL).
>
>   
>>   As for your patch Alex. It seems you forgot to add *.mo files to pkg-plist
>>   or you have WITHOUT_NLS knob? And dependence from xpm was dropped in xneur.
>>   I can't find xneur-0.9.4.tar.bz2 on CENKES MASTER_SITES.
>>     
>
> I can put it on mirror.amdmi3.ru for more availability, any objections?
>   
OK
>   
>>   What do you think about moving xneur to deskutils category?
>>     
>
> Nice. It does belong there.
>
> So, Alex, what do you think?
>   
it's seems to be good idea =)
Comment 6 Dmitry Marakasov freebsd_committer freebsd_triage 2009-04-23 14:38:52 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!
Comment 7 dfilter service freebsd_committer freebsd_triage 2009-04-23 14:39:08 UTC
amdmi3      2009-04-23 13:38:48 UTC

  FreeBSD ports repository

  Modified files:
    russian/xneur        Makefile distinfo pkg-descr pkg-plist 
  Log:
  - Update to 0.9.4
  - OPTIONize
  
  PR:             133913
  Submitted by:   Alex Keda <admin at lissyara dot su> (maintainer)
  Improved patch by: Alexander Logvinov <ports at logvinov dot com>
  Approved by:    Alex Keda <admin at lissyara dot su> (maintainer)
  
  Revision  Changes    Path
  1.10      +72 -14    ports/russian/xneur/Makefile
  1.6       +3 -3      ports/russian/xneur/distinfo
  1.3       +3 -1      ports/russian/xneur/pkg-descr
  1.6       +89 -25    ports/russian/xneur/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"