5 files changed, 34 insertions, 29 deletions

diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index cc00fa859292..fd2e1ea26a70 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -136,6 +136,7 @@
     SUBDIR += p5-Gtk2-TrayIcon
     SUBDIR += p5-GtkXmHTML
     SUBDIR += p5-Prima
+    SUBDIR += p5-TclTk
     SUBDIR += p5-Tcl-Tk
     SUBDIR += p5-Tk
     SUBDIR += p5-Tk-Autoscroll
diff --git a/x11-toolkits/p5-Tcl-Tk/Makefile b/x11-toolkits/p5-Tcl-Tk/Makefile
index 694fdd3c0fbb..5ff0855d1ef5 100644
--- a/x11-toolkits/p5-Tcl-Tk/Makefile
+++ b/x11-toolkits/p5-Tcl-Tk/Makefile
@@ -5,8 +5,8 @@
 # $FreeBSD$
 #
 
-PORTNAME=	TclTk
-PORTVERSION=	0.75
+PORTNAME=	Tcl-Tk
+PORTVERSION=	0.88
 CATEGORIES=	x11-toolkits lang perl5 tk82
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Tcl
@@ -15,17 +15,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl5 module to access to Tk via the Tcl extension
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Tcl.pm:${PORTSDIR}/lang/p5-Tcl
 LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Tcl::Tk.3
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601 # lang/p5-Tcl does
-IGNORE=         requires perl 5.6.x or later. Install lang/perl5 then try again
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Tcl-Tk/distinfo b/x11-toolkits/p5-Tcl-Tk/distinfo
index 47972893b72a..c1fa90f62709 100644
--- a/x11-toolkits/p5-Tcl-Tk/distinfo
+++ b/x11-toolkits/p5-Tcl-Tk/distinfo
@@ -1,3 +1,3 @@
-MD5 (TclTk-0.75.tar.gz) = 64baf69b33210230f7c4879977cf7866
-SHA256 (TclTk-0.75.tar.gz) = 7d0bad6d6bee94c9667743a2047420229d5c5637757fca1e5fce4397b1f1b791
-SIZE (TclTk-0.75.tar.gz) = 233406
+MD5 (Tcl-Tk-0.88.tar.gz) = e286b8ede195d6a1f959d31fbbfcd417
+SHA256 (Tcl-Tk-0.88.tar.gz) = bb182a29b2e10f9908f4b61724ae55b4dc47e8649c712238636d468270bce905
+SIZE (Tcl-Tk-0.88.tar.gz) = 333220
diff --git a/x11-toolkits/p5-Tcl-Tk/files/patch-aa b/x11-toolkits/p5-Tcl-Tk/files/patch-aa
index af0f03fe8882..8d78938b9897 100644
--- a/x11-toolkits/p5-Tcl-Tk/files/patch-aa
+++ b/x11-toolkits/p5-Tcl-Tk/files/patch-aa
@@ -1,11 +1,21 @@
---- Makefile.PL.orig	Wed Jul  2 19:25:28 2003
-+++ Makefile.PL	Wed Jun 21 14:45:19 2006
-@@ -18,7 +18,7 @@
- if ($@) {
-     print STDERR "Warning: could not load Tk from tclsh; please edit and check".
-             " Makefile.PL manually to reflect your system.";
--    $interp->SetVar('tk_version','8.3');
-+    $interp->SetVar('tk_version','8.4');
+--- Makefile.PL.orig	Wed Jan 12 18:39:23 2005
++++ Makefile.PL	Sat Jun 24 17:40:19 2006
+@@ -23,18 +23,6 @@
+     $tclsh = $ENV{'TCLSH_PROG'};
  }
- my $tk_version = $interp->GetVar('tk_version');
- print STDERR "tcl_version=$tcl_version; tk_version=$tk_version\n";
+ 
+-open TCLSH, "$tclsh test-for-tk.tcl|";
+-my $res = join '', <TCLSH>;
+-
+-unless ($res =~ /^ok/m) {
+-  die <<EOS;
+-
+-Your Tcl installation ($tclsh) fails to find Tk package.
+-One of possible reasons is missing file 'pkgIndex.tcl' in ..../tk8.4/
+-directory; Please check if you can feed 'package require Tk' to tclsh
+-EOS
+-}
+-
+ WriteMakefile(
+     NAME => "Tcl::Tk",
+     VERSION_FROM => 'lib/Tcl/Tk.pm',
diff --git a/x11-toolkits/p5-Tcl-Tk/pkg-plist b/x11-toolkits/p5-Tcl-Tk/pkg-plist
index e96d0d7a80b3..95e285eef0c6 100644
--- a/x11-toolkits/p5-Tcl-Tk/pkg-plist
+++ b/x11-toolkits/p5-Tcl-Tk/pkg-plist
@@ -1,7 +1,8 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Tcl/Tcl/Tk.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk/Tk.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk/Tk.so
+%%SITE_PERL%%/Tcl/Tk.pm
+%%SITE_PERL%%/Tcl/Tk/Widget/Balloon.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk/.packlist
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tcl/Tcl
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tcl
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl
+@dirrmtry %%SITE_PERL%%/Tcl/Tk/Widget
+@dirrmtry %%SITE_PERL%%/Tcl/Tk
+@dirrmtry %%SITE_PERL%%/Tcl