[pkgsrc/trunk]: pkgsrc patch TCL_SRC_DIR and TK_SRC_DIR into tclConfig.sh and...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9cbac3bc46d5
branches:  trunk
changeset: 492487:9cbac3bc46d5
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Wed Apr 13 20:41:03 2005 +0000

description:
patch TCL_SRC_DIR and TK_SRC_DIR into tclConfig.sh and tkConfig.sh correctly

diffstat:

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

diffs (72 lines):

diff -r 69d3d8797a08 -r 9cbac3bc46d5 lang/tcl/Makefile
--- a/lang/tcl/Makefile Wed Apr 13 20:15:55 2005 +0000
+++ b/lang/tcl/Makefile Wed Apr 13 20:41:03 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/04/11 21:46:16 tv Exp $
+# $NetBSD: Makefile,v 1.51 2005/04/13 20:41:03 jschauma Exp $
 
 DISTNAME=      tcl${TCL_VERSION}-src
 PKGNAME=       tcl-${TCL_VERSION}
@@ -54,7 +54,7 @@
 post-build:
        ${SED} -e "s|^\(.*\)='\(.*\)'|\1=\"\2\"|"                       \
                -e "s|${WRKSRC}|${PREFIX}/lib|"                         \
-               -e "s|${WRKDIR}/${DISTNAME:C/-src//}|${PREFIX}|"        \
+               -e "s|${WRKDIR}/${DISTNAME:C/-src//}|${PREFIX}/include/tcl|"    \
                ${WRKSRC}/tclConfig.sh > ${WRKSRC}/tclConfig.sh.tmp &&  \
                ${MV} ${WRKSRC}/tclConfig.sh.tmp ${WRKSRC}/tclConfig.sh
 
diff -r 69d3d8797a08 -r 9cbac3bc46d5 lang/tcl83/Makefile
--- a/lang/tcl83/Makefile       Wed Apr 13 20:15:55 2005 +0000
+++ b/lang/tcl83/Makefile       Wed Apr 13 20:41:03 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:17 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/04/13 20:41:03 jschauma Exp $
 #
 
 DISTNAME=              tcl8.3.4
@@ -72,7 +72,7 @@
        done
        ${SED} -e "s|^\(.*\)='\(.*\)'|\1=\"\2\"|"                       \
                -e "s|${WRKSRC}|${PREFIX}/lib|"                         \
-               -e "s|${WRKDIR}/${DISTNAME:C/-src//}|${PREFIX}|"        \
+               -e "s|${WRKDIR}/${DISTNAME:C/-src//}|${PREFIX}/include/tcl|"    \
                ${WRKSRC}/tclConfig.sh > ${WRKSRC}/tclConfig.sh.tmp &&  \
                ${MV} ${WRKSRC}/tclConfig.sh.tmp ${WRKSRC}/tclConfig.sh
 
diff -r 69d3d8797a08 -r 9cbac3bc46d5 x11/tk/Makefile
--- a/x11/tk/Makefile   Wed Apr 13 20:15:55 2005 +0000
+++ b/x11/tk/Makefile   Wed Apr 13 20:41:03 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/04/13 17:37:43 tron Exp $
+# $NetBSD: Makefile,v 1.45 2005/04/13 20:41:03 jschauma Exp $
 
 DISTNAME=      tk8.4.9-src
 PKGNAME=       tk-8.4.9
@@ -34,7 +34,7 @@
 post-build:
        ${SED} -e "s|^\(.*\)='\(.*\)'|\1=\"\2\"|"                       \
                -e "s|${WRKSRC}|${PREFIX}/lib|"                         \
-               -e "s|${WRKDIR}/${DISTNAME:C/-src//}|${PREFIX}|"        \
+               -e "s|${WRKDIR}/${DISTNAME:C/-src//}|${PREFIX}/include/tk|"     \
                ${WRKSRC}/tkConfig.sh > ${WRKSRC}/tkConfig.sh.tmp &&    \
                ${MV} ${WRKSRC}/tkConfig.sh.tmp ${WRKSRC}/tkConfig.sh
 
diff -r 69d3d8797a08 -r 9cbac3bc46d5 x11/tk83/Makefile
--- a/x11/tk83/Makefile Wed Apr 13 20:15:55 2005 +0000
+++ b/x11/tk83/Makefile Wed Apr 13 20:41:03 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:48:14 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/04/13 20:41:03 jschauma Exp $
 
 DISTNAME=      tk8.3.4
 PKGNAME=       tk-8.3.4
@@ -56,7 +56,7 @@
        done
        ${SED} -e "s|^\(.*\)='\(.*\)'|\1=\"\2\"|"                       \
                -e "s|${WRKSRC}|${PREFIX}/lib|"                         \
-               -e "s|${WRKDIR}/${DISTNAME:C/-src//}|${PREFIX}|"        \
+               -e "s|${WRKDIR}/${DISTNAME:C/-src//}|${PREFIX}/include/tk|"     \
                ${WRKSRC}/tkConfig.sh > ${WRKSRC}/tkConfig.sh.tmp &&    \
                ${MV} ${WRKSRC}/tkConfig.sh.tmp ${WRKSRC}/tkConfig.sh