cleanups; upgrade

3 files changed, 28 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b521390cac15..384d7d02b0d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,11 @@
 pkgbase = vim-perl-support
 	pkgdesc = Perl-IDE offers easiest way to do all of the above, saving lot of time and keystrokes.
-	pkgver = 5.3.2
-	pkgrel = 2
-	url = http://vim.org/scripts/script.php?script_id=556
-	install = vimdoc.install
+	pkgver = 5.4
+	pkgrel = 1
+	url = https://www.vim.org/scripts/script.php?script_id=556
 	arch = any
 	groups = vim-plugins
 	license = GPL2
-	depends = vim-runtime
 	depends = perl
 	depends = vim-vim-support
 	optdepends = perl-perl-tags: to generate Ctags style tags for Perl sourcecode
@@ -16,9 +14,10 @@ pkgbase = vim-perl-support
 	optdepends = perl-devel-fastprof: to run "fast" perl per-line profiler
 	optdepends = perl-devel-nytprof: Powerful fast feature-rich perl source code profiler
 	optdepends = perl-tidy: Parses and beautifies perl source
+	noextract = vim-perl-support-5.4.zip
 	options = !emptydirs
-	source = vim-perl-support-5.3.2.zip::http://www.vim.org/scripts/download_script.php?src_id=22459
-	sha256sums = 78544a59adb00af2e29d3b69816255b8671d57bbb9cba23b1236b4e2d6294be7
+	source = vim-perl-support-5.4.zip::http://www.vim.org/scripts/download_script.php?src_id=24473
+	sha256sums = 40cadfcb64433557ad793ec71f0947fae6ec38b9d4b4af2e6ed0ee7b77156125
 
 pkgname = vim-perl-support
 
diff --git a/PKGBUILD b/PKGBUILD
index 58ec05f3f2f9..df46b35f67d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,42 @@
-# Maintainer: Piotr Rogoża <rogoza dot piotr at gmail dot com>
+# Maintainer: 3ED <krzysztofas /at/ protonmail /\./ com>
 # Contributor: Piotr Rogoża <rogoza dot piotr at gmail dot com>
-# vim:set ts=2 sw=2 et ft=sh tw=100:
 
 pkgname=vim-perl-support
-pkgver=5.3.2
-_src_id=22459
-pkgrel=2
+pkgver=5.4
+_src_id=24473
+pkgrel=1
 pkgdesc='Perl-IDE offers easiest way to do all of the above, saving lot of time and keystrokes.'
 arch=('any')
-url='http://vim.org/scripts/script.php?script_id=556'
+url='https://www.vim.org/scripts/script.php?script_id=556'
 license=('GPL2')
 groups=(vim-plugins)
-depends=(vim-runtime perl vim-vim-support)
+depends=(perl vim-vim-support)
 optdepends=(
-  'perl-perl-tags: to generate Ctags style tags for Perl sourcecode'
-  'perl-devel-smallprof: to run per-line Perl profiler'
-  'perl-critic: Critique Perl source code for best-practices'
-  'perl-devel-fastprof: to run "fast" perl per-line profiler'
-  'perl-devel-nytprof: Powerful fast feature-rich perl source code profiler'
-  'perl-tidy: Parses and beautifies perl source'
+	'perl-perl-tags: to generate Ctags style tags for Perl sourcecode'
+	'perl-devel-smallprof: to run per-line Perl profiler'
+	'perl-critic: Critique Perl source code for best-practices'
+	'perl-devel-fastprof: to run "fast" perl per-line profiler'
+	'perl-devel-nytprof: Powerful fast feature-rich perl source code profiler'
+	'perl-tidy: Parses and beautifies perl source'
 )
 options=(!emptydirs)
-install='vimdoc.install'
 source=("$pkgname-$pkgver.zip::http://www.vim.org/scripts/download_script.php?src_id=$_src_id")
+sha256sums=('40cadfcb64433557ad793ec71f0947fae6ec38b9d4b4af2e6ed0ee7b77156125')
+noextract=("$pkgname-$pkgver.zip")
 
 package() {
 	cd "$srcdir"
 	_vim_dir='/usr/share/vim/vimfiles'
 
-  install -dm755 $pkgdir/$_vim_dir
+	install -dm755 "$pkgdir/$_vim_dir"
 
-  tar -c ./  --exclude $pkgname-$pkgver.zip \
-    | tar -x -C $pkgdir/$_vim_dir
+	bsdtar -xf $pkgname-$pkgver.zip \
+		--exclude syntax/template.vim \
+		--exclude autoload/mmtemplates/core.vim \
+		--exclude doc/templatesupport.txt \
+		--directory "$pkgdir/$_vim_dir"
 
-	#mv $pkgdir/${_vim_dir}/README.perlsupport \
-	#	$pkgdir/${_vim_dir}/perl-support/doc/README.perlsupport
+	# note: exclusions should be inside vim-vim-support package
 
-  #conflict with vim-vim-support
-  #rm -f $pkgdir/${_vim_dir}/{autoload/mmtemplates/core.vim,doc/templatesupport.txt}
-  rm -f "$pkgdir"/usr/share/vim/vimfiles/syntax/template.vim \
-    "$pkgdir"/usr/share/vim/vimfiles/autoload/mmtemplates/core.vim \
-    "$pkgdir"/usr/share/vim/vimfiles/doc/templatesupport.txt
-
-
-  #fix perm
-#  find $pkgdir/$_vim_dir -type d -exec chmod 0755 '{}' ';'
-#  chmod o+r $pkgdir/${_vim_dir}/perl-support/doc/*
+	chmod -R a=,a+rX,u+w "$pkgdir/"
 }
-sha256sums=('78544a59adb00af2e29d3b69816255b8671d57bbb9cba23b1236b4e2d6294be7')
diff --git a/vimdoc.install b/vimdoc.install
deleted file mode 100644
index 66a417cca8ea..000000000000
--- a/vimdoc.install
+++ /dev/null
@@ -1,23 +0,0 @@
-vimdocinstall() {
-  echo -n "updating Vim help tags... "
-  /usr/bin/vim --noplugin -u NONE -U NONE \
-          --cmd ":helptags /usr/share/vim/vimfiles/doc" --cmd ":q" > /dev/null 2>&1
-  echo "done."
-}
-
-post_install() {
-	vimdocinstall
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-  vimdocinstall
-}
-
-op=$1
-shift
-
-$op $*