Vim: bump version (#4900)

* upstream patchset

app-editors/vim/vim-8.2.0647.recipe

@@ -10,72 +10,78 @@ configuration files.
 Despite this, Vim can be configured to work in a very simple (Notepad-like) \
 way, called evim or Easy Vim."
 HOMEPAGE="https://www.vim.org/"
-COPYRIGHT="1991-2019 Bram Moleenar et al."
+COPYRIGHT="1991-2020 Bram Moleenar et al."
 LICENSE="Vim"
-REVISION="4"
+REVISION="1"
 SOURCE_URI="https://github.com/vim/vim/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="3bfb6b0de36e96862933e49df93412a46a0914356ec16dd60a5ccbd5cdc46d25"
+CHECKSUM_SHA256="2528387233967e7e8cdcd28eedca290959b48d7cb471fd1aa6ea5edfc51f279c"
 SOURCE_FILENAME="vim-$portVersion.tar.gz"
-PATCHES="vim-$portVersion.patchset"
 
-ARCHITECTURES="x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
 
 PROVIDES="
 	vim = $portVersion
-	cmd:ex = $portVersion
-	cmd:gview = $portVersion
-	cmd:gvim = $portVersion
-	cmd:gvimdiff = $portVersion
-	cmd:rgview = $portVersion
-	cmd:rgvim = $portVersion
-	cmd:rview = $portVersion
-	cmd:rvim = $portVersion
-	cmd:vi = $portVersion
-	cmd:view = $portVersion
-	cmd:vim = $portVersion compat >= 8.1
-	cmd:vimdiff = $portVersion
-	cmd:vimtutor = $portVersion
-	cmd:xxd = $portVersion
+	cmd:ex$commandSuffix = $portVersion
+	cmd:gview$commandSuffix = $portVersion
+	cmd:gvim$commandSuffix = $portVersion
+	cmd:gvimdiff$commandSuffix = $portVersion
+	cmd:rgview$commandSuffix = $portVersion
+	cmd:rgvim$commandSuffix = $portVersion
+	cmd:rview$commandSuffix = $portVersion
+	cmd:rvim$commandSuffix = $portVersion
+	cmd:vi$commandSuffix = $portVersion
+	cmd:view$commandSuffix = $portVersion
+	cmd:vim$commandSuffix = $portVersion compat >= 8.1
+	cmd:vimdiff$commandSuffix = $portVersion
+	cmd:vimtutor$commandSuffix = $portVersion
+	cmd:xxd$commandSuffix = $portVersion
 	"
 REQUIRES="
-	haiku
-	lib:libiconv
-	lib:libintl
-	lib:libncurses >= 6
+	haiku$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix >= 6
 	"
 
 if [ $effectiveTargetArchitecture != "x86_gcc2" ] ; then
 	REQUIRES+="
-		lib:libssp
+		lib:libssp$secondaryArchSuffix
 	"
 fi
 
 BUILD_REQUIRES="
-	haiku_devel
-	devel:libiconv
-	devel:libintl
-#	devel:liblua
-	devel:libncurses >= 6
+	haiku${secondaryArchSuffix}_devel
+	devel:libiconv$secondaryArchSuffix
+	devel:libintl$secondaryArchSuffix
+#	devel:liblua$secondaryArchSuffix
+	devel:libncurses$secondaryArchSuffix >= 6
 	devel:libtclstub8.5
-"
+	"
 
 if [ $effectiveTargetArchitecture != "x86_gcc2" ] ; then
 	BUILD_REQUIRES+="
-		devel:libruby
+		devel:libruby$secondaryArchSuffix
 	"
 fi
 
 BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:find
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:gettext
 	cmd:grep
 	cmd:make
 #	cmd:perl
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:python2
-#	cmd:python3
+	cmd:python3
 	cmd:ruby
 	cmd:sed
 	"
@@ -89,7 +95,7 @@ BUILD()
 	autoconf
 
 	export CFLAGS="\
-		`pkg-config --cflags python2` \
+		`pkg-config --cflags python3` \
 		-fPIC"
 
 # CLI -------------------------------------------
@@ -97,21 +103,20 @@ BUILD()
 	# Clean objects from possible previous run to avoid mixup of GUI/CLI objects
 	rm objects/*.o || true
 
-	runConfigure ./configure \
+	runConfigure --omit-dirs binDir ./configure \
+ 		--bindir="$commandBinDir" \
 		--disable-gui \
-		--with-features=big \
+		--with-features=huge \
 		--enable-cscope \
-		--enable-multibyte \
 		--enable-pythoninterp=dynamic \
 		--enable-rubyinterp=dynamic \
 		--enable-tclinterp=dynamic \
-		--enable-terminal \
-		--with-compiledby=Haikuports
+		--with-compiledby=Haikuports \
+		--disable-terminal # FIXME: 'exit' command does not work
 #		--enable-luainterp=dynamic
 #		--enable-python3interp=dynamic currently broken
 #		--enable-perlinterp=dynamic not dynamic yet
 
-
 	make $jobArgs
 	cp vim vim.con # preserve gui-less executable
 	rm objects/*.o
@@ -125,15 +130,15 @@ BUILD()
 		sed -i "s|@MIDDLE@|$MIDDLE|" os_haiku.rdef
 		sed -i "s|@MINOR@|$MINOR|" os_haiku.rdef
 
-	runConfigure ./configure \
-		--with-features=big \
+	runConfigure --omit-dirs binDir ./configure \
+ 		--bindir="$commandBinDir" \
+		--with-features=huge \
 		--enable-cscope \
-		--enable-multibyte \
 		--enable-pythoninterp=dynamic \
 		--enable-rubyinterp=dynamic \
 		--enable-tclinterp==dynamic \
-		--with-compiledby=Haikuports
-#		--enable-terminal # FIXME builds, but does not display anything
+		--with-compiledby=Haikuports \
+		--disable-terminal # FIXME: Builds, but does not display anything
 #		--enable-luainterp=dynamic
 #		--enable-python3interp=dynamic currently broken
 #		--enable-perlinterp=dynamic not dynamic yet
@@ -144,15 +149,8 @@ BUILD()
 INSTALL()
 {
 	make install
-
-	cat << EOF > $dataDir/vim/vimrc
-" Workaround to get the themes and plugins work
-execute "set runtimepath+=" . substitute(system("finddir B_USER_SETTINGS_DIRECTORY"), '\n\+$', '', '') . "/vim"
-EOF
-
-	ln -s vim $binDir/vi
-
-	addAppDeskbarSymlink $binDir/gvim Vim
+	ln -s vim $commandBinDir/vi
+	addAppDeskbarSymlink $commandBinDir/gvim Vim
 }
 
 TEST()