Index: head/x11-toolkits/p5-Tcl-Tk/Makefile
===================================================================
--- head/x11-toolkits/p5-Tcl-Tk/Makefile	(revision 46923)
+++ head/x11-toolkits/p5-Tcl-Tk/Makefile	(revision 46924)
@@ -1,26 +1,30 @@
 # New ports collection makefile for:	p5-Tcl-Tk
 # Date created:				June 15th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	TclTk
 PORTVERSION=	b2
 CATEGORIES=	x11-toolkits lang perl5 tk82
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Tcl
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/Tcl.pm:${PORTSDIR}/lang/p5-Tcl
 LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
 PERL_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Tcl::Tk.3
 
+post-patch:
+	@${PERL} -pi -e 's,%LOCALBASE%,${LOCALBASE},g; \
+		s,%X11BASE%,${X11BASE},g' ${WRKSRC}/Makefile.PL
+
 .include <bsd.port.mk>

Property changes on: head/x11-toolkits/p5-Tcl-Tk/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.19
\ No newline at end of property
+1.20
\ No newline at end of property
Index: head/x11-toolkits/p5-Tcl-Tk/files/patch-aa
===================================================================
--- head/x11-toolkits/p5-Tcl-Tk/files/patch-aa	(revision 46923)
+++ head/x11-toolkits/p5-Tcl-Tk/files/patch-aa	(revision 46924)
@@ -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$ENV{PREFIX}/lib -L$ENV{X11BASE}/lib -ltk82 -ltcl82 -lX11 -lm"],
-+	      INC => "-I$ENV{PREFIX}/include -I$ENV{PREFIX}/include/tcl8.2 -I$ENV{PREFIX}/include/tk8.2 -I$ENV{X11BASE}/include");
++	      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 = :" }

Property changes on: head/x11-toolkits/p5-Tcl-Tk/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/x11-toolkits/p5-TclTk/Makefile
===================================================================
--- head/x11-toolkits/p5-TclTk/Makefile	(revision 46923)
+++ head/x11-toolkits/p5-TclTk/Makefile	(revision 46924)
@@ -1,26 +1,30 @@
 # New ports collection makefile for:	p5-Tcl-Tk
 # Date created:				June 15th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	TclTk
 PORTVERSION=	b2
 CATEGORIES=	x11-toolkits lang perl5 tk82
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Tcl
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/Tcl.pm:${PORTSDIR}/lang/p5-Tcl
 LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
 PERL_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Tcl::Tk.3
 
+post-patch:
+	@${PERL} -pi -e 's,%LOCALBASE%,${LOCALBASE},g; \
+		s,%X11BASE%,${X11BASE},g' ${WRKSRC}/Makefile.PL
+
 .include <bsd.port.mk>

Property changes on: head/x11-toolkits/p5-TclTk/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.19
\ No newline at end of property
+1.20
\ No newline at end of property
Index: head/x11-toolkits/p5-TclTk/files/patch-aa
===================================================================
--- head/x11-toolkits/p5-TclTk/files/patch-aa	(revision 46923)
+++ head/x11-toolkits/p5-TclTk/files/patch-aa	(revision 46924)
@@ -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$ENV{PREFIX}/lib -L$ENV{X11BASE}/lib -ltk82 -ltcl82 -lX11 -lm"],
-+	      INC => "-I$ENV{PREFIX}/include -I$ENV{PREFIX}/include/tcl8.2 -I$ENV{PREFIX}/include/tk8.2 -I$ENV{X11BASE}/include");
++	      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 = :" }

Property changes on: head/x11-toolkits/p5-TclTk/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property