Update to 0.75

4 files changed, 24 insertions, 22 deletions

diff --git a/x11-toolkits/p5-Tcl-Tk/Makefile b/x11-toolkits/p5-Tcl-Tk/Makefile
index 424a521f5af9..694fdd3c0fbb 100644
--- a/x11-toolkits/p5-Tcl-Tk/Makefile
+++ b/x11-toolkits/p5-Tcl-Tk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	TclTk
-PORTVERSION=	b2
+PORTVERSION=	0.75
 CATEGORIES=	x11-toolkits lang perl5 tk82
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Tcl
@@ -16,15 +16,16 @@ 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=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
+LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
 
 PERL_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MAN3=		Tcl::Tk.3
 
-post-patch:
-	@${PERL} -pi -e 's,%LOCALBASE%,${LOCALBASE},g; \
-		s,%X11BASE%,${X11BASE},g' ${WRKSRC}/Makefile.PL
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.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>
diff --git a/x11-toolkits/p5-Tcl-Tk/distinfo b/x11-toolkits/p5-Tcl-Tk/distinfo
index 34b153480708..47972893b72a 100644
--- a/x11-toolkits/p5-Tcl-Tk/distinfo
+++ b/x11-toolkits/p5-Tcl-Tk/distinfo
@@ -1,3 +1,3 @@
-MD5 (TclTk-b2.tar.gz) = a9980ab1c72581a0291f8f8b86cefec8
-SHA256 (TclTk-b2.tar.gz) = e4c344ba4c1edc6b8567c5e8fed555875d658613666e0801282596bc07559032
-SIZE (TclTk-b2.tar.gz) = 4749
+MD5 (TclTk-0.75.tar.gz) = 64baf69b33210230f7c4879977cf7866
+SHA256 (TclTk-0.75.tar.gz) = 7d0bad6d6bee94c9667743a2047420229d5c5637757fca1e5fce4397b1f1b791
+SIZE (TclTk-0.75.tar.gz) = 233406
diff --git a/x11-toolkits/p5-Tcl-Tk/files/patch-aa b/x11-toolkits/p5-Tcl-Tk/files/patch-aa
index d9f2c423b562..af0f03fe8882 100644
--- a/x11-toolkits/p5-Tcl-Tk/files/patch-aa
+++ b/x11-toolkits/p5-Tcl-Tk/files/patch-aa
@@ -1,11 +1,11 @@
---- Makefile.PL.orig	Sat Aug 29 12:17:41 1998
-+++ Makefile.PL	Sat Aug 29 12:20:08 1998
-@@ -1,6 +1,6 @@
- use ExtUtils::MakeMaker;
- WriteMakefile(NAME => "Tcl::Tk",
- 	      DISTNAME => "TclTk",
--	      LIBS => ["-ltk -ltcl -L/usr/X11R6/lib -lX11 -lm"],
--	      INC => "-I/usr/local/include -I/usr/include/tcl");
-+	      LIBS => ["-L%LOCALBASE%/lib -L%X11BASE%/lib -ltk82 -ltcl82 -lX11 -lm"],
-+	      INC => "-I%LOCALBASE%/include -I%LOCALBASE%/include/tcl8.2 -I%LOCALBASE%/include/tk8.2 -I%X11BASE%/include");
- #sub MY::tool_autosplit { "AUTOSPLITFILE = :" }
+--- 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');
+ }
+ my $tk_version = $interp->GetVar('tk_version');
+ print STDERR "tcl_version=$tcl_version; tk_version=$tk_version\n";
diff --git a/x11-toolkits/p5-Tcl-Tk/pkg-plist b/x11-toolkits/p5-Tcl-Tk/pkg-plist
index 29720d211be3..e96d0d7a80b3 100644
--- a/x11-toolkits/p5-Tcl-Tk/pkg-plist
+++ b/x11-toolkits/p5-Tcl-Tk/pkg-plist
@@ -1,6 +1,7 @@
-%%SITE_PERL%%/%%PERL_ARCH%%/Tcl/Tk.pm
+%%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%%/%%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