8 files changed, 27 insertions, 23 deletions

diff --git a/lang/perl5.18/Makefile b/lang/perl5.18/Makefile
index 3b804b92615a..6d60e90b8ed1 100644
--- a/lang/perl5.18/Makefile
+++ b/lang/perl5.18/Makefile
@@ -59,7 +59,7 @@ PERL_MALLOC_CONFIGURE_OFF=	-Dusemymalloc=n
 PORTSCOUT=	limit:^${PERL_VER}.
 
 # Remember to update Mk/Uses/perl5.mk too.
-PERL_VERSION=	5.18.2
+PERL_VERSION=	5.18.4
 PERL_VER=	${PERL_VERSION:C/\.[0-9]+$//}
 PERL_ARCH=	mach
 SITE_PERL_REL?=	lib/perl5/site_perl/${PERL_VER}
diff --git a/lang/perl5.18/distinfo b/lang/perl5.18/distinfo
index cf1313b6fd7c..ae391c0d3fff 100644
--- a/lang/perl5.18/distinfo
+++ b/lang/perl5.18/distinfo
@@ -1,4 +1,4 @@
-SHA256 (perl/perl-5.18.2.tar.bz2) = 06a0cd490be36d829606aa41d8c9c4c72ae70542f8d4f23ec554335b3d9e2746
-SIZE (perl/perl-5.18.2.tar.bz2) = 14058513
+SHA256 (perl/perl-5.18.4.tar.bz2) = 1fb4d27b75cd244e849f253320260efe1750641aaff4a18ce0d67556ff1b96a5
+SIZE (perl/perl-5.18.4.tar.bz2) = 14059430
 SHA256 (perl/BSDPAN-20111107.tar.bz2) = 2f03218a592dc65ebfdc3c6b9394d91dcf4c53aa5290a08458b837baad5a21f9
 SIZE (perl/BSDPAN-20111107.tar.bz2) = 8448
diff --git a/lang/perl5.18/files/patch-Configure b/lang/perl5.18/files/patch-Configure
index 21ccd2c8c62e..9eda84eacfe4 100644
--- a/lang/perl5.18/files/patch-Configure
+++ b/lang/perl5.18/files/patch-Configure
@@ -1,6 +1,6 @@
---- Configure.orig	2010-07-14 15:28:45.000000000 +0000
-+++ Configure	2010-07-14 15:29:23.000000000 +0000
-@@ -4798,7 +4798,7 @@
+--- Configure.orig	2014-10-01 01:32:59 UTC
++++ Configure
+@@ -4730,7 +4730,7 @@
  libpth=''
  for xxx in $dlist
  do
@@ -9,7 +9,7 @@
  		case " $libpth " in
  		*" $xxx "*) ;;
  		*) libpth="$libpth $xxx";;
-@@ -9125,8 +9125,7 @@
+@@ -9143,8 +9143,7 @@
  
  : determine where add-on public executable scripts go
  case "$sitescript" in
diff --git a/lang/perl5.18/files/patch-cpan__ExtUtils-MakeMaker__lib__ExtUtils__MM_Any.pm b/lang/perl5.18/files/patch-cpan__ExtUtils-MakeMaker__lib__ExtUtils__MM_Any.pm
index b0b15f3d8909..7b75cef260c4 100644
--- a/lang/perl5.18/files/patch-cpan__ExtUtils-MakeMaker__lib__ExtUtils__MM_Any.pm
+++ b/lang/perl5.18/files/patch-cpan__ExtUtils-MakeMaker__lib__ExtUtils__MM_Any.pm
@@ -1,6 +1,6 @@
---- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm.orig	Wed Feb 15 12:20:43 2006
-+++ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm	Wed Feb 15 12:22:29 2006
-@@ -1069,13 +1069,14 @@ sub init_INSTALL_from_PREFIX {
+--- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm.orig	2014-10-01 01:32:59 UTC
++++ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
+@@ -1714,13 +1714,14 @@
            ('$(PREFIX)') x 3;
      }
      else {
diff --git a/lang/perl5.18/files/patch-cpan__ExtUtils-MakeMaker__t__INST_PREFIX.t b/lang/perl5.18/files/patch-cpan__ExtUtils-MakeMaker__t__INST_PREFIX.t
index 12d47848eb42..65c20f814634 100644
--- a/lang/perl5.18/files/patch-cpan__ExtUtils-MakeMaker__t__INST_PREFIX.t
+++ b/lang/perl5.18/files/patch-cpan__ExtUtils-MakeMaker__t__INST_PREFIX.t
@@ -1,6 +1,6 @@
---- cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t.orig	Wed Feb 15 12:46:31 2006
-+++ cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t	Wed Feb 15 12:46:52 2006
-@@ -16,7 +16,7 @@ BEGIN {
+--- cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t.orig	2014-10-01 01:32:59 UTC
++++ cpan/ExtUtils-MakeMaker/t/INST_PREFIX.t
+@@ -10,7 +10,7 @@
  }
  
  use strict;
@@ -9,8 +9,8 @@
  use MakeMaker::Test::Utils;
  use MakeMaker::Test::Setup::BFD;
  use ExtUtils::MakeMaker;
-@@ -62,7 +62,7 @@ like( $stdout->read, qr{
-                         Writing\ $Makefile\ for\ Big::Dummy\n
+@@ -58,7 +58,7 @@
+                         (?:Writing\ MYMETA.yml\ and\ MYMETA.json\n)?
  }x );
  
 -is( $mm->{PREFIX}, '$(SITEPREFIX)', 'PREFIX set based on INSTALLDIRS' );
diff --git a/lang/perl5.18/files/patch-BigInt.pm b/lang/perl5.18/files/patch-dist__Math-BigInt__lib__Math__BigInt.pm
index 8c56e2859ff4..a5cf7defba70 100644
--- a/lang/perl5.18/files/patch-BigInt.pm
+++ b/lang/perl5.18/files/patch-dist__Math-BigInt__lib__Math__BigInt.pm
@@ -1,5 +1,5 @@
---- dist/Math-BigInt/lib/Math/BigInt.pm-orig	2014-06-09 16:22:23.000000000 +0200
-+++ dist/Math-BigInt/lib/Math/BigInt.pm	2014-06-09 16:22:54.000000000 +0200
+--- dist/Math-BigInt/lib/Math/BigInt.pm.orig	2014-10-01 01:33:00 UTC
++++ dist/Math-BigInt/lib/Math/BigInt.pm
 @@ -62,7 +62,7 @@
  '>>='	=>	sub { $_[0]->brsft($_[1]); },
  
diff --git a/lang/perl5.18/files/patch-hints__freebsd.sh b/lang/perl5.18/files/patch-hints__freebsd.sh
index 42dd19c79b8c..a4cbcec4a402 100644
--- a/lang/perl5.18/files/patch-hints__freebsd.sh
+++ b/lang/perl5.18/files/patch-hints__freebsd.sh
@@ -1,4 +1,4 @@
---- hints/freebsd.sh
+--- hints/freebsd.sh.orig	2014-01-31 21:55:51 UTC
 +++ hints/freebsd.sh
 @@ -88,6 +88,8 @@
  	esac
@@ -20,7 +20,7 @@
  	;;
  esac
  
-@@ -125,7 +131,7 @@
+@@ -126,7 +132,7 @@
          else
              libpth="/usr/lib /usr/local/lib"
              glibpth="/usr/lib /usr/local/lib"
@@ -29,7 +29,7 @@
              lddlflags="-shared "
          fi
          cccdlflags='-DPIC -fPIC'
-@@ -133,7 +139,7 @@
+@@ -134,7 +140,7 @@
  *)
         libpth="/usr/lib /usr/local/lib"
         glibpth="/usr/lib /usr/local/lib"
@@ -38,8 +38,8 @@
          lddlflags="-shared "
          cccdlflags='-DPIC -fPIC'
         ;;
-@@ -143,7 +149,7 @@
- 0*|1*|2*|3*) ;;
+@@ -144,7 +150,7 @@
+ 0.*|1.*|2.*|3.*) ;;
  
  *)
 -	ccflags="${ccflags} -DHAS_FPSETMASK -DHAS_FLOATINGPOINT_H"
@@ -47,7 +47,7 @@
  	if /usr/bin/file -L /usr/lib/libc.so | /usr/bin/grep -vq "not stripped" ; then
  	    usenm=false
  	fi
-@@ -190,7 +196,9 @@
+@@ -191,7 +197,9 @@
  
  # This script UU/usethreads.cbu will get 'called-back' by Configure 
  # after it has prompted the user for whether to use threads.
diff --git a/lang/perl5.18/pkg-plist b/lang/perl5.18/pkg-plist
index d96ba0963606..0d8c6e284282 100644
--- a/lang/perl5.18/pkg-plist
+++ b/lang/perl5.18/pkg-plist
@@ -1616,6 +1616,8 @@ lib/perl5/%%PERL_VER%%/pod/perl5163delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl5180delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl5181delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl5182delta.pod
+lib/perl5/%%PERL_VER%%/pod/perl5183delta.pod
+lib/perl5/%%PERL_VER%%/pod/perl5184delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl561delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl56delta.pod
 lib/perl5/%%PERL_VER%%/pod/perl581delta.pod
@@ -2704,6 +2706,8 @@ man/man1/perl5163delta.1.gz
 man/man1/perl5180delta.1.gz
 man/man1/perl5181delta.1.gz
 man/man1/perl5182delta.1.gz
+man/man1/perl5183delta.1.gz
+man/man1/perl5184delta.1.gz
 man/man1/perl561delta.1.gz
 man/man1/perl56delta.1.gz
 man/man1/perl581delta.1.gz