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.

6 files changed, 44 insertions, 24 deletions

diff --git a/lang/tcl-tclX/Makefile b/lang/tcl-tclX/Makefile
index a1bbdfac78d..ab8d0079854 100644
--- a/lang/tcl-tclX/Makefile
+++ b/lang/tcl-tclX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/04/26 07:17:40 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2001/04/27 09:16:18 skrll Exp $
 #
 
 DISTNAME=	tclX8.2.0
@@ -18,6 +18,9 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-shared --with-tcl=${PREFIX}/lib --enable-tk=NO
 
+CONFIGURE_ENV+=		\
+	PKGSRC_TCL_SRC_DIR="${BUILD_ROOT}/lang/tcl/${WRKDIR:T}/tcl8.3.2"
+
 MAKE_ENV+=		GTAR=${GTAR} CHOWN=${CHOWN} CHMOD=${CHMOD} \
 			SHAREMODE=${SHAREMODE} SHAREOWN=${SHAREOWN} \
 			SHAREGRP=${SHAREGRP}
@@ -30,12 +33,6 @@ post-extract:
 		cd ../../lang/tcl && ${MAKE} extract;			\
 	fi
 
-post-patch:
-	@${MV} ${WRKSRC}/configure ${WRKSRC}/configure.tmp
-	@${SED} -e 's:@PKGSRC_TCL_SRC_DIR@:${BUILD_ROOT}/lang/tcl/${WRKDIR:T}/tcl8.3.2:g' \
-		${WRKSRC}/configure.tmp > ${WRKSRC}/configure
-	@${CHMOD} a+x ${WRKSRC}/configure
-
 post-build:
 	cd ${WRKSRC}/../tcl/unix && ${MAKE_ENV} ${MAKE} buildhelp
 
diff --git a/lang/tcl-tclX/distinfo b/lang/tcl-tclX/distinfo
index 2b4378c2fd3..32232ed44ad 100644
--- a/lang/tcl-tclX/distinfo
+++ b/lang/tcl-tclX/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.3 2001/04/26 07:17:41 skrll Exp $
+$NetBSD: distinfo,v 1.4 2001/04/27 09:16:18 skrll Exp $
 
 SHA1 (tclX8.2.0.tar.gz) = 51295ad001d9d057e4ec2f13016f6aa4111fdd28
 Size (tclX8.2.0.tar.gz) = 721198 bytes
 SHA1 (patch-aa) = 47eb7e69e714a8bccf862c5115f6694c3b213881
 SHA1 (patch-ab) = cfda1a17f27f4b12d31a069032a98739bd31a244
-SHA1 (patch-ac) = e31cbafcf1d65e634653ed881b675868c827eeb6
+SHA1 (patch-ac) = 10f778e6a8336ff41164e2f089ac8ad7c8d5ccdb
 SHA1 (patch-ad) = 252a21da464267d7c7d45e168a89b29a40273359
 SHA1 (patch-ae) = a43144f37706245779362026073e09d8505a3d3f
-SHA1 (patch-af) = aae38769aa1dce905088264613198251bd2290a7
+SHA1 (patch-af) = 5b68c6ea909437c66dad60bf7b330805d854baca
 SHA1 (patch-ag) = 6c8876699bfe325b3370bb554d4727e05fc64b8b
diff --git a/lang/tcl-tclX/patches/patch-ac b/lang/tcl-tclX/patches/patch-ac
index e4c4cad4822..34f110f096c 100644
--- a/lang/tcl-tclX/patches/patch-ac
+++ b/lang/tcl-tclX/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2001/04/26 07:17:41 skrll Exp $
+$NetBSD: patch-ac,v 1.3 2001/04/27 09:16:19 skrll Exp $
 
 --- configure.orig	Mon Feb  7 00:54:02 2000
 +++ configure
@@ -6,11 +6,19 @@ $NetBSD: patch-ac,v 1.2 2001/04/26 07:17:41 skrll Exp $
          echo "$ac_t""file not found" 1>&6
      fi
  
-+TCL_SRC_DIR=@PKGSRC_TCL_SRC_DIR@
++TCL_SRC_DIR=${PKGSRC_TCL_SRC_DIR}
      #
      # The eval is required to do the TCL_DBGX substitution in the
      # TCL_LIB_FILE variable
-@@ -1984,7 +1985,7 @@
+@@ -939,6 +940,7 @@
+ 
+ 
+ 
++TK_SRC_DIR=${PKGSRC_TK_SRC_DIR}
+ 
+ 
+ # These are substituted into the run scripts
+@@ -1984,7 +1986,7 @@
  		DL_LIBS=""
  		LDFLAGS=""
  		LD_SEARCH_FLAGS=""
@@ -19,7 +27,7 @@ $NetBSD: patch-ac,v 1.2 2001/04/26 07:17:41 skrll Exp $
  	    
  else
    echo "$ac_t""no" 1>&6
-@@ -2509,11 +2510,7 @@
+@@ -2509,11 +2511,7 @@
  #
  # Determine suffix to use for the object files for the shared library.
  #
diff --git a/lang/tcl-tclX/patches/patch-af b/lang/tcl-tclX/patches/patch-af
index 3ab7a4d96af..4c9156bb676 100644
--- a/lang/tcl-tclX/patches/patch-af
+++ b/lang/tcl-tclX/patches/patch-af
@@ -1,6 +1,7 @@
-$NetBSD: patch-af,v 1.2 2000/09/06 16:47:32 jwise Exp $
---- ../tk/unix/Makefile.in.orig	Sun Feb  6 19:54:01 2000
-+++ ../tk/unix/Makefile.in	Wed Sep  6 11:52:31 2000
+$NetBSD: patch-af,v 1.3 2001/04/27 09:16:19 skrll Exp $
+
+--- ../tk/unix/Makefile.in.orig	Mon Feb  7 00:54:01 2000
++++ ../tk/unix/Makefile.in
 @@ -65,8 +65,8 @@
  
  STANDALONE_OBJS = tkx.o
@@ -44,8 +45,8 @@ $NetBSD: patch-af,v 1.2 2000/09/06 16:47:32 jwise Exp $
 -	    ${TK_BUILD_STUB_LIB_SPEC} ${TCLX_BUILD_LIB_SPEC} \
 -	    ${TCL_BUILD_STUB_LIB_SPEC} ${TCL_SHLIB_LD_LIBS}
 +	${LIBTOOL} --mode=link @CC@ -o ${TKX_SHLIB_NAME:C/\.so.*/.la/} ${SOBJS:.o=.lo} \
-+		-Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib -rpath ${PREFIX}/lib:${X11BASE}/lib \
-+		-L${PREFIX} -L${X11BASE} -ltclx82 -ltk83 -ltcl83 -lX11 -lm -version-info 1:0
++		-Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib -rpath ${PREFIX}/lib \
++		-L${PREFIX}/lib -L${X11BASE}/lib -ltclx82 -ltk83 -ltcl83 -lX11 -lm -version-info 1:0
  
  hello:	hello.c
 -	${CC} ${LD_SWITCHES} -o $@ hello.c ${STATIC_LIBS}
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