cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to vim 8.1.998

Browse Source 
- add gtk3 flavour

- rework detection of incompatible flavours, less copy-and-pasting
when making changes

- remove the "huge" flavour, it wasn't linked to the build anyway, and
the option set by this was already used by default upstream
This commit is contained in:
sthen 2019-03-08 01:55:36 +00:00
parent 9d70047202
commit aae3cc431f
7 changed files with 78 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editors/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.132 2019/01/13 19:10:26 rsadowski Exp $
# $OpenBSD: Makefile,v 1.133 2019/03/08 01:55:36 sthen Exp $
SUBDIR =
SUBDIR += abiword
@ -72,6 +72,9 @@
SUBDIR += vim,gtk2,lua
SUBDIR += vim,gtk2,perl,python,ruby
SUBDIR += vim,gtk2,perl,python3,ruby
SUBDIR += vim,gtk3,lua
SUBDIR += vim,gtk3,perl,python,ruby
SUBDIR += vim,gtk3,perl,python3,ruby
SUBDIR += vim,no_x11
SUBDIR += vim,no_x11,lua
SUBDIR += vim,no_x11,python

76
editors/vim/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.179 2019/01/24 09:32:15 sthen Exp $
# $OpenBSD: Makefile,v 1.180 2019/03/08 01:55:36 sthen Exp $
COMMENT-main= vi clone, many additional features
COMMENT-lang= vi clone, NLS subpackage
V= 8.1.0800
V= 8.1.0998
GH_ACCOUNT= vim
GH_PROJECT= vim
GH_TAGNAME= v$V
@ -18,6 +18,8 @@ CATEGORIES= editors
HOMEPAGE= https://www.vim.org/
MAINTAINER= Stuart Henderson <sthen@openbsd.org>
# donation-ware
PERMIT_PACKAGE_CDROM= Yes
@ -27,8 +29,11 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} devel/gettext
MULTI_PACKAGES= -main -lang
FLAVORS= huge gtk2 athena motif no_x11 lua perl python python3 ruby
FLAVOR?= gtk2
# UI flavours (pick one only)
FLAVORS+= gtk2 gtk3 athena motif no_x11
# others
FLAVORS+= lua perl python python3 ruby
FLAVOR?= gtk3
.include <bsd.port.arch.mk>
.if ${FLAVOR:Mno_x11}
@ -51,10 +56,6 @@ BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
MAKE_FLAGS+= STRIP=:
.endif
.if ${FLAVOR:Mhuge}
CONFIGURE_ARGS+= --with-features=huge
.endif
.if ${FLAVOR:Mlua}
MODULES+= lang/lua
MODLUA_VERSION= 5.1
@ -103,13 +104,16 @@ LIB_DEPENDS+= ${MODRUBY_LIB_DEPENDS}
WANTLIB+= m ${MODRUBY_WANTLIB}
.endif
.if ${FLAVOR:Mno_x11} && \
!${FLAVOR:Mmotif} && !${FLAVOR:Mathena} && !${FLAVOR:Mgtk2}
# GUI options, only one is allowed
.if ${FLAVOR:Mno_x11}
_GUISET+= ok
CONFIGURE_ARGS+= --disable-gui \
--without-x
WANTLIB+= m
.elif ${FLAVOR:Mmotif} && \
!${FLAVOR:Mno_x11} && !${FLAVOR:Mathena} && !${FLAVOR:Mgtk2}
.endif
.if ${FLAVOR:Mmotif}
_GUISET+= ok
CONFIGURE_ARGS+= --enable-gui="motif" \
--enable-fontset \
--enable-xim \
@ -117,30 +121,43 @@ CONFIGURE_ARGS+= --enable-gui="motif" \
CONFIGURE_ENV+= MOTIFHOME=${X11BASE}
LIB_DEPENDS+= x11/motif
WANTLIB += m ICE SM X11 Xmu Xpm Xt Xm
MAKE_ENV+=MOTIFLIB='-L${LOCALBASE}/lib -lXm'
.elif ${FLAVOR:Mathena} && \
!${FLAVOR:Mno_x11} && !${FLAVOR:Mmotif} && !${FLAVOR:Mgtk2}
MAKE_ENV+= MOTIFLIB='-L${LOCALBASE}/lib -lXm'
.endif
.if ${FLAVOR:Mathena}
_GUISET+= ok
CONFIGURE_ARGS+= --enable-gui="athena" \
--enable-fontset \
--enable-xim \
--with-x
WANTLIB += m ICE SM X11 Xaw Xmu Xpm Xt
.elif ${FLAVOR:Mgtk2} && \
!${FLAVOR:Mmotif} && !${FLAVOR:Mno_x11} && !${FLAVOR:Mathena}
.endif
.if ${FLAVOR:Mgtk2}
_GUISET+= ok
LIB_DEPENDS+= x11/gtk+2
CONFIGURE_ARGS+= --enable-gui="gtk2" \
--disable-gtk-check \
--enable-fontset \
--enable-gtk2-check \
--enable-xim \
--with-x
WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xpm Xrandr Xrender Xt atk-1.0 cairo
WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
WANTLIB += glib-2.0 gobject-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pthread z
.else
ERRORS= "Fatal: You must select one GUI interface: no_x11, gtk2, athena or motif"
WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
WANTLIB += Xinerama Xrandr Xrender Xt atk-1.0 cairo fontconfig
WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gobject-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 z
.endif
.if ${FLAVOR:Mgtk3}
_GUISET+= ok
LIB_DEPENDS+= x11/gtk+3
CONFIGURE_ARGS+= --enable-gui="gtk3" \
--enable-xim \
--with-x
WANTLIB += ICE SM X11 Xt atk-1.0 cairo cairo-gobject gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gobject-2.0 gtk-3 m pango-1.0 pangocairo-1.0
.endif
.if "${_GUISET}" != ok
ERRORS= "Fatal: You must select one (and only one) GUI interface: no_x11, gtk2, gtk3, athena or motif"
.endif
RUN_DEPENDS-lang= editors/vim,-main
@ -155,9 +172,8 @@ SUBST_VARS= P
ERRORS= "Fatal: Major version was updated; sync editors/vim-spell and update this check"
.endif
# CONFIGURE_STYLE=autoconf doesn't work
post-patch:
cd ${WRKSRC}; AUTOCONF_VERSION=${AUTOCONF_VERSION} autoconf
do-gen:
cd ${WRKSRC}; ${AUTOCONF_ENV} autoconf
post-configure:
touch ${WRKBUILD}/auto/config.mk

4
editors/vim/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (vim-8.1.0800.tar.gz) = 7MBN6lTrawlsXfkaPdvfsZ7rsq30qkgcdYJhVVy89XQ=
SIZE (vim-8.1.0800.tar.gz) = 14063039
SHA256 (vim-8.1.0998.tar.gz) = eEEBaU+WMOiNmHKFcn5RcDaZbI6U0uRnCwW0v/3Hr74=
SIZE (vim-8.1.0998.tar.gz) = 14065752

6
editors/vim/patches/patch-runtime_filetype_vim
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-runtime_filetype_vim,v 1.16 2018/06/01 17:50:43 rsadowski Exp $
$OpenBSD: patch-runtime_filetype_vim,v 1.17 2019/03/08 01:55:36 sthen Exp $
Index: runtime/filetype.vim
--- runtime/filetype.vim.orig
+++ runtime/filetype.vim
@@ -462,7 +462,7 @@ au BufNewFile,BufRead dict.conf,.dictrc setf dictconf
@@ -466,7 +466,7 @@ au BufNewFile,BufRead dict.conf,.dictrc setf dictconf
au BufNewFile,BufRead dictd.conf setf dictdconf
" Diff files
@ -11,7 +11,7 @@ Index: runtime/filetype.vim
au BufNewFile,BufRead *.patch
\ if getline(1) =~ '^From [0-9a-f]\{40\} Mon Sep 17 00:00:00 2001$' |
\ setf gitsendemail |
@@ -931,7 +931,7 @@ au BufNewFile,BufRead */etc/mail/aliases,*/etc/aliases
@@ -935,7 +935,7 @@ au BufNewFile,BufRead */etc/mail/aliases,*/etc/aliases
au BufNewFile,BufRead .mailcap,mailcap setf mailcap
" Makefile

19
editors/vim/patches/patch-runtime_syntax_make_vim
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-runtime_syntax_make_vim,v 1.6 2016/10/12 09:31:16 sthen Exp $
--- runtime/syntax/make.vim.orig Sun Oct 9 16:28:01 2016
+++ runtime/syntax/make.vim Wed Oct 12 10:01:36 2016
@@ -23,6 +23,9 @@ syn match makeInclude "^ *[-s]\=include"
$OpenBSD: patch-runtime_syntax_make_vim,v 1.7 2019/03/08 01:55:36 sthen Exp $
Index: runtime/syntax/make.vim
--- runtime/syntax/make.vim.orig
+++ runtime/syntax/make.vim
@@ -24,6 +24,9 @@ syn match makeInclude "^ *[-s]\=include"
syn match makeStatement "^ *vpath"
syn match makeExport "^ *\(export\|unexport\)\>"
syn match makeOverride "^ *override"
@ -11,7 +12,7 @@ $OpenBSD: patch-runtime_syntax_make_vim,v 1.6 2016/10/12 09:31:16 sthen Exp $
hi link makeOverride makeStatement
hi link makeExport makeStatement
@@ -38,25 +41,29 @@ syn case match
@@ -39,25 +42,29 @@ syn case match
" identifiers
syn region makeIdent start="\$(" skip="\\)\|\\\\" end=")" contains=makeStatement,makeIdent,makeSString,makeDString
syn region makeIdent start="\${" skip="\\}\|\\\\" end="}" contains=makeStatement,makeIdent,makeSString,makeDString
@ -46,12 +47,7 @@ $OpenBSD: patch-runtime_syntax_make_vim,v 1.6 2016/10/12 09:31:16 sthen Exp $
syn match makeCommandError "^\s\+\S.*" contained
syn region makeCommands start=";"hs=s+1 start="^\t" end="^[^\t#]"me=e-1,re=e-1 end="^$" contained contains=makeCmdNextLine,makeSpecial,makeComment,makeIdent,makePreCondit,makeDefine,makeDString,makeSString nextgroup=makeCommandError
@@ -64,14 +71,15 @@ syn match makeCmdNextLine "\\\n."he=e-1 contained
" Statements / Functions (GNU make)
-syn match makeStatement contained "(\(subst\|abspath\|addprefix\|addsuffix\|and\|basename\|call\|dir\|error\|eval\|filter-out\|filter\|findstring\|firstword\|flavor\|foreach\|if\|info\|join\|lastword\|notdir\|or\|origin\|patsubst\|realpath\|shell\|sort\|strip\|suffix\|value\|warning\|wildcard\|word\|wordlist\|words\)\>"ms=s+1
+syn match makeStatement contained "(\(subst\|addprefix\|addsuffix\|basename\|call\|dir\|error\|filter-out\|filter\|findstring\|firstword\|foreach\|if\|join\|notdir\|origin\|patsubst\|shell\|sort\|strip\|suffix\|warning\|wildcard\|word\|wordlist\|words\)\>"ms=s+1
@@ -69,10 +76,10 @@ syn match makeStatement contained "(\(abspath\|addpref
" Comment
if exists("make_microsoft")
@ -62,7 +58,6 @@ $OpenBSD: patch-runtime_syntax_make_vim,v 1.6 2016/10/12 09:31:16 sthen Exp $
- syn match makeComment "#$" contains=@Spell
+ syn region makeComment start="#" end="^$" end="[^\\]$" keepend contains=makeTodo
+ syn match makeComment "#$"
+
endif
syn keyword makeTodo TODO FIXME XXX contained

25
editors/vim/pkg/DESCR-main
View File

@ -10,19 +10,14 @@ commands are given with normal keyboard characters, so those who can type with
ten fingers can work very fast. Additionally, function keys can be mapped to
commands by the user, and the mouse can be used.
Vim runs under MS-Windows (NT, 2000, XP, Vista, 7, 8, 10), Macintosh, VMS and
almost all flavours of UNIX. Porting to other systems should not be very
difficult. Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me, Amiga DOS,
Atari MiNT, BeOS, RISC OS and OS/2. These are no longer maintained.
Flavors:
gtk2 - build using the Gtk+2 toolkit (default);
motif - build using the Motif toolkit;
athena - build using the Athena toolkit;
no_x11 - build without X11 support;
lua - build with Lua support;
perl - build with Perl support;
python - build with Python support;
python3 - build with Python3 support;
ruby - build with Ruby support;
huge - build with --with-features=huge.
gtk2 - build using the Gtk+2 toolkit
gtk3 - build using the Gtk+3 toolkit (default)
motif - build using the Motif toolkit
athena - build using the Athena toolkit
no_x11 - build without X11 support
lua - build with Lua support
perl - build with Perl support
python - build with Python support
python3 - build with Python3 support
ruby - build with Ruby support

7
editors/vim/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.29 2019/01/24 09:32:15 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.30 2019/03/08 01:55:36 sthen Exp $
@pkgpath ${BASE_PKGPATH}
%%gtk2%%
bin/ex
@ -308,6 +308,7 @@ share/vim/${P}/filetype.vim
share/vim/${P}/ftoff.vim
share/vim/${P}/ftplugin/
share/vim/${P}/ftplugin.vim
share/vim/${P}/ftplugin/8th.vim
share/vim/${P}/ftplugin/README.txt
share/vim/${P}/ftplugin/a2ps.vim
share/vim/${P}/ftplugin/aap.vim
@ -428,6 +429,7 @@ share/vim/${P}/ftplugin/manconf.vim
share/vim/${P}/ftplugin/markdown.vim
share/vim/${P}/ftplugin/matlab.vim
share/vim/${P}/ftplugin/mf.vim
share/vim/${P}/ftplugin/mma.vim
share/vim/${P}/ftplugin/modconf.vim
share/vim/${P}/ftplugin/mp.vim
share/vim/${P}/ftplugin/mplayerconf.vim
@ -787,6 +789,8 @@ share/vim/${P}/pack/dist/opt/justify/
share/vim/${P}/pack/dist/opt/justify/plugin/
share/vim/${P}/pack/dist/opt/justify/plugin/justify.vim
share/vim/${P}/pack/dist/opt/matchit/
share/vim/${P}/pack/dist/opt/matchit/autoload/
share/vim/${P}/pack/dist/opt/matchit/autoload/matchit.vim
share/vim/${P}/pack/dist/opt/matchit/doc/
share/vim/${P}/pack/dist/opt/matchit/doc/matchit.txt
share/vim/${P}/pack/dist/opt/matchit/doc/tags
@ -867,6 +871,7 @@ share/vim/${P}/spell/yi.vim
share/vim/${P}/synmenu.vim
share/vim/${P}/syntax/
share/vim/${P}/syntax/2html.vim
share/vim/${P}/syntax/8th.vim
share/vim/${P}/syntax/README.txt
share/vim/${P}/syntax/a2ps.vim
share/vim/${P}/syntax/a65.vim