[pkgsrc/trunk]: pkgsrc/lang/tk-tclX Use same indirection idea for WRKSRC as t...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c0a2ed3cdd48
branches:  trunk
changeset: 506096:c0a2ed3cdd48
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Jan 11 21:32:35 2006 +0000

description:
Use same indirection idea for WRKSRC as tcl-tclX.

diffstat:

 lang/tk-tclX/Makefile |  17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r 1496a795abb4 -r c0a2ed3cdd48 lang/tk-tclX/Makefile
--- a/lang/tk-tclX/Makefile     Wed Jan 11 21:32:02 2006 +0000
+++ b/lang/tk-tclX/Makefile     Wed Jan 11 21:32:35 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/12/11 21:36:35 rillig Exp $
+# $NetBSD: Makefile,v 1.30 2006/01/11 21:32:35 joerg Exp $
 #
 
 DISTNAME=      tclx8.3.5-src
@@ -30,8 +30,15 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-PKGSRC_TCL_SRC_DIR=    ${PKGSRCDIR}/lang/tcl/${WRKDIR:T}/tcl${TCL_VERSION}
-PKGSRC_TK_SRC_DIR=     ${PKGSRCDIR}/x11/tk/${WRKDIR:T}/tk${TK_VERSION}
+PKGSRCDIR.tcl=         ${.CURDIR}/../../lang/tcl
+PKGSRCDIR.tk=          ${.CURDIR}/../../x11/tk
+WRKSRC.tcl_cmd=                \
+       cd ${PKGSRCDIR.tcl} && ${MAKE} show-var VARNAME=WRKSRC
+WRKSRC.tk_cmd=         \
+       cd ${PKGSRCDIR.tk} && ${MAKE} show-var VARNAME=WRKSRC
+
+PKGSRC_TCL_SRC_DIR=    ${WRKSRC.tcl_cmd:sh}/../
+PKGSRC_TK_SRC_DIR=     ${WRKSRC.tk_cmd:sh}
 CONFIGURE_ENV+=                PKGSRC_TCL_SRC_DIR=${PKGSRC_TCL_SRC_DIR:Q} \
                        PKGSRC_TK_SRC_DIR=${PKGSRC_TK_SRC_DIR:Q}
 
@@ -53,10 +60,10 @@
 post-extract:
        ${MV} ${WRKSRC}/../doc/Memory.n ${WRKSRC}/../doc/TclXMemory.n
        @if [ ! -r ${PKGSRC_TCL_SRC_DIR} ]; then        \
-               cd ../../lang/tcl && ${MAKE} extract;                   \
+               cd ${PKGSRCDIR.tcl} && ${MAKE} extract;                 \
        fi
        @if [ ! -r ${PKGSRC_TK_SRC_DIR} ]; then \
-               cd ../../x11/tk && ${MAKE} extract;                     \
+               cd ${PKGSRCDIR.tk} && ${MAKE} extract;                  \
        fi
 
 pre-clean: