patch tclConfig.sh and tkConfig.sh so that they do not contain references

to the build environment, which of course no longer exists once we
install the file.  Also make sure that variables are set using
double quotes, so that variables inside are expanded.  Ok jwise@.

4 files changed, 30 insertions, 6 deletions

diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index 162a99e1040..dc7f3b488a1 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2005/03/08 00:26:31 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.49 2005/04/11 02:44:26 jschauma Exp $
 
 DISTNAME=	tcl${TCL_VERSION}-src
 PKGNAME=	tcl-${TCL_VERSION}
@@ -52,6 +52,13 @@ CONFIGURE_ENV+=		TCL_PACKAGE_PATH="${VIEWBASE}/lib/tcl"
 CONFIGURE_ARGS+=	--enable-64bit
 .endif
 
+post-build:
+	${SED} -e "s|^\(.*\)='\(.*\)'|\1=\"\2\"|"			\
+		-e "s|${WRKSRC}|${PREFIX}/lib|"				\
+		-e "s|${WRKDIR}/${DISTNAME:C/-src//}|${PREFIX}|"	\
+		${WRKSRC}/tclConfig.sh > ${WRKSRC}/tclConfig.sh.tmp &&	\
+		${MV} ${WRKSRC}/tclConfig.sh.tmp ${WRKSRC}/tclConfig.sh
+
 post-install:
 	cd ${WRKDIR} && ${PAX} -rwpm man ${PREFIX}
 	${RM} -rf ${WRKDIR}/man
diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile
index 00555f0b491..31e2086b8f3 100644
--- a/lang/tcl83/Makefile
+++ b/lang/tcl83/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/03/08 13:04:14 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/04/11 02:44:26 jschauma Exp $
 #
 
 DISTNAME=		tcl8.3.4
@@ -65,12 +65,17 @@ post-patch:
 	${RM} -f mkLinks.tmp;						\
 	${CHMOD} +x mkLinks;
 
-pre-install:
+post-build:
 	cd ${WRKSRC}; for file in					\
 		tclUnixInit.o libtcl83.so tclsh;			\
 	do								\
 		${TOUCH} $${file};					\
 	done
+	${SED} -e "s|^\(.*\)='\(.*\)'|\1=\"\2\"|"			\
+		-e "s|${WRKSRC}|${PREFIX}/lib|"				\
+		-e "s|${WRKDIR}/${DISTNAME:C/-src//}|${PREFIX}|"	\
+		${WRKSRC}/tclConfig.sh > ${WRKSRC}/tclConfig.sh.tmp &&	\
+		${MV} ${WRKSRC}/tclConfig.sh.tmp ${WRKSRC}/tclConfig.sh
 
 post-install:
 	cd ${WRKDIR} && ${PAX} -rwpm man ${PREFIX}
diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index 6a843178cf5..3c103c83295 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/01/05 09:15:45 adam Exp $
+# $NetBSD: Makefile,v 1.41 2005/04/11 02:44:26 jschauma Exp $
 
 DISTNAME=	tk8.4.9-src
 PKGNAME=	tk-8.4.9
@@ -29,6 +29,13 @@ CONFIGURE_ARGS+=	--mandir=${WRKDIR}/man
 
 .include "../../lang/tcl/buildlink3.mk"
 
+post-build:
+	${SED} -e "s|^\(.*\)='\(.*\)'|\1=\"\2\"|"			\
+		-e "s|${WRKSRC}|${PREFIX}/lib|"				\
+		-e "s|${WRKDIR}/${DISTNAME:C/-src//}|${PREFIX}|"	\
+		${WRKSRC}/tkConfig.sh > ${WRKSRC}/tkConfig.sh.tmp &&	\
+		${MV} ${WRKSRC}/tkConfig.sh.tmp ${WRKSRC}/tkConfig.sh
+
 post-install:
 	cd ${WRKDIR} && ${PAX} -rwpm man ${PREFIX}
 	${RM} -rf ${WRKDIR}/man
diff --git a/x11/tk83/Makefile b/x11/tk83/Makefile
index 157dc4589c4..fdb64e9f1fd 100644
--- a/x11/tk83/Makefile
+++ b/x11/tk83/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/03/08 17:24:45 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/04/11 02:44:26 jschauma Exp $
 
 DISTNAME=	tk8.3.4
 PKGNAME=	tk-8.3.4
@@ -49,12 +49,17 @@ post-patch:
 	${RM} -f mkLinks.tmp;						\
 	${CHMOD} +x mkLinks;
 
-pre-install:
+post-build:
 	cd ${WRKSRC}; for file in					\
 		tkUnixInit.o libtk83.so wish;				\
 	do								\
 		${TOUCH} $${file};					\
 	done
+	${SED} -e "s|^\(.*\)='\(.*\)'|\1=\"\2\"|"			\
+		-e "s|${WRKSRC}|${PREFIX}/lib|"				\
+		-e "s|${WRKDIR}/${DISTNAME:C/-src//}|${PREFIX}|"	\
+		${WRKSRC}/tkConfig.sh > ${WRKSRC}/tkConfig.sh.tmp &&	\
+		${MV} ${WRKSRC}/tkConfig.sh.tmp ${WRKSRC}/tkConfig.sh
 
 post-install:
 	cd ${WRKDIR} && ${PAX} -rwpm man ${PREFIX}