Update 804.030 --> 804.031

This fixes build under perl5.18.

Reviewed by:	perl@ mailing list

4 files changed, 16 insertions, 28 deletions

diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile
index af1ac2d9664c..5cc13c3cc8d8 100644
--- a/x11-toolkits/p5-Tk/Makefile
+++ b/x11-toolkits/p5-Tk/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Tk
-PORTVERSION=	804.030
-PORTREVISION=	1
+PORTVERSION=	804.031
 CATEGORIES=	x11-toolkits tk perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -42,7 +41,6 @@ MAN3=		Tie::Watch.3 \
 		Tk::Clipboard.3 \
 		Tk::CmdLine.3 \
 		Tk::ColorEditor.3 \
-		Tk::Common.3 \
 		Tk::Compound.3 \
 		Tk::ConfigSpecs.3 \
 		Tk::DItem.3 \
@@ -93,7 +91,6 @@ MAN3=		Tie::Watch.3 \
 		Tk::Scrolled.3 \
 		Tk::Spinbox.3 \
 		Tk::Submethods.3 \
-		Tk::SunConst.3 \
 		Tk::TList.3 \
 		Tk::Table.3 \
 		Tk::Tcl-perl.3 \
diff --git a/x11-toolkits/p5-Tk/distinfo b/x11-toolkits/p5-Tk/distinfo
index f978346d3b00..2cb7440908b0 100644
--- a/x11-toolkits/p5-Tk/distinfo
+++ b/x11-toolkits/p5-Tk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Tk-804.030.tar.gz) = 8b3d55ae2e9ae950a170cd46399660064920d6d7c3ba167bca40e533d26e8d78
-SIZE (Tk-804.030.tar.gz) = 6928048
+SHA256 (Tk-804.031.tar.gz) = ce8d857a82a77f6bad3f94c1a8c3e3f32d5489bfb41619c3b8cae00103428054
+SIZE (Tk-804.031.tar.gz) = 6932339
diff --git a/x11-toolkits/p5-Tk/files/patch-PNG_Makefile.PL b/x11-toolkits/p5-Tk/files/patch-PNG_Makefile.PL
index 491f93a52257..bf9fc0eb3781 100644
--- a/x11-toolkits/p5-Tk/files/patch-PNG_Makefile.PL
+++ b/x11-toolkits/p5-Tk/files/patch-PNG_Makefile.PL
@@ -1,22 +1,13 @@
---- PNG/Makefile.PL.orig	2010-01-12 08:23:36.000000000 -0500
-+++ PNG/Makefile.PL	2010-01-12 08:26:18.000000000 -0500
-@@ -16,7 +16,7 @@
-  }
+--- PNG/Makefile.PL.orig	2013-05-21 06:25:13.000000000 -0700
++++ PNG/Makefile.PL	2013-08-16 13:56:20.750936409 -0700
+@@ -23,8 +23,8 @@
+     chomp($libpng_libs   = `pkg-config --libs libpng`);
+ } else {
+     warn "'pkg-config libpng' failed, continue with fallback values for cflags and libs...\n";
+-    $libpng_cflags = '-I/usr/local/include';
+-    $libpng_libs   = '-lpng -lz -lm';
++    $libpng_cflags = '-I%%LOCALBASE%%/include';
++    $libpng_libs   = '-L%%LOCALBASE%%/lib -lpng -lz -lm';
+ }
  
  if ($Tk::MMtry::VERSION ge '4.007' &&
--    try_run("config/has_png.c",['-I/usr/local/include'],['-lpng -lz -lm']))
-+    try_run("config/has_png.c",['-I%%LOCALBASE%%/include'],['-L%%LOCALBASE%%/lib -lpng -lz -lm']))
-  {
-   Tk::MMutil::TkExtMakefile(
-        NAME         => 'Tk::PNG',
-@@ -24,8 +24,8 @@
-        XS_VERSION   => $Tk::Config::VERSION,
-        dist         => { COMPRESS => 'gzip -f9', SUFFIX => '.gz' },
-        OBJECT       => '$(O_FILES)',
--       INC          => '-I/usr/local/include',
--       LIBS         => ['-lpng -lz -lm'],
-+       INC          => '-I%%LOCALBASE%%/include',
-+       LIBS         => ['-L%%LOCALBASE%%/lib -lpng -lz -lm'],
-      );
-  }
- else
diff --git a/x11-toolkits/p5-Tk/pkg-plist b/x11-toolkits/p5-Tk/pkg-plist
index f82aad503cab..2a7366ca0336 100644
--- a/x11-toolkits/p5-Tk/pkg-plist
+++ b/x11-toolkits/p5-Tk/pkg-plist
@@ -32,7 +32,6 @@ bin/widget
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/ColorEdit.xpm
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/ColorEditor.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/ColorEditor.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/Common.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/Compound.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/Compound.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/Config.pm
@@ -51,9 +50,11 @@ bin/widget
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/Dirlist.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/Common.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/Common.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/LocalDrop.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/Rect.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/SunConst.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/SunConst.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/SunDrop.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/SunSite.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/DragDrop/XDNDDrop.pm
@@ -154,7 +155,6 @@ bin/widget
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/Stats.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/Submethods.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/Submethods.pod
-%%SITE_PERL%%/%%PERL_ARCH%%/Tk/SunConst.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/TList.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/TList.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/Table.pm