From ba4217f7183fb76ae1774062c06ae5d77cc1b2f7 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 13 Jan 2020 00:11:55 +0000
Subject: Mon Jan 13 00:11:55 UTC 2020

a/elvis-2.2_0-x86_64-5.txz:  Rebuilt.
  Don't make /usr/bin/{ex,vi} symlinks.
a/kernel-generic-5.4.11-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.4.11-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.4.11-x86_64-1.txz:  Upgraded.
a/nvi-1.81.6-x86_64-1.txz:  Added.
  This is an implementation of the classic ex/vi text editor written by Keith
  Bostic. Due to this having UTF8 support which elvis lacks, we'll have it
  take over the ex/vi symlinks if they aren't already pointing to a different
  choice. Note that the removal of vi/ex symlinks from the elvis and vim
  packages might cause your ex/vi symlinks to point to this after all the ex/vi
  packages have been upgraded. You can set them to your preferences using
  pkgtool -> Setup -> vi-ex.
a/pkgtools-15.0-noarch-29.txz:  Rebuilt.
  Added an installer/pkgtool menu to select the default ex/vi editor.
ap/vim-8.2.0114-x86_64-1.txz:  Upgraded.
  Don't make /usr/bin/{ex,vi} symlinks.
d/kernel-headers-5.4.11-x86-1.txz:  Upgraded.
d/python-setuptools-45.0.0-x86_64-1.txz:  Upgraded.
k/kernel-source-5.4.11-noarch-1.txz:  Upgraded.
l/imagemagick-7.0.9_15-x86_64-1.txz:  Upgraded.
n/ethtool-5.4-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.2.0114-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
---
 source/ap/vim/doinst.sh           | 5 -----
 source/ap/vim/vim-gvim.SlackBuild | 6 +++---
 source/ap/vim/vim.SlackBuild      | 8 ++++----
 3 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 source/ap/vim/doinst.sh

(limited to 'source/ap/vim')

diff --git a/source/ap/vim/doinst.sh b/source/ap/vim/doinst.sh
deleted file mode 100644
index f1ccd5ca3..000000000
--- a/source/ap/vim/doinst.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-
-# If there's no vi link, take over:
-if [ ! -r usr/bin/vi ]; then
-  ( cd usr/bin ; ln -sf vim vi )
-fi
diff --git a/source/ap/vim/vim-gvim.SlackBuild b/source/ap/vim/vim-gvim.SlackBuild
index 5f15aec02..5bc65fc77 100755
--- a/source/ap/vim/vim-gvim.SlackBuild
+++ b/source/ap/vim/vim-gvim.SlackBuild
@@ -129,8 +129,6 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # Legacy binary links:
-( cd $PKG/usr/bin ; rm -rf ex )
-( cd $PKG/usr/bin ; ln -sf vim ex )
 ( cd $PKG/usr/bin ; rm -rf rview )
 ( cd $PKG/usr/bin ; ln -sf vim rview )
 ( cd $PKG/usr/bin ; rm -rf rvim )
@@ -142,9 +140,11 @@ fi
 ( cd $PKG/usr/bin ; rm -rf evim )
 ( cd $PKG/usr/bin ; ln -sf vim evim )
 
+# These should not be shipped:
+rm -f $PKG/usr/bin/{ex,vi}
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc.vim-gvim > $PKG/install/slack-desc
-zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/source/ap/vim/vim.SlackBuild b/source/ap/vim/vim.SlackBuild
index 725da7609..1e9cdd0ae 100755
--- a/source/ap/vim/vim.SlackBuild
+++ b/source/ap/vim/vim.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2013, 2016, 2018, 2019  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2013, 2016, 2018, 2019, 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -185,8 +185,6 @@ if [ -d $PKG/usr/man ]; then
 fi
 
 # Legacy binary links:
-( cd $PKG/usr/bin ; rm -rf ex )
-( cd $PKG/usr/bin ; ln -sf vim ex )
 ( cd $PKG/usr/bin ; rm -rf rview )
 ( cd $PKG/usr/bin ; ln -sf vim rview )
 ( cd $PKG/usr/bin ; rm -rf rvim )
@@ -198,6 +196,9 @@ fi
 ( cd $PKG/usr/bin ; rm -rf evim )
 ( cd $PKG/usr/bin ; ln -sf vim evim )
 
+# These should not be shipped:
+rm -f $PKG/usr/bin/{ex,vi}
+
 mkdir -p $PKG/usr/doc/vim-$VERSION
 cp -a README.txt $PKG/usr/doc/vim-$VERSION
 find $PKG/usr/doc/vim-$VERSION -type f | xargs chmod 644
@@ -221,7 +222,6 @@ config() {
 }
 config usr/share/vim/vimrc.new
 EOF
-zcat $CWD/doinst.sh.gz >> $PKG/install/doinst.sh
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-- 
cgit v1.2.3-65-gdbad