From 365afe0267d5ce9573afc40dba5aea2276f92b0e Mon Sep 17 00:00:00 2001
From: skrll <skrll>
Date: Fri, 27 Apr 2001 09:16:18 +0000
Subject: Do previous changes to make the source for tcl available differently
 and hopefully in a cleaner way.

Do the same for the tk sources for tk-tclX

Both should now build.

{tcl,tk}-tclX/Makefile have an awful lot in common so someone might like to
split a lot of it out.
---
 lang/tk-tclX/Makefile | 16 +++++++++++++++-
 lang/tk-tclX/distinfo |  8 ++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'lang/tk-tclX')

diff --git a/lang/tk-tclX/Makefile b/lang/tk-tclX/Makefile
index cdf088f407d..3f05f65067b 100644
--- a/lang/tk-tclX/Makefile
+++ b/lang/tk-tclX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 09:07:36 agc Exp $
+# $NetBSD: Makefile,v 1.4 2001/04/27 09:16:19 skrll Exp $
 #
 
 DISTNAME=	tclX8.2.0
@@ -20,6 +20,10 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-shared --with-tcl=${PREFIX}/lib \
 			--with-tk=${PREFIX}/lib
 
+CONFIGURE_ENV+=		\
+	PKGSRC_TCL_SRC_DIR="${BUILD_ROOT}/lang/tcl/${WRKDIR:T}/tcl8.3.2" \
+	PKGSRC_TK_SRC_DIR="${BUILD_ROOT}/x11/tk/${WRKDIR:T}/tk8.3.2"
+
 MAKE_ENV+=		GTAR=${GTAR} CHOWN=${CHOWN} CHMOD=${CHMOD} \
 			SHAREMODE=${SHAREMODE} SHAREOWN=${SHAREOWN} \
 			SHAREGRP=${SHAREGRP}
@@ -31,6 +35,16 @@ PATCHDIR=	${.CURDIR}/../../lang/tcl-tclX/patches
 
 post-extract:
 	${MV} ${WRKSRC}/../doc/Memory.n ${WRKSRC}/../doc/TclXMemory.n
+	@if [ ! -e ${BUILD_ROOT}/lang/tcl/${WRKDIR:T}/tcl8.3.2 ]; then	\
+		cd ../../lang/tcl && ${MAKE} extract;			\
+	fi
+	@if [ ! -e ${BUILD_ROOT}/x11/tk/${WRKDIR:T}/tk8.3.2 ]; then	\
+		cd ../../x11/tk && ${MAKE} extract;			\
+	fi
+
+pre-clean:
+	@cd ../../lang/tcl && ${MAKE} clean
+	@cd ../../x11/tk && ${MAKE} clean
 
 do-build:
 	@cd ${WRKSRC}/../tk/unix && ${MAKE_ENV} ${MAKE}
diff --git a/lang/tk-tclX/distinfo b/lang/tk-tclX/distinfo
index 1efbe7e4d85..bbb1b28c503 100644
--- a/lang/tk-tclX/distinfo
+++ b/lang/tk-tclX/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:01:00 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/04/27 09:16:19 skrll Exp $
 
 SHA1 (tclX8.2.0.tar.gz) = 51295ad001d9d057e4ec2f13016f6aa4111fdd28
 Size (tclX8.2.0.tar.gz) = 721198 bytes
-SHA1 (patch-aa) = e12481d4b9318d9e57be0d16b8083247a22122e8
+SHA1 (patch-aa) = 47eb7e69e714a8bccf862c5115f6694c3b213881
 SHA1 (patch-ab) = cfda1a17f27f4b12d31a069032a98739bd31a244
-SHA1 (patch-ac) = 1a7eee5daadc3447f772230422282d12149fbdf7
+SHA1 (patch-ac) = 10f778e6a8336ff41164e2f089ac8ad7c8d5ccdb
 SHA1 (patch-ad) = 252a21da464267d7c7d45e168a89b29a40273359
 SHA1 (patch-ae) = a43144f37706245779362026073e09d8505a3d3f
-SHA1 (patch-af) = aae38769aa1dce905088264613198251bd2290a7
+SHA1 (patch-af) = 5b68c6ea909437c66dad60bf7b330805d854baca
 SHA1 (patch-ag) = 6c8876699bfe325b3370bb554d4727e05fc64b8b
-- 
cgit v1.2.3