Mon Jan 14 23:30:34 2013 UTC ()
Update to patchlevel 762.

Patches:
7.3.713  printf() can only align to bytes, not characters
7.3.714  :setlocal and :setglobal do not work in the sandbox
7.3.715  crash when calling setloclist() in BufUnload autocmd
7.3.716  error on exit when using Python 3
7.3.717  when changing font size only MS-Windows limits window size
7.3.718  when re-using the current buffer the buffer-local options stay
7.3.719  cannot run new version of cproto
7.3.720  proto files are outdated
7.3.721  Ruby interface defines local functions globally
7.3.722  Perl flags may contain "-g", which breaks "make proto"
7.3.723  various tiny problem.
7.3.724  building with Ruby and Tcl on MS-Windows 64 bit does not work
7.3.725  :aboveleft and :belowright have no effect on :copen
7.3.726  typos and duplicate info in README
7.3.727  can't always find Win32.mak when building GvimExt
7.3.728  cannot compile with MzScheme interface on Ubuntu 12.10
7.3.729  building with Ruby fails on some systems
7.3.730  crash in PHP file when using syntastic
7.3.731  Py3Init_vim() is exported uneccessarily
7.3.732  compiler warnings for function arguments
7.3.733  tests fail when including MzScheme
7.3.734  cannot put help files in a sub-directory
7.3.735  cannot build Ruby 1.9 with MingW or Cygwin
7.3.736  file name completion in input() escapes white space
7.3.737  when using do_cmdline() recursively did_endif is not reset
7.3.738  (after 7.3.730) unused function argument
7.3.739  computing number of lines may have an integer overflow
7.3.740  IOC tool complains about undefined behavior for int
7.3.741  (after 7.3.737) tiny build fails
7.3.742  leaking memory when :vimgrep restores the directory
7.3.743  (after 7.3.741) tiny build still fails
7.3.744  64 bit compiler warning
7.3.745  automatically setting 'ttymouse' doesn't work
7.3.746  memory leaks when using location lists
7.3.747  tab alignment does not work when characters are concealed
7.3.748  no tests for conceal mode
7.3.749  cannot build Python interface without multi-byte feature
7.3.750  the justify macro does not always work correctly
7.3.751  test 61 is flaky, it fails once in a while
7.3.752  test 49 script file doesn't fold properly
7.3.753  ":q" twice does not work when there is a QuitPre autocommand
7.3.754  latest nmake is not recognized
7.3.755  autoconf doesn't find Python 3 if it's called "python"
7.3.756  a location list can get a wrong count in :lvimgrep
7.3.757  issue 96: access freed memory if put command triggers autocmd
7.3.758  matchit plugin does not handle space in #ifdef
7.3.759  MS-Windows: Updating tabline is slow when there are many tabs
7.3.760  dv_ deletes the white space before the line
7.3.761  in Visual mode a "-p does not work
7.3.762  (after 7.3.759) on some systems the tabline is not redraw.

pkgsrc changes:
- cleanup vim-xaw by adding -lXaw first, so --as-needed will work now
- remove some old entries in vim-xaw

Will fix PR 47281.


(morr)
diff -r1.12 -r1.13 pkgsrc/editors/vim-lang/PLIST
diff -r1.17 -r1.18 pkgsrc/editors/vim-share/PLIST
diff -r1.136 -r1.137 pkgsrc/editors/vim-share/distinfo
diff -r1.87 -r1.88 pkgsrc/editors/vim-share/version.mk
diff -r1.54 -r1.55 pkgsrc/editors/vim-xaw/Makefile

cvs diff -r1.12 -r1.13 pkgsrc/editors/vim-lang/PLIST (expand / switch to unified diff)

--- pkgsrc/editors/vim-lang/PLIST 2012/10/30 22:39:07 1.12
+++ pkgsrc/editors/vim-lang/PLIST 2013/01/14 23:30:33 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.12 2012/10/30 22:39:07 morr Exp $ 1@comment $NetBSD: PLIST,v 1.13 2013/01/14 23:30:33 morr Exp $
2man/fr.ISO8859-1/man1/evim.1 2man/fr.ISO8859-1/man1/evim.1
3man/fr.ISO8859-1/man1/ex.1 3man/fr.ISO8859-1/man1/ex.1
4man/fr.ISO8859-1/man1/rview.1 4man/fr.ISO8859-1/man1/rview.1
5man/fr.ISO8859-1/man1/rvim.1 5man/fr.ISO8859-1/man1/rvim.1
6man/fr.ISO8859-1/man1/view.1 6man/fr.ISO8859-1/man1/view.1
7man/fr.ISO8859-1/man1/vim.1 7man/fr.ISO8859-1/man1/vim.1
8man/fr.ISO8859-1/man1/vimdiff.1 8man/fr.ISO8859-1/man1/vimdiff.1
9man/fr.ISO8859-1/man1/vimtutor.1 9man/fr.ISO8859-1/man1/vimtutor.1
10man/fr.UTF-8/man1/evim.1 10man/fr.UTF-8/man1/evim.1
11man/fr.UTF-8/man1/ex.1 11man/fr.UTF-8/man1/ex.1
12man/fr.UTF-8/man1/rview.1 12man/fr.UTF-8/man1/rview.1
13man/fr.UTF-8/man1/rvim.1 13man/fr.UTF-8/man1/rvim.1
14man/fr.UTF-8/man1/view.1 14man/fr.UTF-8/man1/view.1
@@ -175,26 +175,27 @@ share/vim/${VIM_SUBDIR}/lang/menu_af_af. @@ -175,26 +175,27 @@ share/vim/${VIM_SUBDIR}/lang/menu_af_af.
175share/vim/${VIM_SUBDIR}/lang/menu_ca.latin1.vim 175share/vim/${VIM_SUBDIR}/lang/menu_ca.latin1.vim
176share/vim/${VIM_SUBDIR}/lang/menu_ca.utf-8.vim 176share/vim/${VIM_SUBDIR}/lang/menu_ca.utf-8.vim
177share/vim/${VIM_SUBDIR}/lang/menu_ca_es.latin1.vim 177share/vim/${VIM_SUBDIR}/lang/menu_ca_es.latin1.vim
178share/vim/${VIM_SUBDIR}/lang/menu_ca_es.utf-8.vim 178share/vim/${VIM_SUBDIR}/lang/menu_ca_es.utf-8.vim
179share/vim/${VIM_SUBDIR}/lang/menu_chinese(gb)_gb.936.vim 179share/vim/${VIM_SUBDIR}/lang/menu_chinese(gb)_gb.936.vim
180share/vim/${VIM_SUBDIR}/lang/menu_chinese(taiwan)_taiwan.950.vim 180share/vim/${VIM_SUBDIR}/lang/menu_chinese(taiwan)_taiwan.950.vim
181share/vim/${VIM_SUBDIR}/lang/menu_chinese_gb.936.vim 181share/vim/${VIM_SUBDIR}/lang/menu_chinese_gb.936.vim
182share/vim/${VIM_SUBDIR}/lang/menu_chinese_taiwan.950.vim 182share/vim/${VIM_SUBDIR}/lang/menu_chinese_taiwan.950.vim
183share/vim/${VIM_SUBDIR}/lang/menu_cs.cp1250.vim 183share/vim/${VIM_SUBDIR}/lang/menu_cs.cp1250.vim
184share/vim/${VIM_SUBDIR}/lang/menu_cs.latin1.vim 184share/vim/${VIM_SUBDIR}/lang/menu_cs.latin1.vim
185share/vim/${VIM_SUBDIR}/lang/menu_cs_cz.cp1250.vim 185share/vim/${VIM_SUBDIR}/lang/menu_cs_cz.cp1250.vim
186share/vim/${VIM_SUBDIR}/lang/menu_cs_cz.iso_8859-2.vim 186share/vim/${VIM_SUBDIR}/lang/menu_cs_cz.iso_8859-2.vim
187share/vim/${VIM_SUBDIR}/lang/menu_cs_cz.latin1.vim 187share/vim/${VIM_SUBDIR}/lang/menu_cs_cz.latin1.vim
 188share/vim/${VIM_SUBDIR}/lang/menu_cs_cz.utf-8.vim
188share/vim/${VIM_SUBDIR}/lang/menu_czech_czech_republic.1250.vim 189share/vim/${VIM_SUBDIR}/lang/menu_czech_czech_republic.1250.vim
189share/vim/${VIM_SUBDIR}/lang/menu_czech_czech_republic.1252.vim 190share/vim/${VIM_SUBDIR}/lang/menu_czech_czech_republic.1252.vim
190share/vim/${VIM_SUBDIR}/lang/menu_czech_czech_republic.ascii.vim 191share/vim/${VIM_SUBDIR}/lang/menu_czech_czech_republic.ascii.vim
191share/vim/${VIM_SUBDIR}/lang/menu_de.latin1.vim 192share/vim/${VIM_SUBDIR}/lang/menu_de.latin1.vim
192share/vim/${VIM_SUBDIR}/lang/menu_de.utf-8.vim 193share/vim/${VIM_SUBDIR}/lang/menu_de.utf-8.vim
193share/vim/${VIM_SUBDIR}/lang/menu_de_de.latin1.vim 194share/vim/${VIM_SUBDIR}/lang/menu_de_de.latin1.vim
194share/vim/${VIM_SUBDIR}/lang/menu_de_de.utf-8.vim 195share/vim/${VIM_SUBDIR}/lang/menu_de_de.utf-8.vim
195share/vim/${VIM_SUBDIR}/lang/menu_en_gb.latin1.vim 196share/vim/${VIM_SUBDIR}/lang/menu_en_gb.latin1.vim
196share/vim/${VIM_SUBDIR}/lang/menu_en_gb.utf-8.vim 197share/vim/${VIM_SUBDIR}/lang/menu_en_gb.utf-8.vim
197share/vim/${VIM_SUBDIR}/lang/menu_english_united_kingdom.1252.vim 198share/vim/${VIM_SUBDIR}/lang/menu_english_united_kingdom.1252.vim
198share/vim/${VIM_SUBDIR}/lang/menu_english_united_kingdom.ascii.vim 199share/vim/${VIM_SUBDIR}/lang/menu_english_united_kingdom.ascii.vim
199share/vim/${VIM_SUBDIR}/lang/menu_eo.utf-8.vim 200share/vim/${VIM_SUBDIR}/lang/menu_eo.utf-8.vim
200share/vim/${VIM_SUBDIR}/lang/menu_eo_eo.utf-8.vim 201share/vim/${VIM_SUBDIR}/lang/menu_eo_eo.utf-8.vim

cvs diff -r1.17 -r1.18 pkgsrc/editors/vim-share/PLIST (expand / switch to unified diff)

--- pkgsrc/editors/vim-share/PLIST 2012/10/30 22:39:07 1.17
+++ pkgsrc/editors/vim-share/PLIST 2013/01/14 23:30:34 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.17 2012/10/30 22:39:07 morr Exp $ 1@comment $NetBSD: PLIST,v 1.18 2013/01/14 23:30:34 morr Exp $
2bin/xxd 2bin/xxd
3man/man1/evim.1 3man/man1/evim.1
4man/man1/vim.1 4man/man1/vim.1
5man/man1/vimdiff.1 5man/man1/vimdiff.1
6man/man1/vimtutor.1 6man/man1/vimtutor.1
7man/man1/xxd.1 7man/man1/xxd.1
8share/vim/${VIM_SUBDIR}/autoload/README.txt 8share/vim/${VIM_SUBDIR}/autoload/README.txt
9share/vim/${VIM_SUBDIR}/autoload/ada.vim 9share/vim/${VIM_SUBDIR}/autoload/ada.vim
10share/vim/${VIM_SUBDIR}/autoload/adacomplete.vim 10share/vim/${VIM_SUBDIR}/autoload/adacomplete.vim
11share/vim/${VIM_SUBDIR}/autoload/ccomplete.vim 11share/vim/${VIM_SUBDIR}/autoload/ccomplete.vim
12share/vim/${VIM_SUBDIR}/autoload/csscomplete.vim 12share/vim/${VIM_SUBDIR}/autoload/csscomplete.vim
13share/vim/${VIM_SUBDIR}/autoload/decada.vim 13share/vim/${VIM_SUBDIR}/autoload/decada.vim
14share/vim/${VIM_SUBDIR}/autoload/getscript.vim 14share/vim/${VIM_SUBDIR}/autoload/getscript.vim
@@ -526,26 +526,27 @@ share/vim/${VIM_SUBDIR}/indent/tf.vim @@ -526,26 +526,27 @@ share/vim/${VIM_SUBDIR}/indent/tf.vim
526share/vim/${VIM_SUBDIR}/indent/tilde.vim 526share/vim/${VIM_SUBDIR}/indent/tilde.vim
527share/vim/${VIM_SUBDIR}/indent/treetop.vim 527share/vim/${VIM_SUBDIR}/indent/treetop.vim
528share/vim/${VIM_SUBDIR}/indent/vb.vim 528share/vim/${VIM_SUBDIR}/indent/vb.vim
529share/vim/${VIM_SUBDIR}/indent/verilog.vim 529share/vim/${VIM_SUBDIR}/indent/verilog.vim
530share/vim/${VIM_SUBDIR}/indent/vhdl.vim 530share/vim/${VIM_SUBDIR}/indent/vhdl.vim
531share/vim/${VIM_SUBDIR}/indent/vim.vim 531share/vim/${VIM_SUBDIR}/indent/vim.vim
532share/vim/${VIM_SUBDIR}/indent/xf86conf.vim 532share/vim/${VIM_SUBDIR}/indent/xf86conf.vim
533share/vim/${VIM_SUBDIR}/indent/xhtml.vim 533share/vim/${VIM_SUBDIR}/indent/xhtml.vim
534share/vim/${VIM_SUBDIR}/indent/xinetd.vim 534share/vim/${VIM_SUBDIR}/indent/xinetd.vim
535share/vim/${VIM_SUBDIR}/indent/xml.vim 535share/vim/${VIM_SUBDIR}/indent/xml.vim
536share/vim/${VIM_SUBDIR}/indent/xsd.vim 536share/vim/${VIM_SUBDIR}/indent/xsd.vim
537share/vim/${VIM_SUBDIR}/indent/xslt.vim 537share/vim/${VIM_SUBDIR}/indent/xslt.vim
538share/vim/${VIM_SUBDIR}/indent/yacc.vim 538share/vim/${VIM_SUBDIR}/indent/yacc.vim
 539share/vim/${VIM_SUBDIR}/indent/yaml.vim
539share/vim/${VIM_SUBDIR}/indent/zimbu.vim 540share/vim/${VIM_SUBDIR}/indent/zimbu.vim
540share/vim/${VIM_SUBDIR}/indent/zsh.vim 541share/vim/${VIM_SUBDIR}/indent/zsh.vim
541share/vim/${VIM_SUBDIR}/indoff.vim 542share/vim/${VIM_SUBDIR}/indoff.vim
542share/vim/${VIM_SUBDIR}/macros/README.txt 543share/vim/${VIM_SUBDIR}/macros/README.txt
543share/vim/${VIM_SUBDIR}/macros/dvorak 544share/vim/${VIM_SUBDIR}/macros/dvorak
544share/vim/${VIM_SUBDIR}/macros/editexisting.vim 545share/vim/${VIM_SUBDIR}/macros/editexisting.vim
545share/vim/${VIM_SUBDIR}/macros/hanoi/click.me 546share/vim/${VIM_SUBDIR}/macros/hanoi/click.me
546share/vim/${VIM_SUBDIR}/macros/hanoi/hanoi.vim 547share/vim/${VIM_SUBDIR}/macros/hanoi/hanoi.vim
547share/vim/${VIM_SUBDIR}/macros/hanoi/poster 548share/vim/${VIM_SUBDIR}/macros/hanoi/poster
548share/vim/${VIM_SUBDIR}/macros/justify.vim 549share/vim/${VIM_SUBDIR}/macros/justify.vim
549share/vim/${VIM_SUBDIR}/macros/less.bat 550share/vim/${VIM_SUBDIR}/macros/less.bat
550share/vim/${VIM_SUBDIR}/macros/less.sh 551share/vim/${VIM_SUBDIR}/macros/less.sh
551share/vim/${VIM_SUBDIR}/macros/less.vim 552share/vim/${VIM_SUBDIR}/macros/less.vim
@@ -1070,26 +1071,27 @@ share/vim/${VIM_SUBDIR}/syntax/sml.vim @@ -1070,26 +1071,27 @@ share/vim/${VIM_SUBDIR}/syntax/sml.vim
1070share/vim/${VIM_SUBDIR}/syntax/snnsnet.vim 1071share/vim/${VIM_SUBDIR}/syntax/snnsnet.vim
1071share/vim/${VIM_SUBDIR}/syntax/snnspat.vim 1072share/vim/${VIM_SUBDIR}/syntax/snnspat.vim
1072share/vim/${VIM_SUBDIR}/syntax/snnsres.vim 1073share/vim/${VIM_SUBDIR}/syntax/snnsres.vim
1073share/vim/${VIM_SUBDIR}/syntax/snobol4.vim 1074share/vim/${VIM_SUBDIR}/syntax/snobol4.vim
1074share/vim/${VIM_SUBDIR}/syntax/spec.vim 1075share/vim/${VIM_SUBDIR}/syntax/spec.vim
1075share/vim/${VIM_SUBDIR}/syntax/specman.vim 1076share/vim/${VIM_SUBDIR}/syntax/specman.vim
1076share/vim/${VIM_SUBDIR}/syntax/spice.vim 1077share/vim/${VIM_SUBDIR}/syntax/spice.vim
1077share/vim/${VIM_SUBDIR}/syntax/splint.vim 1078share/vim/${VIM_SUBDIR}/syntax/splint.vim
1078share/vim/${VIM_SUBDIR}/syntax/spup.vim 1079share/vim/${VIM_SUBDIR}/syntax/spup.vim
1079share/vim/${VIM_SUBDIR}/syntax/spyce.vim 1080share/vim/${VIM_SUBDIR}/syntax/spyce.vim
1080share/vim/${VIM_SUBDIR}/syntax/sql.vim 1081share/vim/${VIM_SUBDIR}/syntax/sql.vim
1081share/vim/${VIM_SUBDIR}/syntax/sqlanywhere.vim 1082share/vim/${VIM_SUBDIR}/syntax/sqlanywhere.vim
1082share/vim/${VIM_SUBDIR}/syntax/sqlforms.vim 1083share/vim/${VIM_SUBDIR}/syntax/sqlforms.vim
 1084share/vim/${VIM_SUBDIR}/syntax/sqlhana.vim
1083share/vim/${VIM_SUBDIR}/syntax/sqlinformix.vim 1085share/vim/${VIM_SUBDIR}/syntax/sqlinformix.vim
1084share/vim/${VIM_SUBDIR}/syntax/sqlj.vim 1086share/vim/${VIM_SUBDIR}/syntax/sqlj.vim
1085share/vim/${VIM_SUBDIR}/syntax/sqloracle.vim 1087share/vim/${VIM_SUBDIR}/syntax/sqloracle.vim
1086share/vim/${VIM_SUBDIR}/syntax/sqr.vim 1088share/vim/${VIM_SUBDIR}/syntax/sqr.vim
1087share/vim/${VIM_SUBDIR}/syntax/squid.vim 1089share/vim/${VIM_SUBDIR}/syntax/squid.vim
1088share/vim/${VIM_SUBDIR}/syntax/sshconfig.vim 1090share/vim/${VIM_SUBDIR}/syntax/sshconfig.vim
1089share/vim/${VIM_SUBDIR}/syntax/sshdconfig.vim 1091share/vim/${VIM_SUBDIR}/syntax/sshdconfig.vim
1090share/vim/${VIM_SUBDIR}/syntax/st.vim 1092share/vim/${VIM_SUBDIR}/syntax/st.vim
1091share/vim/${VIM_SUBDIR}/syntax/stata.vim 1093share/vim/${VIM_SUBDIR}/syntax/stata.vim
1092share/vim/${VIM_SUBDIR}/syntax/stp.vim 1094share/vim/${VIM_SUBDIR}/syntax/stp.vim
1093share/vim/${VIM_SUBDIR}/syntax/strace.vim 1095share/vim/${VIM_SUBDIR}/syntax/strace.vim
1094share/vim/${VIM_SUBDIR}/syntax/sudoers.vim 1096share/vim/${VIM_SUBDIR}/syntax/sudoers.vim
1095share/vim/${VIM_SUBDIR}/syntax/svg.vim 1097share/vim/${VIM_SUBDIR}/syntax/svg.vim

cvs diff -r1.136 -r1.137 pkgsrc/editors/vim-share/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/vim-share/distinfo 2012/10/30 22:39:07 1.136
+++ pkgsrc/editors/vim-share/distinfo 2013/01/14 23:30:34 1.137
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.136 2012/10/30 22:39:07 morr Exp $ 1$NetBSD: distinfo,v 1.137 2013/01/14 23:30:34 morr Exp $
2 2
3SHA1 (vim-7.3.712.tar.bz2) = a24b3a03a35aff71339b42ce14f26f3352768437 3SHA1 (vim-7.3.762.tar.bz2) = e7a7d2cdf7d8c84eb4027907f53ca8f822faba30
4RMD160 (vim-7.3.712.tar.bz2) = bd4dbd747fdfe119e607f6a58c1e9aeea35cebfe 4RMD160 (vim-7.3.762.tar.bz2) = 3248c2a59eaba6469292a812c6c2d43c53fda095
5Size (vim-7.3.712.tar.bz2) = 8998046 bytes 5Size (vim-7.3.762.tar.bz2) = 8961827 bytes
6SHA1 (patch-Makefile) = 55c75f6d3cc8ec204f2585b21d44b64b7700103e 6SHA1 (patch-Makefile) = 6b859d3ec6ff06c91516e05416b413d4e9cdb4b2
7SHA1 (patch-auto_configure) = e25c8821182231074033132d70dab077c273d5f8 7SHA1 (patch-auto_configure) = e25c8821182231074033132d70dab077c273d5f8
8SHA1 (patch-configure) = ae5970dec6d557d81da8a8f1da36d05ddc59ca56 8SHA1 (patch-configure) = ae5970dec6d557d81da8a8f1da36d05ddc59ca56
9SHA1 (patch-feature.h) = 7fc572f7d94e5342b32b9395c2632fa7ae528c39 9SHA1 (patch-feature.h) = 7fc572f7d94e5342b32b9395c2632fa7ae528c39
10SHA1 (patch-link.sh) = 24db881cea873330a8a3bf672f6135d0835651fd 10SHA1 (patch-link.sh) = 24db881cea873330a8a3bf672f6135d0835651fd

cvs diff -r1.87 -r1.88 pkgsrc/editors/vim-share/version.mk (expand / switch to unified diff)

--- pkgsrc/editors/vim-share/version.mk 2012/10/30 22:39:07 1.87
+++ pkgsrc/editors/vim-share/version.mk 2013/01/14 23:30:34 1.88
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1# $NetBSD: version.mk,v 1.87 2012/10/30 22:39:07 morr Exp $ 1# $NetBSD: version.mk,v 1.88 2013/01/14 23:30:34 morr Exp $
2 2
3VIM_VERSION= 7.3 3VIM_VERSION= 7.3
4VIM_PATCHLEVEL= 712 4VIM_PATCHLEVEL= 762
5VIM_SUBDIR= vim73 5VIM_SUBDIR= vim73

cvs diff -r1.54 -r1.55 pkgsrc/editors/vim-xaw/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/vim-xaw/Makefile 2012/12/18 23:30:36 1.54
+++ pkgsrc/editors/vim-xaw/Makefile 2013/01/14 23:30:34 1.55
@@ -1,56 +1,43 @@ @@ -1,56 +1,43 @@
1# $NetBSD: Makefile,v 1.54 2012/12/18 23:30:36 morr Exp $ 1# $NetBSD: Makefile,v 1.55 2013/01/14 23:30:34 morr Exp $
2 2
3PKGNAME= vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL} 3PKGNAME= vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL}
4PKGREVISION= 1 
5COMMENT= Vim editor (vi clone) with X11 Athena GUI 4COMMENT= Vim editor (vi clone) with X11 Athena GUI
6 5
7.include "../../editors/vim-share/Makefile.common" 6.include "../../editors/vim-share/Makefile.common"
8 7
9DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share 8DEPENDS+= vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
10CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]* 9CONFLICTS+= vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]*
11CONFLICTS+= vim-motif-[0-9]* vim-kde-[0-9]* 10CONFLICTS+= vim-motif-[0-9]* vim-kde-[0-9]*
12 11
13CONFIGURE_ARGS+= --enable-gui=athena 12CONFIGURE_ARGS+= --enable-gui=athena
14CONFIGURE_ARGS+= --with-tlib=${BUILDLINK_LIBNAME.termcap} 13CONFIGURE_ARGS+= --with-tlib=${BUILDLINK_LIBNAME.termcap}
15 14
16BUILD_TARGET= vim 15BUILD_TARGET= vim
17INSTALL_TARGET= installvimbin 16INSTALL_TARGET= installvimbin
18 17
19INSTALLATION_DIRS+= ${PKGMANDIR}/man1 18INSTALLATION_DIRS+= ${PKGMANDIR}/man1
20 19
21.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
22 21
23.if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm") 22.if defined(XAW_TYPE) && (${XAW_TYPE} == "3d" || ${XAW_TYPE} == "xpm")
24MAKE_ENV+= XAW_LIB="Xaw3d" 23MAKE_ENV+= XAW_LIB="-lXaw3d"
25.else 24.else
26XAW_TYPE= standard 25XAW_TYPE= standard
27MAKE_ENV+= XAW_LIB="Xaw" 26MAKE_ENV+= XAW_LIB="-lXaw"
28.endif 27.endif
29 28
30SUBST_CLASSES+= fix-linking 
31SUBST_STAGE.fix-linking= post-configure 
32SUBST_MESSAGE.fix-linking= Fixing linking 
33SUBST_FILES.fix-linking= auto/config.mk 
34SUBST_SED.fix-linking= -e 's,LINK_AS_NEEDED = .*,LINK_AS_NEEDED = no,g' 
35 
36LIBS+= -lXaw 
37 
38CHECK_INTERPRETER_SKIP+=${PKGMANDIR}/man1/gvim.1 ${PKGMANDIR}/man1/gview.1 
39CHECK_INTERPRETER_SKIP+=${PKGMANDIR}/man1/rgvim.1 ${PKGMANDIR}/man1/rgview.1 
40 
41post-install: 29post-install:
42.for f in gvim.1 gview.1 rgvim.1 rgview.1 30.for f in gvim.1 gview.1 rgvim.1 rgview.1
43 ${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${f} 31 ${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${f}
44 ${LN} -s vim.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${f} 32 ${LN} -s vim.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${f}
45.endfor 33.endfor
46.for f in gvim gview rgvim rgview rvim rview 34.for f in gvim gview rgvim rgview rvim rview
47 ${RM} -f ${DESTDIR}${PREFIX}/bin/${f} 35 ${RM} -f ${DESTDIR}${PREFIX}/bin/${f}
48 ${LN} -s vim ${DESTDIR}${PREFIX}/bin/${f} 36 ${LN} -s vim ${DESTDIR}${PREFIX}/bin/${f}
49.endfor 37.endfor
50 38
51.include "../../converters/libiconv/buildlink3.mk" 39.include "../../converters/libiconv/buildlink3.mk"
52.include "../../devel/gettext-lib/buildlink3.mk" 40.include "../../devel/gettext-lib/buildlink3.mk"
53.include "../../x11/libXpm/buildlink3.mk" 
54.include "../../mk/xaw.buildlink3.mk" 41.include "../../mk/xaw.buildlink3.mk"
55.include "../../mk/termcap.buildlink3.mk" 42.include "../../mk/termcap.buildlink3.mk"
56.include "../../mk/bsd.pkg.mk" 43.include "../../mk/bsd.pkg.mk"