From ffbf152ddff5a75cf762b16061abc95082234a0b Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Wed, 22 Jul 2015 15:29:32 +0300
Subject: [PATCH] perl: Fix building.

---
 FAIL_LIST.md                                         | 2 --
 mingw-w64-perl/002-relocate-html-documentation.patch | 3 ++-
 mingw-w64-perl/PKGBUILD                              | 6 +++---
 mingw-w64-perl/perl-i686.install                     | 4 ++--
 mingw-w64-perl/perl-x86_64.install                   | 4 ++--
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/FAIL_LIST.md b/FAIL_LIST.md
index 2e6432d5fb..61cae36e55 100644
--- a/FAIL_LIST.md
+++ b/FAIL_LIST.md
@@ -57,8 +57,6 @@ List of packages that currently fail to build
 
 - openshadinglanguage
 
-- perl
-
 - plplot
 
 - qrupdate
diff --git a/mingw-w64-perl/002-relocate-html-documentation.patch b/mingw-w64-perl/002-relocate-html-documentation.patch
index c6ffc57264..384cffd4b0 100644
--- a/mingw-w64-perl/002-relocate-html-documentation.patch
+++ b/mingw-w64-perl/002-relocate-html-documentation.patch
@@ -4,8 +4,9 @@ diff -aur 001/win32/makefile.mk 002/win32/makefile.mk
 @@ -1349,7 +1349,7 @@
  
  doc: $(PERLEXE) ..\pod\perltoc.pod
- 	$(PERLEXE) ..\installhtml --podroot=.. --htmldir=$(HTMLDIR) \
+-	$(PERLEXE) ..\installhtml --podroot=.. --htmldir=$(HTMLDIR) \
 -	    --podpath=pod:lib:utils --htmlroot="file://$(INST_HTML:s,:,|,)"\
++	$(PERLEXE) -I..\lib ..\installhtml --podroot=.. --htmldir=$(HTMLDIR) \
 +	    --podpath=pod:lib:utils --htmlroot="@PERL_RELOCATE_HTML@/share/doc/perl5" \
  	    --recurse
  
diff --git a/mingw-w64-perl/PKGBUILD b/mingw-w64-perl/PKGBUILD
index 955b4da8d2..11a4e4a282 100644
--- a/mingw-w64-perl/PKGBUILD
+++ b/mingw-w64-perl/PKGBUILD
@@ -24,7 +24,7 @@ source=("http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2"
 
 md5sums=('f67b152160431b3180fb766bdc2d02e2'
          '03f65d7a7751d8c850ca62d9c88b939c'
-         'c13e4275aa8e819a319afddf73352318'
+         'b09f961437155056ca65cbf75035fae7'
          '51811b5b185394f9512b5470c2b623ca'
          'cd49b29a251adcc21fe87c66110cdc3a')
 
@@ -96,9 +96,9 @@ package() {
     sed -i "s/${pkgdir_pattern}/@PERL_RELOCATE@/g"                lib/perl5/core_perl/Config_heavy.pl
 
     for script in \
-        c2ph config_data corelist cpan enc2xs exetype find2perl h2ph h2xs instmodsh json_pp libnetcfg perlbug  \
+        c2ph corelist cpan enc2xs encguess exetype h2ph h2xs instmodsh json_pp libnetcfg perlbug  \
         perldoc perlglob perlivp perlthanks piconv pl2bat pl2pm pod2html pod2man pod2text pod2usage podchecker \
-        podselect prove psed pstruct ptar ptardiff ptargrep runperl s2p search shasum splain xsubpp zipdetails ; do
+        podselect prove pstruct ptar ptardiff ptargrep runperl search shasum splain xsubpp zipdetails ; do
         sed -i "s/${pkgdir_pattern}/@PERL_RELOCATE@/g" bin/${script}
     done
 }
diff --git a/mingw-w64-perl/perl-i686.install b/mingw-w64-perl/perl-i686.install
index a56faec631..840de2642d 100644
--- a/mingw-w64-perl/perl-i686.install
+++ b/mingw-w64-perl/perl-i686.install
@@ -17,9 +17,9 @@ post_install() {
     sed -i "s/@PERL_RELOCATE_DOUBLE@/${basedir_double}/g"  /mingw32/lib/perl5/core_perl/CORE/config.h
 
     _relocating scripts
-    for script in c2ph config_data corelist cpan enc2xs exetype find2perl h2ph h2xs instmodsh json_pp libnetcfg perlbug  \
+    for script in c2ph corelist cpan enc2xs encguess exetype h2ph h2xs instmodsh json_pp libnetcfg perlbug  \
         perldoc perlglob perlivp perlthanks piconv pl2bat pl2pm pod2html pod2man pod2text pod2usage podchecker podselect \
-        prove psed pstruct ptar ptardiff ptargrep runperl s2p search shasum splain xsubpp zipdetails ; do
+        prove pstruct ptar ptardiff ptargrep runperl search shasum splain xsubpp zipdetails ; do
         sed -i "s/@PERL_RELOCATE@/${basedir}/g" /mingw32/bin/${script}
     done
 
diff --git a/mingw-w64-perl/perl-x86_64.install b/mingw-w64-perl/perl-x86_64.install
index f2eb3576d8..54f7aea249 100644
--- a/mingw-w64-perl/perl-x86_64.install
+++ b/mingw-w64-perl/perl-x86_64.install
@@ -17,9 +17,9 @@ post_install() {
     sed -i "s/@PERL_RELOCATE_DOUBLE@/${basedir_double}/g"  /mingw64/lib/perl5/core_perl/CORE/config.h
 
     _relocating scripts
-    for script in c2ph config_data corelist cpan enc2xs exetype find2perl h2ph h2xs instmodsh json_pp libnetcfg perlbug  \
+    for script in c2ph corelist cpan enc2xs encguess exetype h2ph h2xs instmodsh json_pp libnetcfg perlbug  \
         perldoc perlglob perlivp perlthanks piconv pl2bat pl2pm pod2html pod2man pod2text pod2usage podchecker podselect \
-        prove psed pstruct ptar ptardiff ptargrep runperl s2p search shasum splain xsubpp zipdetails ; do
+        prove pstruct ptar ptardiff ptargrep runperl search shasum splain xsubpp zipdetails ; do
         sed -i "s/@PERL_RELOCATE@/${basedir}/g" /mingw64/bin/${script}
     done