patches to configure are no longer needed, and update to a newer patch.
works here - any test reports? ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/vim/Makefile,v
retrieving revision 1.133
diff -u -p -r1.133 Makefile
--- Makefile 16 Dec 2013 10:19:33 -0000 1.133
+++ Makefile 7 Jan 2014 22:23:07 -0000
@@ -3,10 +3,9 @@
COMMENT-main= vi clone, many additional features
COMMENT-lang= vi clone, NLS subpackage
-VERSION= 7.4.45
+VERSION= 7.4.135
DISTNAME= vim-${VERSION}
PKGNAME-main= vim-${VERSION}
-REVISION-main= 2
PKGNAME-lang= vim-lang-${VERSION}
P= vim${VERSION:R:S/.//}
CATEGORIES= editors
@@ -151,6 +150,7 @@ post-configure:
post-install:
${INSTALL_DATA} ${FILESDIR}/pf.vim ${FILESDIR}/openbsd.vim \
${PREFIX}/share/vim/${P}/syntax/
+
.if ! ${FLAVOR:Mno_x11}
${INSTALL_DATA_DIR} ${PREFIX}/share/applications
${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} -c \
@@ -158,7 +158,6 @@ post-install:
${PREFIX}/share/applications/gvim.desktop
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
${INSTALL_DATA} ${WRKDIST}/runtime/vim48x48.png
${PREFIX}/share/pixmaps/vim.png
-
RUN_DEPENDS+= devel/desktop-file-utils
.endif
Index: distinfo
===================================================================
RCS file: /cvs/ports/editors/vim/distinfo,v
retrieving revision 1.40
diff -u -p -r1.40 distinfo
--- distinfo 4 Oct 2013 08:44:03 -0000 1.40
+++ distinfo 7 Jan 2014 22:23:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (vim-7.4.45.tar.bz2) = mSdwRN7mAEhl05nogpZPTKQ3NTiPE9bjzwESIfv4Vd8=
-SIZE (vim-7.4.45.tar.bz2) = 9521246
+SHA256 (vim-7.4.135.tar.bz2) = Eq7rfNytPNFd2EY0hxe9nJTHwlmQU3lzxm2mE45wG3o=
+SIZE (vim-7.4.135.tar.bz2) = 9535915
Index: patches/patch-runtime_filetype_vim
===================================================================
RCS file: /cvs/ports/editors/vim/patches/patch-runtime_filetype_vim,v
retrieving revision 1.5
diff -u -p -r1.5 patch-runtime_filetype_vim
--- patches/patch-runtime_filetype_vim 4 Oct 2013 08:44:04 -0000 1.5
+++ patches/patch-runtime_filetype_vim 7 Jan 2014 22:23:07 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-runtime_filetype_vim,v 1.5 2013/10/04 08:44:04 sthen Exp $
---- runtime/filetype.vim.orig Sun Sep 29 20:11:05 2013
-+++ runtime/filetype.vim Tue Oct 1 09:20:02 2013
+--- runtime/filetype.vim.orig Tue Jan 7 05:09:28 2014
++++ runtime/filetype.vim Tue Jan 7 22:14:53 2014
@@ -71,6 +71,14 @@ func! s:Check_inp()
endif
endfunc
@@ -16,7 +16,7 @@ $OpenBSD: patch-runtime_filetype_vim,v 1
" A-A-P recipe
au BufNewFile,BufRead *.aap setf aap
-@@ -604,7 +612,7 @@ au BufNewFile,BufRead dict.conf,.dictrc setf
dictconf
+@@ -607,7 +615,7 @@ au BufNewFile,BufRead dict.conf,.dictrc setf
dictconf
au BufNewFile,BufRead dictd.conf setf dictdconf
" Diff files
@@ -25,7 +25,7 @@ $OpenBSD: patch-runtime_filetype_vim,v 1
" Dircolors
au BufNewFile,BufRead .dir_colors,.dircolors,*/etc/DIR_COLORS setf dircolors
-@@ -1094,7 +1102,7 @@ au BufNewFile,BufRead */etc/mail/aliases,*/etc/aliases
+@@ -1097,7 +1105,7 @@ au BufNewFile,BufRead */etc/mail/aliases,*/etc/aliases
au BufNewFile,BufRead .mailcap,mailcap setf mailcap
" Makefile
@@ -34,7 +34,7 @@ $OpenBSD: patch-runtime_filetype_vim,v 1
" MakeIndex
au BufNewFile,BufRead *.ist,*.mst setf ist
-@@ -2247,12 +2255,14 @@ au BufNewFile,BufRead *.vim,*.vba,.exrc,_exrc setf vim
+@@ -2254,12 +2262,14 @@ au BufNewFile,BufRead *.vim,*.vba,.exrc,_exrc setf vim
au BufNewFile,BufRead .viminfo,_viminfo setf viminfo
" Virata Config Script File or Drupal module
Index: patches/patch-src_auto_configure
===================================================================
RCS file: patches/patch-src_auto_configure
diff -N patches/patch-src_auto_configure
--- patches/patch-src_auto_configure 4 Oct 2013 08:44:04 -0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_auto_configure,v 1.10 2013/10/04 08:44:04 sthen Exp $
---- src/auto/configure.orig Fri Sep 20 19:13:53 2013
-+++ src/auto/configure Sat Sep 21 23:43:48 2013
-@@ -12049,6 +12049,7 @@ $as_echo_n "checking for sysctl... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #include <sys/types.h>
-+#include <sys/param.h>
- #include <sys/sysctl.h>
- int
- main ()
-@@ -12675,7 +12676,7 @@ if ac_fn_c_try_link "$LINENO"; then :
- $as_echo "gettext() works" >&6; }; have_gettext="yes"
- else
- olibs=$LIBS
-- LIBS="$LIBS -lintl"
-+ LIBS="$LIBS -lintl -liconv"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #include <libintl.h>
Index: patches/patch-src_option_c
===================================================================
RCS file: /cvs/ports/editors/vim/patches/patch-src_option_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_option_c
--- patches/patch-src_option_c 4 Oct 2013 08:45:21 -0000 1.1
+++ patches/patch-src_option_c 7 Jan 2014 22:23:07 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-src_option_c,v 1.1 2013/
Disable new NFA regexp engine for now, syntax highlighting is unusably
slow if malloc flag 'J' is used.
---- src/option.c.orig Tue Oct 1 08:50:58 2013
-+++ src/option.c Tue Oct 1 09:15:05 2013
-@@ -2097,7 +2097,7 @@ static struct vimoption
+--- src/option.c.orig Tue Jan 7 05:09:28 2014
++++ src/option.c Tue Jan 7 22:14:53 2014
+@@ -2098,7 +2098,7 @@ static struct vimoption
{(char_u *)2000L, (char_u *)0L} SCRIPTID_INIT},
{"regexpengine", "re", P_NUM|P_VI_DEF,
(char_u *)&p_re, PV_NONE,
