[pkgsrc/trunk]: pkgsrc patch tclConfig.sh and tkConfig.sh so that they do not...

[jschauma <jschauma%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b5dbc72200a9
branches:  trunk
changeset: 492356:b5dbc72200a9
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Mon Apr 11 02:44:26 2005 +0000

description:
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@.

diffstat:

 lang/tcl/Makefile   |  9 ++++++++-
 lang/tcl83/Makefile |  9 +++++++--
 x11/tk/Makefile     |  9 ++++++++-
 x11/tk83/Makefile   |  9 +++++++--
 4 files changed, 30 insertions(+), 6 deletions(-)

diffs (102 lines):

diff -r 17efa32a2251 -r b5dbc72200a9 lang/tcl/Makefile
--- a/lang/tcl/Makefile Sun Apr 10 22:45:25 2005 +0000
+++ b/lang/tcl/Makefile Mon Apr 11 02:44:26 2005 +0000
@@ -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_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 -r 17efa32a2251 -r b5dbc72200a9 lang/tcl83/Makefile
--- a/lang/tcl83/Makefile       Sun Apr 10 22:45:25 2005 +0000
+++ b/lang/tcl83/Makefile       Mon Apr 11 02:44:26 2005 +0000
@@ -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 @@
        ${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 -r 17efa32a2251 -r b5dbc72200a9 x11/tk/Makefile
--- a/x11/tk/Makefile   Sun Apr 10 22:45:25 2005 +0000
+++ b/x11/tk/Makefile   Mon Apr 11 02:44:26 2005 +0000
@@ -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 @@
 
 .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 -r 17efa32a2251 -r b5dbc72200a9 x11/tk83/Makefile
--- a/x11/tk83/Makefile Sun Apr 10 22:45:25 2005 +0000
+++ b/x11/tk83/Makefile Mon Apr 11 02:44:26 2005 +0000
@@ -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 @@
        ${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}