Re: UPDATE: vim

2017-01-30 Thread frantisek holop
update to a more recent patchlevel
please test and commit.

-f
-- 
Index: Makefile
===
RCS file: /cvs/ports/editors/vim/Makefile,v
retrieving revision 1.157
diff -u -p -r1.157 Makefile
--- Makefile3 Jan 2017 19:22:09 -   1.157
+++ Makefile30 Jan 2017 21:35:06 -
@@ -4,7 +4,7 @@ COMMENT-main=   vi clone, many additional 
 COMMENT-lang=  vi clone, NLS subpackage
 
 # if updating major version, sync editors/vim-spell
-V= 8.0.0095
+V= 8.0.0257
 GH_ACCOUNT=vim
 GH_PROJECT=vim
 GH_TAGNAME=v$V
@@ -13,7 +13,6 @@ PKGNAME-main= vim-$V
 PKGNAME-lang=  vim-lang-$V
 P= vim${V:R:S/.//}
 CATEGORIES=editors
-REVISION-main= 0
 
 HOMEPAGE=  http://www.vim.org/
 
Index: distinfo
===
RCS file: /cvs/ports/editors/vim/distinfo,v
retrieving revision 1.51
diff -u -p -r1.51 distinfo
--- distinfo23 Nov 2016 16:40:33 -  1.51
+++ distinfo30 Jan 2017 21:35:06 -
@@ -1,2 +1,2 @@
-SHA256 (vim-8.0.0095.tar.gz) = 51arfHqzHhII/xH0fVX00WjVhuy4+pMvdO82/L9YEfI=
-SIZE (vim-8.0.0095.tar.gz) = 12944792
+SHA256 (vim-8.0.0257.tar.gz) = UkbE99UNBzvlbS0gLxzuqiTUQIMxbce9hZWew2Mqfxc=
+SIZE (vim-8.0.0257.tar.gz) = 12973236
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/editors/vim/pkg/PLIST-main,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST-main
--- pkg/PLIST-main  23 Nov 2016 16:40:33 -  1.17
+++ pkg/PLIST-main  30 Jan 2017 21:35:06 -
@@ -109,6 +109,7 @@ share/vim/${P}/compiler/fpc.vim
 share/vim/${P}/compiler/g95.vim
 share/vim/${P}/compiler/gcc.vim
 share/vim/${P}/compiler/gfortran.vim
+share/vim/${P}/compiler/ghc.vim
 share/vim/${P}/compiler/gnat.vim
 share/vim/${P}/compiler/go.vim
 share/vim/${P}/compiler/haml.vim


Re: UPDATE: vim

2016-10-31 Thread frantisek holop

on a related note i am doubtful that what
Stuart described about the automatic upgrade process[1]
will work with the current port without additional
changes...  but i am getting out of my depth quickly...

[1] http://marc.info/?l=openbsd-ports=147492812506914=2

-f
-- 
43.3% of all statistics are meaningless.



Re: UPDATE: vim

2016-09-27 Thread Edd Barrett
On Mon, Sep 26, 2016 at 11:51:49PM +0200, frantisek holop wrote:
> Laurence Tratt, 26 Sep 2016 22:08:
> > Of course, vim has enough FLAVORs that no reasonable number of combinations
> > will keep everyone happy. But given the increasing number of languages that
> > extensions are written in (I use extensions in Lua and Python myself, so I
> > can no longer use a binary package), I wonder if we should simply add lua
> > into what has already more-or-less-become the "all the languages binary
> > package"? So something like:
> 
> i proposed the same thing long time ago.

On a semi-related note, there is a bug in either gvim or gtk2 which
causes an X crash if the default acceleration method is used on an Intel
graphics card.

In the past, I have used the motif flavour to work around this. Not sure
if that is a reason to not GC it. Especially given that you can work
around the bug by using UXA acceleration.

In case anyone is interested, here is a thread about that bug:
http://marc.info/?l=openbsd-x11=146411135423711=2

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk



Re: UPDATE: vim

2016-09-26 Thread Stuart Henderson
On 2016/09/26 23:51, frantisek holop wrote:
> Laurence Tratt, 26 Sep 2016 22:08:
> > Of course, vim has enough FLAVORs that no reasonable number of combinations
> > will keep everyone happy. But given the increasing number of languages that
> > extensions are written in (I use extensions in Lua and Python myself, so I
> > can no longer use a binary package), I wonder if we should simply add lua
> > into what has already more-or-less-become the "all the languages binary
> > package"? So something like:
> 
> i proposed the same thing long time ago.
> 
> the whole port is a bit strange with the forced
> GUI selection.  even servers have been installing
> xbase for a long time, so why not get rid of no_x11,
> make gtk2 the default GUI and make one kitchen
> sink version with all the languages?
> (except the python/python3)
> 
> would there be interest in this?

I use no_x11 because this is something I don't want to break any more
than necessary, and that reduces risk of things getting messed up with
library updates.

I originally used no_x11 because historically X used to be built
separately from base snapshots and it was quite likely to hit things
being out-of-sync. That's not much of a problem now that the snapshot
process changed, but there have also sometimes been problems with glib
updates in the past leaving packages that use it not working, so I still
choose no_x11.

I wouldn't see a problem with losing athena and motif flavours though.

> in any case adding lua makes sense to me

Generally yes. But I'd like to know what pkg_add -u says when you
have one of the current kitchen-sink packages installed and you
point it at a PKG_PATH which has a choice of the proposed new set
of packages. If it offers a choice of which to install I think
that would be reasonable, but if it fails to update then we
probably want some @pkgpath magic.



Re: UPDATE: vim

2016-09-26 Thread frantisek holop
Laurence Tratt, 26 Sep 2016 22:08:
> Of course, vim has enough FLAVORs that no reasonable number of combinations
> will keep everyone happy. But given the increasing number of languages that
> extensions are written in (I use extensions in Lua and Python myself, so I
> can no longer use a binary package), I wonder if we should simply add lua
> into what has already more-or-less-become the "all the languages binary
> package"? So something like:

i proposed the same thing long time ago.

the whole port is a bit strange with the forced
GUI selection.  even servers have been installing
xbase for a long time, so why not get rid of no_x11,
make gtk2 the default GUI and make one kitchen
sink version with all the languages?
(except the python/python3)

would there be interest in this?

in any case adding lua makes sense to me

>  SUBDIR += vim
>  SUBDIR += vim,gtk2,lua
>  SUBDIR += vim,gtk2,lua,perl,python,ruby
>  SUBDIR += vim,gtk2,lua,perl,python3,ruby
>  SUBDIR += vim,no_x11
>  SUBDIR += vim,no_x11,lua
>  SUBDIR += vim,no_x11,lua,perl,python,ruby
>  SUBDIR += vim,no_x11,lua,perl,python3,ruby

-f
-- 
the next sentence is true.  the last sentence was false.



Re: UPDATE: vim

2016-09-26 Thread Laurence Tratt
On Sun, Sep 25, 2016 at 11:14:25PM +0200, frantisek holop wrote:

Hello Frantisek,

> resubmitting 8.0 with latest patchlevel.
> no real changes from last time.

This has been working well for me all day on amd64 -- thanks!

Although it's not directly related to the port, I wonder if we might also
take this opportunity to think about the versions that we provide binary
packages for. At the moment it's:

 SUBDIR += vim
 SUBDIR += vim,gtk2,lua
 SUBDIR += vim,gtk2,perl,python,ruby
 SUBDIR += vim,gtk2,perl,python3,ruby
 SUBDIR += vim,no_x11
 SUBDIR += vim,no_x11,lua
 SUBDIR += vim,no_x11,perl,python,ruby
 SUBDIR += vim,no_x11,perl,python3,ruby

Of course, vim has enough FLAVORs that no reasonable number of combinations
will keep everyone happy. But given the increasing number of languages that
extensions are written in (I use extensions in Lua and Python myself, so I
can no longer use a binary package), I wonder if we should simply add lua
into what has already more-or-less-become the "all the languages binary
package"? So something like:

 SUBDIR += vim
 SUBDIR += vim,gtk2,lua
 SUBDIR += vim,gtk2,lua,perl,python,ruby
 SUBDIR += vim,gtk2,lua,perl,python3,ruby
 SUBDIR += vim,no_x11
 SUBDIR += vim,no_x11,lua
 SUBDIR += vim,no_x11,lua,perl,python,ruby
 SUBDIR += vim,no_x11,lua,perl,python3,ruby

Compared to Python and Ruby, lua is a pretty small dependency (e.g. ~25x
smaller binary package than Python on amd64).


Laurie
-- 
Personal http://tratt.net/laurie/
Software Development Teamhttp://soft-dev.org/
   https://github.com/ltratt  http://twitter.com/laurencetratt



Re: UPDATE: vim

2016-09-25 Thread frantisek holop
resubmitting 8.0 with latest patchlevel.
no real changes from last time.

please test and commit

-f
-- 
does the name "pavlov" ring a bell?
Index: Makefile
===
RCS file: /cvs/ports/editors/vim/Makefile,v
retrieving revision 1.151
diff -u -p -r1.151 Makefile
--- Makefile13 Sep 2016 22:38:14 -  1.151
+++ Makefile25 Sep 2016 21:11:37 -
@@ -3,8 +3,7 @@
 COMMENT-main=  vi clone, many additional features
 COMMENT-lang=  vi clone, NLS subpackage
 
-V= 7.4.2181
-REVISION=  0
+V= 8.0.0013
 DISTNAME=  vim-$V
 DISTFILES= vim-$V{v$V}.tar.gz
 PKGNAME-main=  vim-$V
@@ -167,6 +166,7 @@ post-install:
${INSTALL_DATA} ${WRKDIST}/runtime/vim48x48.png 
${PREFIX}/share/pixmaps/vim.png
 
 RUN_DEPENDS+= devel/desktop-file-utils
+RUN_DEPENDS+= x11/gtk+3,-guic
 .endif
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/editors/vim/distinfo,v
retrieving revision 1.48
diff -u -p -r1.48 distinfo
--- distinfo10 Aug 2016 15:54:29 -  1.48
+++ distinfo25 Sep 2016 21:11:37 -
@@ -1,2 +1,2 @@
-SHA256 (vim-7.4.2181.tar.gz) = cT2WPgz34CwxNfK531Urmvh+tyFXavtXmx4QoS2ZFlg=
-SIZE (vim-7.4.2181.tar.gz) = 12854298
+SHA256 (vim-8.0.0013.tar.gz) = RrUJzQxNCFz+xgsujTDaylaJCMTX28qir1hu2JfMjUs=
+SIZE (vim-8.0.0013.tar.gz) = 12919138
Index: pkg/PFRAG.no-no_x11-main
===
RCS file: /cvs/ports/editors/vim/pkg/PFRAG.no-no_x11-main,v
retrieving revision 1.7
diff -u -p -r1.7 PFRAG.no-no_x11-main
--- pkg/PFRAG.no-no_x11-main14 Oct 2014 13:52:19 -  1.7
+++ pkg/PFRAG.no-no_x11-main25 Sep 2016 21:11:37 -
@@ -15,7 +15,19 @@ bin/rgvim
 @man man/man1/rgview.1
 @man man/man1/rgvim.1
 share/applications/gvim.desktop
+share/icons/hicolor/48x48/apps/gvim.png
+share/icons/locolor/
+share/icons/locolor/16x16/
+share/icons/locolor/16x16/apps/
+share/icons/locolor/16x16/apps/gvim.png
+share/icons/locolor/32x32/
+share/icons/locolor/32x32/apps/
+share/icons/locolor/32x32/apps/gvim.png
 share/pixmaps/
 share/pixmaps/vim.png
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/locolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/locolor
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/editors/vim/pkg/PLIST-main,v
retrieving revision 1.15
diff -u -p -r1.15 PLIST-main
--- pkg/PLIST-main  10 Aug 2016 15:54:29 -  1.15
+++ pkg/PLIST-main  25 Sep 2016 21:11:37 -
@@ -444,6 +444,7 @@ share/vim/${P}/ftplugin/rrst.vim
 share/vim/${P}/ftplugin/rst.vim
 share/vim/${P}/ftplugin/ruby.vim
 share/vim/${P}/ftplugin/sass.vim
+share/vim/${P}/ftplugin/scala.vim
 share/vim/${P}/ftplugin/scheme.vim
 share/vim/${P}/ftplugin/screen.vim
 share/vim/${P}/ftplugin/scss.vim
@@ -582,6 +583,7 @@ share/vim/${P}/indent/rrst.vim
 share/vim/${P}/indent/rst.vim
 share/vim/${P}/indent/ruby.vim
 share/vim/${P}/indent/sass.vim
+share/vim/${P}/indent/scala.vim
 share/vim/${P}/indent/scheme.vim
 share/vim/${P}/indent/scss.vim
 share/vim/${P}/indent/sdl.vim
@@ -661,6 +663,7 @@ share/vim/${P}/keymap/polish-slash_iso-8
 share/vim/${P}/keymap/polish-slash_utf-8.vim
 share/vim/${P}/keymap/russian-dvorak.vim
 share/vim/${P}/keymap/russian-jcuken.vim
+share/vim/${P}/keymap/russian-jcukenmac.vim
 share/vim/${P}/keymap/russian-jcukenwin.vim
 share/vim/${P}/keymap/russian-jcukenwintype.vim
 share/vim/${P}/keymap/russian-yawerty.vim
@@ -1239,6 +1242,7 @@ share/vim/${P}/syntax/samba.vim
 share/vim/${P}/syntax/sas.vim
 share/vim/${P}/syntax/sass.vim
 share/vim/${P}/syntax/sather.vim
+share/vim/${P}/syntax/scala.vim
 share/vim/${P}/syntax/scheme.vim
 share/vim/${P}/syntax/scilab.vim
 share/vim/${P}/syntax/screen.vim


Re: UPDATE: vim

2016-09-18 Thread frantisek holop
next try.

moved icons no-no_x11, added gtk+3,-guic RDEP,
decided to drop the vim.desktop file, gvim is already there.


portcheck seems to have problems with this port,
probably because its mandatory FLAVOR selection?

/usr/ports/editors/vim$ /usr/ports/infrastructure/bin/portcheck
1 line(s) longer than 80 chars in Makefile
Fatal: You must select one GUI interface: no_x11, gtk2, athena or motif (in 
editors/vim)
*** Error 1 in /usr/ports/editors/vim 
(/usr/ports/infrastructure/mk/bsd.port.mk:3469 '.BEGIN': @exit 1)
Fatal: You must select one GUI interface: no_x11, gtk2, athena or motif (in 
editors/vim)
*** Error 1 in /usr/ports/editors/vim 
(/usr/ports/infrastructure/mk/bsd.port.mk:3469 '.BEGIN': @exit 1)
Fatal: You must select one GUI interface: no_x11, gtk2, athena or motif (in 
editors/vim)
*** Error 1 in /usr/ports/editors/vim 
(/usr/ports/infrastructure/mk/bsd.port.mk:3469 '.BEGIN': @exit 1)
in -main, FLAVOR "gtk2": Python module without compiled version, consider using 
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py: share/vim/vim80/
tools/demoserver.py
in -main, FLAVOR "athena": Python module without compiled version, consider 
using ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py: share/vim/vim8
0/tools/demoserver.py
in -main, FLAVOR "motif": Python module without compiled version, consider 
using ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py: share/vim/vim80
/tools/demoserver.py
in -main, FLAVOR "no_x11": Python module without compiled version, consider 
using ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py: share/vim/vim8
0/tools/demoserver.py
Fatal: You must select one GUI interface: no_x11, gtk2, athena or motif (in 
editors/vim)
*** Error 1 in /usr/ports/editors/vim 
(/usr/ports/infrastructure/mk/bsd.port.mk:3469 '.BEGIN': @exit 1)
Fatal: You must select one GUI interface: no_x11, gtk2, athena or motif (in 
editors/vim)
...
...
...


-- 
many would be cowards if they had enough courage.
Index: Makefile
===
RCS file: /cvs/ports/editors/vim/Makefile,v
retrieving revision 1.151
diff -u -p -r1.151 Makefile
--- Makefile13 Sep 2016 22:38:14 -  1.151
+++ Makefile18 Sep 2016 23:00:39 -
@@ -3,8 +3,7 @@
 COMMENT-main=  vi clone, many additional features
 COMMENT-lang=  vi clone, NLS subpackage
 
-V= 7.4.2181
-REVISION=  0
+V= 8.0.0004
 DISTNAME=  vim-$V
 DISTFILES= vim-$V{v$V}.tar.gz
 PKGNAME-main=  vim-$V
@@ -167,6 +166,7 @@ post-install:
${INSTALL_DATA} ${WRKDIST}/runtime/vim48x48.png 
${PREFIX}/share/pixmaps/vim.png
 
 RUN_DEPENDS+= devel/desktop-file-utils
+RUN_DEPENDS+= x11/gtk+3,-guic
 .endif
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/editors/vim/distinfo,v
retrieving revision 1.48
diff -u -p -r1.48 distinfo
--- distinfo10 Aug 2016 15:54:29 -  1.48
+++ distinfo18 Sep 2016 23:00:39 -
@@ -1,2 +1,2 @@
-SHA256 (vim-7.4.2181.tar.gz) = cT2WPgz34CwxNfK531Urmvh+tyFXavtXmx4QoS2ZFlg=
-SIZE (vim-7.4.2181.tar.gz) = 12854298
+SHA256 (vim-8.0.0004.tar.gz) = O6Cur4bJ+J6lXWFEuC82+C061bfvzTk9Bonm7CypcO8=
+SIZE (vim-8.0.0004.tar.gz) = 12909073
Index: pkg/PFRAG.no-no_x11-main
===
RCS file: /cvs/ports/editors/vim/pkg/PFRAG.no-no_x11-main,v
retrieving revision 1.7
diff -u -p -r1.7 PFRAG.no-no_x11-main
--- pkg/PFRAG.no-no_x11-main14 Oct 2014 13:52:19 -  1.7
+++ pkg/PFRAG.no-no_x11-main18 Sep 2016 23:00:39 -
@@ -15,7 +15,19 @@ bin/rgvim
 @man man/man1/rgview.1
 @man man/man1/rgvim.1
 share/applications/gvim.desktop
+share/icons/hicolor/48x48/apps/gvim.png
+share/icons/locolor/
+share/icons/locolor/16x16/
+share/icons/locolor/16x16/apps/
+share/icons/locolor/16x16/apps/gvim.png
+share/icons/locolor/32x32/
+share/icons/locolor/32x32/apps/
+share/icons/locolor/32x32/apps/gvim.png
 share/pixmaps/
 share/pixmaps/vim.png
 @exec %D/bin/update-desktop-database
 @unexec-delete %D/bin/update-desktop-database
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/locolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/locolor
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/editors/vim/pkg/PLIST-main,v
retrieving revision 1.15
diff -u -p -r1.15 PLIST-main
--- pkg/PLIST-main  10 Aug 2016 15:54:29 -  1.15
+++ pkg/PLIST-main  18 Sep 2016 23:00:39 -
@@ -444,6 +444,7 @@ share/vim/${P}/ftplugin/rrst.vim
 share/vim/${P}/ftplugin/rst.vim
 share/vim/${P}/ftplugin/ruby.vim
 share/vim/${P}/ftplugin/sass.vim
+share/vim/${P}/ftplugin/scala.vim
 share/vim/${P}/ftplugin/scheme.vim
 share/vim/${P}/ftplugin/screen.vim
 share/vim/${P}/ftplugin/scss.vim
@@ -582,6 +583,7 @@ share/vim/${P}/indent/rrst.vim
 

Re: UPDATE: vim

2016-09-15 Thread frantisek holop
Stuart Henderson, 15 Sep 2016 10:11:
> On 2016/09/15 01:09, frantisek holop wrote:
> > is it a rocket? is it an aeroplane? is it the emacs
> > killer?
> > --- pkg/PLIST-main  10 Aug 2016 15:54:29 -  1.15
> > +++ pkg/PLIST-main  14 Sep 2016 23:06:30 -
> > @@ -17,6 +17,15 @@ bin/vimtutor
> >  @man man/man1/vimdiff.1
> >  @man man/man1/vimtutor.1
> >  @man man/man1/xxd.1
> > +share/applications/vim.desktop
> 
> This should be in PFRAG.no-no_x11-main (otherwise you need
> update-desktop-database bits in PLIST-main and an extra dep on
> desktop-file-utils).

it was indeed fishy that suddenly it showed up in the
main PLIST.

> > +share/icons/hicolor/48x48/apps/gvim.png
> > +share/icons/locolor/
> > +share/icons/locolor/16x16/
> > +share/icons/locolor/16x16/apps/
> > +share/icons/locolor/16x16/apps/gvim.png
> > +share/icons/locolor/32x32/
> > +share/icons/locolor/32x32/apps/
> > +share/icons/locolor/32x32/apps/gvim.png
> 
> Also to no-no_x11-main - and I think this needs an x11/gtk+3,-guic dep
> and gtk-update-icon-cache @execs (portcheck should tell you about this).

 bring in gtk+3 just for a bunch of icons?
there is already an icon in pixmaps.  couldn't this
wait until we actually build vim (also) with gtk+3?

> The rest looks sane, will test later.

thanks for looking into it.
will run portcheck now every time.

-f
-- 
excellent day to have a rotten day.



Re: UPDATE: vim

2016-09-15 Thread Stuart Henderson
On 2016/09/15 01:09, frantisek holop wrote:
> is it a rocket? is it an aeroplane? is it the emacs
> killer?
> --- pkg/PLIST-main10 Aug 2016 15:54:29 -  1.15
> +++ pkg/PLIST-main14 Sep 2016 23:06:30 -
> @@ -17,6 +17,15 @@ bin/vimtutor
>  @man man/man1/vimdiff.1
>  @man man/man1/vimtutor.1
>  @man man/man1/xxd.1
> +share/applications/vim.desktop

This should be in PFRAG.no-no_x11-main (otherwise you need
update-desktop-database bits in PLIST-main and an extra dep on
desktop-file-utils).

> +share/icons/hicolor/48x48/apps/gvim.png
> +share/icons/locolor/
> +share/icons/locolor/16x16/
> +share/icons/locolor/16x16/apps/
> +share/icons/locolor/16x16/apps/gvim.png
> +share/icons/locolor/32x32/
> +share/icons/locolor/32x32/apps/
> +share/icons/locolor/32x32/apps/gvim.png

Also to no-no_x11-main - and I think this needs an x11/gtk+3,-guic dep
and gtk-update-icon-cache @execs (portcheck should tell you about this).

The rest looks sane, will test later.

>  share/vim/
>  share/vim/${P}/
>  share/vim/${P}/autoload/
> @@ -444,6 +453,7 @@ share/vim/${P}/ftplugin/rrst.vim
>  share/vim/${P}/ftplugin/rst.vim
>  share/vim/${P}/ftplugin/ruby.vim
>  share/vim/${P}/ftplugin/sass.vim
> +share/vim/${P}/ftplugin/scala.vim
>  share/vim/${P}/ftplugin/scheme.vim
>  share/vim/${P}/ftplugin/screen.vim
>  share/vim/${P}/ftplugin/scss.vim
> @@ -582,6 +592,7 @@ share/vim/${P}/indent/rrst.vim
>  share/vim/${P}/indent/rst.vim
>  share/vim/${P}/indent/ruby.vim
>  share/vim/${P}/indent/sass.vim
> +share/vim/${P}/indent/scala.vim
>  share/vim/${P}/indent/scheme.vim
>  share/vim/${P}/indent/scss.vim
>  share/vim/${P}/indent/sdl.vim
> @@ -661,6 +672,7 @@ share/vim/${P}/keymap/polish-slash_iso-8
>  share/vim/${P}/keymap/polish-slash_utf-8.vim
>  share/vim/${P}/keymap/russian-dvorak.vim
>  share/vim/${P}/keymap/russian-jcuken.vim
> +share/vim/${P}/keymap/russian-jcukenmac.vim
>  share/vim/${P}/keymap/russian-jcukenwin.vim
>  share/vim/${P}/keymap/russian-jcukenwintype.vim
>  share/vim/${P}/keymap/russian-yawerty.vim
> @@ -1239,6 +1251,7 @@ share/vim/${P}/syntax/samba.vim
>  share/vim/${P}/syntax/sas.vim
>  share/vim/${P}/syntax/sass.vim
>  share/vim/${P}/syntax/sather.vim
> +share/vim/${P}/syntax/scala.vim
>  share/vim/${P}/syntax/scheme.vim
>  share/vim/${P}/syntax/scilab.vim
>  share/vim/${P}/syntax/screen.vim



Re: UPDATE: vim

2016-08-21 Thread frantisek holop
Stuart Henderson, 10 Aug 2016 10:22:
> On 2016/08/09 23:49, frantisek holop wrote:
> > yeah, i guess this is not a very good strategy
> > so here is a simple update without the gtk3 efforts :]
> > 
> > please test and commit.
> 
> Looks good, I will confirm/commit later today.

thanks for updating the port.

the 2 patch files not needed anymore:

patch-runtime_syntax_c_vim
patch-src_vim_h

are still present as 0 byte files.
is that because of my cvs lameness?
i did a cvs rm on those files before diff-ing.

-f
-- 
small world, but i wouldn't want to paint it.



Re: UPDATE: vim

2016-08-10 Thread Stuart Henderson
On 2016/08/09 23:49, frantisek holop wrote:
> yeah, i guess this is not a very good strategy
> so here is a simple update without the gtk3 efforts :]
> 
> please test and commit.

Looks good, I will confirm/commit later today.



Re: UPDATE: vim

2016-08-09 Thread frantisek holop
and come to think of it, i don't even like gtk3.
the new firefox is no improvement in any way for me.
there are way fewer themes, and it feels slow as well.

i had a nice semi-personal gtk2 theme and i'll have
to waste a lot of time to get gtk3 there again.
gotta love evolution.

-f
-- 
lsd will make your cga screen display 16.2 million colors



Re: UPDATE: vim

2016-08-09 Thread frantisek holop
yeah, i guess this is not a very good strategy
so here is a simple update without the gtk3 efforts :]

please test and commit.

-f
-- 
so you think you can tell heaven from hell.
Index: Makefile
===
RCS file: /cvs/ports/editors/vim/Makefile,v
retrieving revision 1.149
diff -u -p -r1.149 Makefile
--- Makefile29 May 2016 12:26:23 -  1.149
+++ Makefile9 Aug 2016 21:46:12 -
@@ -3,12 +3,11 @@
 COMMENT-main=  vi clone, many additional features
 COMMENT-lang=  vi clone, NLS subpackage
 
-V= 7.4.1467
+V= 7.4.2181
 DISTNAME=  vim-$V
 DISTFILES= vim-$V{v$V}.tar.gz
 PKGNAME-main=  vim-$V
 PKGNAME-lang=  vim-lang-$V
-REVISION-main= 1
 P= vim${V:R:S/.//}
 CATEGORIES=editors
 MASTER_SITES=  https://github.com/vim/vim/archive/
@@ -157,11 +156,11 @@ post-configure:
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/vim/vimfiles/{doc,syntax}
${INSTALL_DATA} ${FILESDIR}/openbsd.vim \
-   ${PREFIX}/share/vim/vimfiles/syntax/
+   ${PREFIX}/share/vim/vimfiles/syntax/
 
 .if ! ${FLAVOR:Mno_x11}
${INSTALL_DATA_DIR} ${PREFIX}/share/applications
-   ${SUBST_DATA} ${FILESDIR}/gvim.desktop \
+   ${SUBST_DATA} ${WRKDIST}/runtime/gvim.desktop \
${PREFIX}/share/applications/gvim.desktop
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
${INSTALL_DATA} ${WRKDIST}/runtime/vim48x48.png 
${PREFIX}/share/pixmaps/vim.png
Index: distinfo
===
RCS file: /cvs/ports/editors/vim/distinfo,v
retrieving revision 1.47
diff -u -p -r1.47 distinfo
--- distinfo2 Mar 2016 11:54:28 -   1.47
+++ distinfo9 Aug 2016 21:46:12 -
@@ -1,2 +1,2 @@
-SHA256 (vim-7.4.1467.tar.gz) = d2HUWbUlc7JT0+lEb3L2H7LgAAuZMoAzL6DS6kKRlq0=
-SIZE (vim-7.4.1467.tar.gz) = 12532588
+SHA256 (vim-7.4.2181.tar.gz) = cT2WPgz34CwxNfK531Urmvh+tyFXavtXmx4QoS2ZFlg=
+SIZE (vim-7.4.2181.tar.gz) = 12854298
Index: files/gvim.desktop
===
RCS file: files/gvim.desktop
diff -N files/gvim.desktop
--- files/gvim.desktop  16 Dec 2013 10:19:34 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,80 +0,0 @@
-[Desktop Entry]
-Name=GVim
-GenericName=Text Editor
-GenericName[de]=Texteditor
-Comment=Edit text files
-Comment[af]=Redigeer tekslêers
-Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
-Comment[ar]=حرّر ملفات نصية
-Comment[az]=Mətn fayllarını redaktə edin
-Comment[be]=Рэдагаваньне тэкставых файлаў
-Comment[bg]=Редактиране на текстови файлове
-Comment[bn]=টেক্স্ট ফাইল এডিট করুন
-Comment[bs]=Izmijeni tekstualne datoteke
-Comment[ca]=Edita fitxers de text
-Comment[cs]=Úprava textových souborů
-Comment[cy]=Golygu ffeiliau testun
-Comment[da]=Redigér tekstfiler
-Comment[de]=Textdateien bearbeiten
-Comment[el]=Επεξεργασία αρχείων κειμένου
-Comment[en_CA]=Edit text files
-Comment[en_GB]=Edit text files
-Comment[es]=Edita archivos de texto
-Comment[et]=Redigeeri tekstifaile
-Comment[eu]=Editatu testu-fitxategiak
-Comment[fa]=ویرایش پرونده‌های متنی
-Comment[fi]=Muokkaa tekstitiedostoja
-Comment[fr]=Édite des fichiers texte
-Comment[ga]=Eagar comhad Téacs
-Comment[gu]=લખાણ ફાઇલોમાં ફેરફાર કરો
-Comment[he]=ערוך קבצי טקסט
-Comment[hi]=पाठ फ़ाइलें संपादित करें
-Comment[hr]=Uređivanje tekstualne datoteke
-Comment[hu]=Szövegfájlok szerkesztése
-Comment[id]=Edit file teks
-Comment[it]=Modifica file di testo
-Comment[ja]=テキスト・ファイルを編集します
-Comment[kn]=ಪಠ್ಯ ಕಡತಗಳನ್ನು ಸಂಪಾದಿಸು
-Comment[ko]=텍스트 파일을 편집합니다
-Comment[lt]=Redaguoti tekstines bylas
-Comment[lv]=Rediģēt teksta failus
-Comment[mk]=Уреди текстуални фајлови
-Comment[ml]=വാചക രചനകള് തിരുത്തുക
-Comment[mn]=Текст файл боловсруулах
-Comment[mr]=गद्य फाइल संपादित करा
-Comment[ms]=Edit fail teks
-Comment[nb]=Rediger tekstfiler
-Comment[ne]=पाठ फाइललाई संशोधन गर्नुहोस्
-Comment[nl]=Tekstbestanden bewerken
-Comment[nn]=Rediger tekstfiler
-Comment[no]=Rediger tekstfiler
-Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ
-Comment[pa]=ਪਾਠ ਫਾਇਲਾਂ ਸੰਪਾਦਨ
-Comment[pl]=Edytor plików tekstowych
-Comment[pt]=Editar ficheiros de texto
-Comment[pt_BR]=Edite arquivos de texto
-Comment[ro]=Editare fişiere text
-Comment[ru]=Редактор текстовых файлов
-Comment[sk]=Úprava textových súborov
-Comment[sl]=Urejanje datotek z besedili
-Comment[sq]=Përpuno files teksti
-Comment[sr]=Измени текстуалне датотеке
-Comment[sr@Latn]=Izmeni tekstualne datoteke
-Comment[sv]=Redigera textfiler
-Comment[ta]=உரை கோப்புகளை தொகுக்கவும்
-Comment[th]=แก้ไขแฟ้มข้อความ
-Comment[tk]=Metin faýllary editle
-Comment[tr]=Metin dosyalarını düzenle
-Comment[uk]=Редактор текстових файлів
-Comment[vi]=Soạn thảo tập tin văn bản
-Comment[wa]=Asspougnî des fitchîs tecses
-Comment[zh_CN]=编辑文本文件
-Comment[zh_TW]=編輯文字檔
-TryExec=gvim
-Exec=${TRUEPREFIX}/bin/gvim -f %F
-Terminal=false
-Type=Application
-Icon=vim
-Categories=Utility;TextEditor;
-StartupNotify=true
-MimeType=text/plain;
Index: 

Re: update: vim 7.4.31

2013-09-23 Thread Stuart Henderson
On 2013/09/22 00:10, Stuart Henderson wrote:
 Here's an update to vim (there was a recent release 7.4, and I've pulled
 in the post-release patches as of now). Also to slightly reduce size of
 the main package I've moved the non-English tutor files to the -lang
 subpackage, along with the menus and manpages which were already there.
 (There's not a huge difference, but seeing as this is something which
 plenty of users install on every system, it's probably worthwhile).
 
 ckuethe, do you still want to stay listed as maintainer?
 
 Any test reports, comments, OKs?

hmm, let's skip this for now, syntax highlighting is significantly
slower than with 7.3.850. I'll send another diff, possibly for an earlier
version, when I've worked out what's going on.



Re: update: vim 7.4.31

2013-09-23 Thread Liviu Daia
On 23 September 2013, Stuart Henderson st...@openbsd.org wrote:
 On 2013/09/22 00:10, Stuart Henderson wrote:
  Here's an update to vim (there was a recent release 7.4, and I've
  pulled in the post-release patches as of now). Also to slightly
  reduce size of the main package I've moved the non-English tutor
  files to the -lang subpackage, along with the menus and manpages
  which were already there.  (There's not a huge difference, but
  seeing as this is something which plenty of users install on every
  system, it's probably worthwhile).
 
  ckuethe, do you still want to stay listed as maintainer?
 
  Any test reports, comments, OKs?

 hmm, let's skip this for now, syntax highlighting is significantly
 slower than with 7.3.850. I'll send another diff, possibly for an
 earlier version, when I've worked out what's going on.

It's the new non-backtracking regexp engine at work (see :help
new-regexp-engine).  It's supposed to be faster than the old one for
complex patterns, but in practice it can be 10+ times slower for things
like syntax highlighting. :) You can turn it off completely with

set re = 1

If you have a file that illustrates pathologically slow highlighting
you might want to post it to the vim_dev list, so that the few
masochists who haven't turned off yet the new engine can analyse it and
improve the syntax patterns.  Upgrading the runtime files from Mercurial
does help somewhat, too.

Regards,

Liviu Daia



Re: update: vim 7.4.31

2013-09-21 Thread Stuart Henderson
On 2013/09/22 00:10, Stuart Henderson wrote:
 ckuethe, do you still want to stay listed as maintainer?

.. email bounces, so please let me have an alternative if you're
reading and want to stay listed :)