From a832188b01a583c8ec2c8bc3543872334aa9dd30 Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Thu, 16 Feb 2017 14:17:31 +0300
Subject: [PATCH] Don't set PERL_PATH in sturtup scripts. Synchronize with Arch
 Linux.

---
 git/PKGBUILD      |  1 -
 perl/PKGBUILD     | 11 ++++++++---
 perl/perlbin.csh  |  2 +-
 perl/perlbin.fish | 10 ++++++++++
 perl/perlbin.sh   | 19 +++++++------------
 5 files changed, 26 insertions(+), 17 deletions(-)
 create mode 100644 perl/perlbin.fish

diff --git a/git/PKGBUILD b/git/PKGBUILD
index d0c55c3b..a942bfae 100644
--- a/git/PKGBUILD
+++ b/git/PKGBUILD
@@ -93,7 +93,6 @@ prepare() {
 
 build() {
   export PYTHON_PATH='/usr/bin/python2'
-  export PERL_PATH=/usr/bin/perl
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --build=${CHOST} \
diff --git a/perl/PKGBUILD b/perl/PKGBUILD
index fa171c0c..02c62658 100644
--- a/perl/PKGBUILD
+++ b/perl/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=perl
 pkgver=5.24.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A highly capable, feature-rich programming language"
 arch=(i686 x86_64)
 license=('GPL' 'PerlArtistic')
@@ -13,6 +13,7 @@ makedepends=('libdb-devel' 'libgdbm-devel' 'libcrypt-devel')
 source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2
         perlbin.sh
         perlbin.csh
+        perlbin.fish
         perl.cygwin-auto-image-base.patch
         perl.cygwin-hints.patch
         perl.cygwin-Configure-libpth.patch
@@ -139,8 +140,9 @@ provides=('perl-Archive-Tar=2.04_01'
 # Add your own provides here
 provides=(${provides[@]})
 sha256sums=('482ac5dca262b57d26c381382a3e057b22ede631fcce32523c004b8bf773f6f0'
-            'a02db738d30fa3a9fd77c7e57667315c5276337e055e92e1d3e59c05f0490aca'
-            '8a8331eea71b067ab63602e751617478f299f5946b9d02a93bbe491d50c5cf41'
+            '91bf8a45a3f04f51fe0eca146a71e278d41dbde19ba60dabc1e41c4639477c07'
+            '478a52dc440d5ca324f4c95238b39cc8c90d5d7d8d5601fa085ffef79fea04f4'
+            '11ce66bcf4803b0bf27179a32ce53f41bcdfa967c4c0d54ac103dbc4951d18a3'
             'f0af221deed2227a92df0d3e6b35dd49c5327def36f8dc59e4749b13d3b09e00'
             'f5ceb0210479622d179ff138f386720538116b2672bb7e422568e8dd74de1f01'
             'f2367862beeb11b2a65f8e5ef6cb0f622b016bc37535664d09abd5cbe562f688'
@@ -225,6 +227,9 @@ package() {
   # Profile script to set paths to perl scripts on csh. (FS#22441)
   install -D -m755 ${srcdir}/perlbin.csh \
                   ${pkgdir}/etc/profile.d/perlbin.csh
+  # Profile script to set paths to perl scripts on fish. (FS#51191)
+  install -D -m755 ${srcdir}/perlbin.fish \
+                  ${pkgdir}/usr/share/fish/vendor_conf.d/perlbin.fish
 
   # Add the dirs so new installs will already have them in PATH once they
   # install their first perl programm
diff --git a/perl/perlbin.csh b/perl/perlbin.csh
index 535f0b18..fccecbdf 100644
--- a/perl/perlbin.csh
+++ b/perl/perlbin.csh
@@ -1,5 +1,5 @@
 # Set path to perl scriptdirs if they exist
-# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts
+# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_scripts
 # Added /usr/bin/*_perl dirs for scripts
 # Remove /usr/lib/perl5/*_perl/bin in next release
 
diff --git a/perl/perlbin.fish b/perl/perlbin.fish
new file mode 100644
index 00000000..1f52ebbb
--- /dev/null
+++ b/perl/perlbin.fish
@@ -0,0 +1,10 @@
+# Set path to perl scriptdirs if they exist
+# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_scripts
+
+if status --is-login
+    for perldir in /usr/bin/site_perl /usr/bin/vendor_perl /usr/bin/core_perl
+        if test -d $perldir
+            set PATH $PATH $perldir
+        end
+    end
+end
diff --git a/perl/perlbin.sh b/perl/perlbin.sh
index e247fccd..2a83f6d5 100644
--- a/perl/perlbin.sh
+++ b/perl/perlbin.sh
@@ -1,22 +1,17 @@
 # Set path to perl scriptdirs if they exist
-# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts
+# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_scripts
 # Added /usr/bin/*_perl dirs for scripts
 # Remove /usr/lib/perl5/*_perl/bin in next release
 
-if test -z "${PERL_PATH}"; then
+[ -d /usr/bin/site_perl ] && PATH=$PATH:/usr/bin/site_perl
+[ -d /usr/lib/perl5/site_perl/bin ] && PATH=$PATH:/usr/lib/perl5/site_perl/bin
 
-    [ -d /usr/bin/site_perl ] && PERL_PATH="${PERL_PATH:+${PERL_PATH}:}/usr/bin/site_perl"
-    [ -d /usr/lib/perl5/site_perl/bin ] && PERL_PATH="${PERL_PATH:+${PERL_PATH}:}/usr/lib/perl5/site_perl/bin"
+[ -d /usr/bin/vendor_perl ] && PATH=$PATH:/usr/bin/vendor_perl
+[ -d /usr/lib/perl5/vendor_perl/bin ] && PATH=$PATH:/usr/lib/perl5/vendor_perl/bin
 
-    [ -d /usr/bin/vendor_perl ] && PERL_PATH="${PERL_PATH:+${PERL_PATH}:}/usr/bin/vendor_perl"
-    [ -d /usr/lib/perl5/vendor_perl/bin ] && PERL_PATH="${PERL_PATH:+${PERL_PATH}:}/usr/lib/perl5/vendor_perl/bin"
+[ -d /usr/bin/core_perl ] && PATH=$PATH:/usr/bin/core_perl
 
-    [ -d /usr/bin/core_perl ] && PERL_PATH="${PERL_PATH:+${PERL_PATH}:}/usr/bin/core_perl"
-
-fi
-
-export PERL_PATH PATH="${PATH}:${PERL_PATH}"
+export PATH
 
 # If you have modules in non-standard directories you can add them here.
 #export PERLLIB=dir1:dir2
-