Date: Fri, 16 Aug 2013 14:04:35 -0700 From: Cy Schubert <Cy.Schubert@komquats.com> To: perl@freebsd.org Subject: Update to p5-Tk Message-ID: <201308162104.r7GL4ZaG030772@slippy.cwsent.com>
next in thread | raw e-mail | index | archive | help
Would anybody on this list mind if I committed the following? It fixes a
build issue when perl-5.18 is used.
slippy$ svn diff
Index: Makefile
===================================================================
--- Makefile (revision 324816)
+++ Makefile (working copy)
@@ -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-
Index: distinfo
===================================================================
--- distinfo (revision 324816)
+++ distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (Tk-804.030.tar.gz) = 8b3d55ae2e9ae950a170cd46399660064920d6d7c3ba16
7bca40e533d26e8d78
-SIZE (Tk-804.030.tar.gz) = 6928048
+SHA256 (Tk-804.031.tar.gz) = ce8d857a82a77f6bad3f94c1a8c3e3f32d5489bfb41619
c3b8cae00103428054
+SIZE (Tk-804.031.tar.gz) = 6932339
Index: files/patch-PNG_Makefile.PL
===================================================================
--- files/patch-PNG_Makefile.PL (revision 324816)
+++ files/patch-PNG_Makefile.PL (working copy)
@@ -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
--
Cheers,
Cy Schubert <Cy.Schubert@komquats.com>
FreeBSD UNIX: <cy@FreeBSD.org> Web: http://www.FreeBSD.org
The need of the many outweighs the greed of the few.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308162104.r7GL4ZaG030772>