From d812bf6dde7b698fdfe7215ffd8425c3029b87d7 Mon Sep 17 00:00:00 2001
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Thu, 28 Oct 2004 07:49:06 +0000
Subject: [PATCH] - optimize reinplace to handle symlinked /usr/ports

---
 lang/tcl82/Makefile        | 7 +++----
 lang/tcl83/Makefile        | 5 ++---
 lang/tcl84/Makefile        | 5 ++---
 x11-toolkits/tk82/Makefile | 5 ++---
 x11-toolkits/tk83/Makefile | 5 ++---
 x11-toolkits/tk84/Makefile | 4 ++--
 6 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/lang/tcl82/Makefile b/lang/tcl82/Makefile
index dc1c17450d2c..acd56e009f2f 100644
--- a/lang/tcl82/Makefile
+++ b/lang/tcl82/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tcl
 PORTVERSION=	8.2.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	lang tcl82
 MASTER_SITES=	${MASTER_SITE_TCLTK}
 MASTER_SITE_SUBDIR=	tcl8_2
@@ -16,7 +16,7 @@ DISTNAME=	tcl8.2.3
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool Command Language
 
-NO_LATEST_LINK=	yes
+LATEST_LINK=	tcl82
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
@@ -381,8 +381,7 @@ post-extract:
 
 post-configure:
 	${REINPLACE_CMD} \
-		-e 's=${WRKDIRPREFIX}${PORTSDIR}=$${WRKDIRPREFIX}${PORTSDIR}=' \
-		-e 's=${WRKDIRPREFIX}${.CURDIR}=$${WRKDIRPREFIX}${PORTSDIR}=' \
+		-e 's=${WRKDIRPREFIX}${.CURDIR}=$${WRKDIRPREFIX}${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}=' \
 		${WRKSRC}/tclConfig.sh
 .if !defined(WITH_TCL82_MAN)
 	${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \
diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile
index 57847b086bfa..30a3b9fd3753 100644
--- a/lang/tcl83/Makefile
+++ b/lang/tcl83/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tcl
 PORTVERSION=	8.3.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang tcl83
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
@@ -429,8 +429,7 @@ MLINKS=	Access.3 Tcl_Access.3 \
 
 post-configure:
 	${REINPLACE_CMD} \
-		-e 's=${WRKDIRPREFIX}${PORTSDIR}=$${WRKDIRPREFIX}${PORTSDIR}=' \
-		-e 's=${WRKDIRPREFIX}${.CURDIR}=$${WRKDIRPREFIX}${PORTSDIR}=' \
+		-e 's=${WRKDIRPREFIX}${.CURDIR}=$${WRKDIRPREFIX}${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}=' \
 		${WRKSRC}/tclConfig.sh
 .if !defined(WITH_TCL83_MAN)
 	${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index 77d7ecf946a0..f4af83011e75 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tcl
 PORTVERSION=	8.4.6
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	lang tcl84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -604,8 +604,7 @@ post-patch:
 
 post-configure:
 	${REINPLACE_CMD} \
-		-e 's=${WRKDIRPREFIX}${PORTSDIR}=$${WRKDIRPREFIX}${PORTSDIR}=' \
-		-e 's=${WRKDIRPREFIX}${.CURDIR}=$${WRKDIRPREFIX}${PORTSDIR}=' \
+		-e 's=${WRKDIRPREFIX}${.CURDIR}=$${WRKDIRPREFIX}${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}=' \
 		${WRKSRC}/tclConfig.sh
 .if defined(WITHOUT_TCL84_MAN)
 	${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \
diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile
index 0aa1f4def613..0a3c39f25438 100644
--- a/x11-toolkits/tk82/Makefile
+++ b/x11-toolkits/tk82/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.2.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits tk82
 MASTER_SITES=	${MASTER_SITE_TCLTK}
 MASTER_SITE_SUBDIR=	tcl8_2
@@ -309,8 +309,7 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 
 post-configure:
 	${REINPLACE_CMD} \
-		-e 's=${WRKDIRPREFIX}${PORTSDIR}=$${WRKDIRPREFIX}${PORTSDIR}=' \
-		-e 's=${WRKDIRPREFIX}${.CURDIR}=$${WRKDIRPREFIX}${PORTSDIR}=' \
+		-e 's=${WRKDIRPREFIX}${.CURDIR}=$${WRKDIRPREFIX}${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}=' \
 		${WRKSRC}/tkConfig.sh
 .if !defined(WITH_TK82_MAN)
 	${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \
diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index db516ad79732..4c141e09e4ab 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.3.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits tk83
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
@@ -327,8 +327,7 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromObj.3 \
 
 post-configure:
 	${REINPLACE_CMD} \
-		-e 's=${WRKDIRPREFIX}${PORTSDIR}=$${WRKDIRPREFIX}${PORTSDIR}=' \
-		-e 's=${WRKDIRPREFIX}${.CURDIR}=$${WRKDIRPREFIX}${PORTSDIR}=' \
+		-e 's=${WRKDIRPREFIX}${.CURDIR}=$${WRKDIRPREFIX}${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}=' \
 		${WRKSRC}/tkConfig.sh
 .if !defined(WITH_TK83_MAN)
 	${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index 65f83cbb4664..1438c5a70a97 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.4.6
+PORTREVISION=   1
 PORTEPOCH=	2
 CATEGORIES=	x11-toolkits tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -359,8 +360,7 @@ post-patch:
 
 post-configure:
 	${REINPLACE_CMD} \
-		-e 's=${WRKDIRPREFIX}${PORTSDIR}=$${WRKDIRPREFIX}${PORTSDIR}=' \
-		-e 's=${WRKDIRPREFIX}${.CURDIR}=$${WRKDIRPREFIX}${PORTSDIR}=' \
+		-e 's=${WRKDIRPREFIX}${.CURDIR}=$${WRKDIRPREFIX}${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}=' \
 		${WRKSRC}/tkConfig.sh
 .if defined(WITHOUT_TK84_MAN)
 	${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \