Fixed wrong use of WRKSRC.

8 files changed, 47 insertions, 46 deletions

diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile
index 44b255f60ff..11d4474a345 100644
--- a/lang/tcl83/Makefile
+++ b/lang/tcl83/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/11/04 06:54:20 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/11/04 09:56:09 rillig Exp $
 #
 
 DISTNAME=		tcl8.3.4
@@ -18,8 +18,9 @@ CONFLICTS+=		tclman80-[0-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-WRKSRC=			${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=		yes
+CONFIGURE_DIRS=		unix
+BUILD_DIRS=		${CONFIGURE_DIRS}
 MAKE_ENV+=		TOUCH="${TOUCH}"
 TEST_TARGET=		test
 
@@ -47,7 +48,7 @@ CONFIGURE_ARGS+=	--enable-64bit
 # linked to a longer filename.
 #
 post-patch:
-	@cd ${WRKSRC};							\
+	@cd ${WRKSRC}/unix;						\
 	${MV} -f mkLinks mkLinks.tmp;					\
 	${GREP} -v "^exit 0" mkLinks.tmp > mkLinks;			\
 	${CAT} mkLinks.tmp						\
@@ -60,34 +61,34 @@ post-patch:
 	${CHMOD} +x mkLinks;
 
 post-build:
-	cd ${WRKSRC}; for file in					\
+	cd ${WRKSRC}/unix; for file in					\
 		tclUnixInit.o libtcl83.so tclsh;			\
 	do								\
 		${TOUCH} $${file};					\
 	done
 	${SED} 								\
-		-e "s|${WRKSRC}|${PREFIX}/lib|"				\
-		-e "s|${WRKDIR}/${DISTNAME:C/-src//}|${PREFIX}/include/tcl|"	\
-		${WRKSRC}/tclConfig.sh > ${WRKSRC}/tclConfig.sh.tmp &&	\
-		${MV} ${WRKSRC}/tclConfig.sh.tmp ${WRKSRC}/tclConfig.sh
+		-e "s|${WRKSRC}/unix|${PREFIX}/lib|"			\
+		-e "s|${WRKSRC}|${PREFIX}/include/tcl|"			\
+		${WRKSRC}/unix/tclConfig.sh > ${WRKSRC}/tclConfig.sh.tmp &&	\
+		${MV} ${WRKSRC}/tclConfig.sh.tmp ${WRKSRC}/unix/tclConfig.sh
 
 post-install:
 	cd ${PREFIX}/bin && ${LN} -s tclsh8.3 tclsh
 	${INSTALL_DATA_DIR} ${PREFIX}/include/tcl
 	${INSTALL_DATA_DIR} ${PREFIX}/include/tcl/unix
 	${INSTALL_DATA_DIR} ${PREFIX}/include/tcl/generic
-	${INSTALL_DATA} ${WRKSRC}/tclUnixPort.h ${PREFIX}/include/tcl/unix
-	${INSTALL_DATA} ${WRKSRC}/../generic/tcl.h ${PREFIX}/include/tcl/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tclCompile.h ${PREFIX}/include/tcl/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tclDecls.h ${PREFIX}/include/tcl/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tclIO.h ${PREFIX}/include/tcl/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tclInitScript.h ${PREFIX}/include/tcl/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tclInt.h ${PREFIX}/include/tcl/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tclIntDecls.h ${PREFIX}/include/tcl/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tclIntPlatDecls.h ${PREFIX}/include/tcl/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tclMath.h ${PREFIX}/include/tcl/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tclPlatDecls.h ${PREFIX}/include/tcl/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tclPort.h ${PREFIX}/include/tcl/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tclRegexp.h ${PREFIX}/include/tcl/generic
+	${INSTALL_DATA} ${WRKSRC}/unix/tclUnixPort.h ${PREFIX}/include/tcl/unix
+	${INSTALL_DATA} ${WRKSRC}/generic/tcl.h ${PREFIX}/include/tcl/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tclCompile.h ${PREFIX}/include/tcl/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tclDecls.h ${PREFIX}/include/tcl/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tclIO.h ${PREFIX}/include/tcl/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tclInitScript.h ${PREFIX}/include/tcl/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tclInt.h ${PREFIX}/include/tcl/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tclIntDecls.h ${PREFIX}/include/tcl/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tclIntPlatDecls.h ${PREFIX}/include/tcl/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tclMath.h ${PREFIX}/include/tcl/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tclPlatDecls.h ${PREFIX}/include/tcl/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tclPort.h ${PREFIX}/include/tcl/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tclRegexp.h ${PREFIX}/include/tcl/generic
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/tcl83/distinfo b/lang/tcl83/distinfo
index 079715cc51e..551be34e65b 100644
--- a/lang/tcl83/distinfo
+++ b/lang/tcl83/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.4 2005/09/21 14:49:08 joerg Exp $
+$NetBSD: distinfo,v 1.5 2005/11/04 09:56:09 rillig Exp $
 
 SHA1 (tcl8.3.4.tar.gz) = b179f1f51b322b7045cf152b73df4f3d01da82ec
 RMD160 (tcl8.3.4.tar.gz) = 1840927939f9bbc4c48a53f256212f26c164e517
 Size (tcl8.3.4.tar.gz) = 2654756 bytes
-SHA1 (patch-aa) = 2a6069a0ddb7961bb3c120c753bc9f99dce73ff7
-SHA1 (patch-ab) = 06c44a9b8ca32b64c5fbebff5ffafaac57bec20b
-SHA1 (patch-ac) = a67789d9adf404768a32a32037e7cce88b657671
-SHA1 (patch-ae) = 5eee14adec88cf0cac5715fe0cfe7420b9b83774
-SHA1 (patch-af) = 2a24042c6850a75ae09ca74730933f50e8852a2c
-SHA1 (patch-ag) = 6c4dde9812557efc3c7ff2504828d2f02a861299
+SHA1 (patch-aa) = 36e3e635b5f70b658c7151254cf02529611a3120
+SHA1 (patch-ab) = b2fc4fc6a7b651cfbea2bdd5315a5ee24d68ec7b
+SHA1 (patch-ac) = b01dc7dbe9b9bd92de4792b74a25b01e33ad4bb9
+SHA1 (patch-ae) = a2d8477c6b2f80700876128e14e39afdb4e5504b
+SHA1 (patch-af) = 40e5353865399b27b1ece76c9f88931274a9709f
+SHA1 (patch-ag) = a4bc4fe104890a874463df5b2795499f871dd1ba
diff --git a/lang/tcl83/patches/patch-aa b/lang/tcl83/patches/patch-aa
index d924024aef0..b01698b5718 100644
--- a/lang/tcl83/patches/patch-aa
+++ b/lang/tcl83/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2004/10/10 11:58:29 grant Exp $
+$NetBSD: patch-aa,v 1.3 2005/11/04 09:56:09 rillig Exp $
 
---- Makefile.in.orig	2001-10-20 10:24:15.000000000 +1000
-+++ Makefile.in
+--- unix/Makefile.in.orig	2001-10-20 10:24:15.000000000 +1000
++++ unix/Makefile.in
 @@ -87,7 +87,7 @@ CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
  #CFLAGS			= $(CFLAGS_DEBUG)
  #CFLAGS			= $(CFLAGS_OPTIMIZE)
diff --git a/lang/tcl83/patches/patch-ab b/lang/tcl83/patches/patch-ab
index 4b8416420ce..312cae9ee9d 100644
--- a/lang/tcl83/patches/patch-ab
+++ b/lang/tcl83/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2005/09/21 14:49:08 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2005/11/04 09:56:09 rillig Exp $
 
---- configure.orig	2001-10-20 10:24:15.000000000 +1000
-+++ configure
+--- unix/configure.orig	2001-10-20 10:24:15.000000000 +1000
++++ unix/configure
 @@ -4776,6 +4776,7 @@ fi
      # Step 3: set configuration options based on system name and version.
  
diff --git a/lang/tcl83/patches/patch-ac b/lang/tcl83/patches/patch-ac
index 43c0dfb92f4..dbc82c60840 100644
--- a/lang/tcl83/patches/patch-ac
+++ b/lang/tcl83/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.2 2005/09/21 14:49:08 joerg Exp $
+$NetBSD: patch-ac,v 1.3 2005/11/04 09:56:09 rillig Exp $
 
---- tclUnixInit.c.orig	Fri Aug 24 19:13:22 2001
-+++ tclUnixInit.c
+--- unix/tclUnixInit.c.orig	Fri Aug 24 19:13:22 2001
++++ unix/tclUnixInit.c
 @@ -13,7 +13,7 @@
  #include "tclInt.h"
  #include "tclPort.h"
diff --git a/lang/tcl83/patches/patch-ae b/lang/tcl83/patches/patch-ae
index 4ee230d0ac3..f9b81a8ff2d 100644
--- a/lang/tcl83/patches/patch-ae
+++ b/lang/tcl83/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/03/08 19:22:27 minskim Exp $
+$NetBSD: patch-ae,v 1.2 2005/11/04 09:56:09 rillig Exp $
 
---- configure.in.orig	Fri Oct 19 17:24:15 2001
-+++ configure.in	Tue Nov 25 05:16:06 2003
+--- unix/configure.in.orig	Fri Oct 19 17:24:15 2001
++++ unix/configure.in	Tue Nov 25 05:16:06 2003
 @@ -386,7 +386,7 @@
      if test "x$DL_OBJS" = "xtclLoadAout.o"; then
  	MAKE_LIB="\${STLIB_LD} \[$]@ \${OBJS}"
diff --git a/lang/tcl83/patches/patch-af b/lang/tcl83/patches/patch-af
index 48bb7466e4f..d4dbd4b4d5d 100644
--- a/lang/tcl83/patches/patch-af
+++ b/lang/tcl83/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.2 2005/09/21 14:49:08 joerg Exp $
+$NetBSD: patch-af,v 1.3 2005/11/04 09:56:09 rillig Exp $
 
---- tcl.m4.orig	Fri Oct 19 19:24:15 2001
-+++ tcl.m4
+--- unix/tcl.m4.orig	Fri Oct 19 19:24:15 2001
++++ unix/tcl.m4
 @@ -601,6 +601,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
      # Step 3: set configuration options based on system name and version.
  
diff --git a/lang/tcl83/patches/patch-ag b/lang/tcl83/patches/patch-ag
index 840f268b3ba..2b0991f8d02 100644
--- a/lang/tcl83/patches/patch-ag
+++ b/lang/tcl83/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.1 2005/09/21 14:49:08 joerg Exp $
+$NetBSD: patch-ag,v 1.2 2005/11/04 09:56:09 rillig Exp $
 
---- tclUnixPort.h.orig	2005-07-30 20:55:41.000000000 +0000
-+++ tclUnixPort.h
+--- unix/tclUnixPort.h.orig	2005-07-30 20:55:41.000000000 +0000
++++ unix/tclUnixPort.h
 @@ -417,7 +417,9 @@ EXTERN int		gettimeofday _ANSI_ARGS_((st
   * isn't generally declared in a header file anywhere.
   */