5 files changed, 31 insertions, 20 deletions

diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile
index 5e34224bb319..dda506fde324 100644
--- a/x11-toolkits/p5-Tk/Makefile
+++ b/x11-toolkits/p5-Tk/Makefile
@@ -2,17 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	Tk
-PORTVERSION=	804.031
-PORTREVISION=	1
+PORTVERSION=	804.032
 CATEGORIES=	x11-toolkits tk perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	perl@FreeBSD.org
+MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Re-port of a perl5 interface to Tk8.4
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libjpeg.so.11:${PORTSDIR}/graphics/jpeg \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libfreetype.so:${PORTSDIR}/print/freetype2
 
 OPTIONS_DEFINE=	XFT
 OPTIONS_DEFAULT=	XFT
@@ -47,4 +47,12 @@ post-configure:
 		-e '/^FULL_AR = / s|.*|FULL_AR = ${AR}|' \
 		`${FIND} ${WRKSRC} -name Makefile`
 
+post-stage:
+	${FIND} ${STAGEDIR} -name '*.bs' -size 0c -exec ${RM} {} \;
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/mach/auto/Tk/Tk.so
+.for i in Canvas Compound Entry Event HList IO InputO JPEG Listbox Menubutton Mwm NBFrame PNG Pixmap Scale Scrollbar TList Text TixGrid WinPhoto X Xlib
+		${STRIP_CMD} \
+		    ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/mach/auto/Tk/${i}/${i}.so
+.endfor
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Tk/distinfo b/x11-toolkits/p5-Tk/distinfo
index 2cb7440908b0..a77b5f1c1f03 100644
--- a/x11-toolkits/p5-Tk/distinfo
+++ b/x11-toolkits/p5-Tk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Tk-804.031.tar.gz) = ce8d857a82a77f6bad3f94c1a8c3e3f32d5489bfb41619c3b8cae00103428054
-SIZE (Tk-804.031.tar.gz) = 6932339
+SHA256 (Tk-804.032.tar.gz) = 8003fa82672367093d8fd26d89dcac695afad92f4ad406a106d56e07e9dd5949
+SIZE (Tk-804.032.tar.gz) = 6933200
diff --git a/x11-toolkits/p5-Tk/files/patch-PNG_Makefile.PL b/x11-toolkits/p5-Tk/files/patch-PNG_Makefile.PL
deleted file mode 100644
index bf9fc0eb3781..000000000000
--- a/x11-toolkits/p5-Tk/files/patch-PNG_Makefile.PL
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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' &&
diff --git a/x11-toolkits/p5-Tk/files/patch-myConfig b/x11-toolkits/p5-Tk/files/patch-myConfig
new file mode 100644
index 000000000000..33b95d4cbd2b
--- /dev/null
+++ b/x11-toolkits/p5-Tk/files/patch-myConfig
@@ -0,0 +1,14 @@
+--- /tmp/myConfig	2014-06-11 22:11:24.000000000 +0200
++++ myConfig	2014-06-11 22:12:16.000000000 +0200
+@@ -147,9 +147,9 @@
+ {
+  foreach (map { "$_/freetype2" } @_)
+   {
+-   if (-d $_ && -d "$_/freetype" && -r "$_/freetype/freetype.h")
++   if (-d $_ && -r "$_/freetype.h")
+     {
+-     print "Using -I$_ to find $_/freetype/freetype.h\n";
++     print "Using -I$_ to find $_/freetype.h\n";
+      return "-I$_";
+     }
+   }
diff --git a/x11-toolkits/p5-Tk/pkg-plist b/x11-toolkits/p5-Tk/pkg-plist
index 78fd14a8cff7..00aa5c8bbf76 100644
--- a/x11-toolkits/p5-Tk/pkg-plist
+++ b/x11-toolkits/p5-Tk/pkg-plist
@@ -147,6 +147,8 @@ 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/ColorDialog.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/Tk/ColorSelect.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/Compound.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/Compound.pod
 %%SITE_PERL%%/%%PERL_ARCH%%/Tk/Config.pm