Fixed wrong use of WRKSRC.

8 files changed, 60 insertions, 59 deletions

diff --git a/x11/tk/Makefile b/x11/tk/Makefile
index 44603f1a892..40a6deec777 100644
--- a/x11/tk/Makefile
+++ b/x11/tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2005/11/02 16:25:31 joerg Exp $
+# $NetBSD: Makefile,v 1.52 2005/11/03 23:09:24 rillig Exp $
 
 DISTNAME=	tk${TK_VERSION}-src
 PKGNAME=	tk-${TK_VERSION}
@@ -14,10 +14,12 @@ COMMENT=	Graphical toolkit for TCL
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-WRKSRC=			${WRKDIR}/${DISTNAME:C/-src//}/unix
+WRKSRC=			${WRKDIR}/tk${TK_VERSION}
 
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
+CONFIGURE_DIRS=		unix
+BUILD_DIRS=		${CONFIGURE_DIRS}
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
 CONFIGURE_ARGS+=	--enable-threads
 CONFIGURE_ENV+=		LIB_RUNTIME_DIR=${PREFIX}/lib
@@ -30,45 +32,44 @@ TEST_TARGET=		test
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 
-post-build:
-	${SED} 								\
-		-e "s|${WRKSRC}|${PREFIX}/lib|"				\
-		-e "s|${WRKDIR}/${DISTNAME:C/-src//}|${PREFIX}/include/tk|"	\
-		${WRKSRC}/tkConfig.sh > ${WRKSRC}/tkConfig.sh.tmp &&	\
-		${MV} ${WRKSRC}/tkConfig.sh.tmp ${WRKSRC}/tkConfig.sh
+SUBST_CLASSES+=		tk-config
+SUBST_STAGE.tk-config=	post-build
+SUBST_FILES.tk-config=	unix/tkConfig.sh
+SUBST_SED.tk-config+=	-e "s|${WRKSRC}/unix|${PREFIX}/lib|"
+SUBST_SED.tk-config+=	-e "s|${WRKSRC}|${PREFIX}/include/tk|"
 
 post-install:
 	${RM} -f ${PREFIX}/bin/wish
-	cd ${PREFIX}/bin && ${LN} -s wish8.4 wish
+	${LN} -s wish8.4 ${PREFIX}/bin/wish
 	${INSTALL_DATA_DIR} ${PREFIX}/include/tk
 	${INSTALL_DATA_DIR} ${PREFIX}/include/tk/generic
 	${INSTALL_DATA_DIR} ${PREFIX}/include/tk/unix
-	${INSTALL_DATA} ${WRKSRC}/../generic/default.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/ks_names.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tk.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tk3d.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tkButton.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tkCanvas.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tkColor.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tkDecls.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tkFileFilter.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tkFont.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tkInitScript.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tkInt.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tkIntDecls.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tkIntPlatDecls.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tkIntXlibDecls.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tkMenu.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tkMenubutton.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tkPlatDecls.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tkPort.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tkScale.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tkScrollbar.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tkSelect.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tkText.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/../generic/tkUndo.h ${PREFIX}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/../unix/tkUnixDefault.h ${PREFIX}/include/tk/unix
-	${INSTALL_DATA} ${WRKSRC}/../unix/tkUnixInt.h ${PREFIX}/include/tk/unix
-	${INSTALL_DATA} ${WRKSRC}/../unix/tkUnixPort.h ${PREFIX}/include/tk/unix
+	${INSTALL_DATA} ${WRKSRC}/generic/default.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/ks_names.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tk.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tk3d.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkButton.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkCanvas.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkColor.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkDecls.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkFileFilter.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkFont.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkInitScript.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkInt.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkIntDecls.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkIntPlatDecls.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkIntXlibDecls.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkMenu.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkMenubutton.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkPlatDecls.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkPort.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkScale.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkScrollbar.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkSelect.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkText.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/generic/tkUndo.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/unix/tkUnixDefault.h ${PREFIX}/include/tk/unix
+	${INSTALL_DATA} ${WRKSRC}/unix/tkUnixInt.h ${PREFIX}/include/tk/unix
+	${INSTALL_DATA} ${WRKSRC}/unix/tkUnixPort.h ${PREFIX}/include/tk/unix
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/tk/Makefile.version b/x11/tk/Makefile.version
index 06f63874d4d..1a92e7f7f81 100644
--- a/x11/tk/Makefile.version
+++ b/x11/tk/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.1 2005/09/08 21:25:15 minskim Exp $
+# $NetBSD: Makefile.version,v 1.2 2005/11/03 23:09:24 rillig Exp $
 
-TK_VERSION=8.4.11
+TK_VERSION=	8.4.11
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index 97422ca1663..dff02c18242 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.24 2005/11/02 15:41:25 joerg Exp $
+$NetBSD: distinfo,v 1.25 2005/11/03 23:09:24 rillig Exp $
 
 SHA1 (tk8.4.11-src.tar.gz) = c05dec9163e6f75787aa2825122d424fc1a1edb6
 RMD160 (tk8.4.11-src.tar.gz) = 71b42c0f0ae5067c23d61a2d852a53fb3c546e2f
 Size (tk8.4.11-src.tar.gz) = 3236334 bytes
-SHA1 (patch-aa) = 5ddd25d23d4749acd251f7e06dde18bdf207da8f
-SHA1 (patch-ab) = 0f3e1b7c325882df42b88e8c56b5101a12e79553
-SHA1 (patch-ac) = 5dc59a8e26c114a847c511defc7a3d7cc77655e8
-SHA1 (patch-ad) = 51ba301ed6786791f0ef9ece73c4496231f1c031
-SHA1 (patch-ae) = 7946f60ee6ff944dfc89e1bc0dbe7be202bc46c7
+SHA1 (patch-aa) = 7bcdb2cb46599f4aceaf1af9c8415ded45e7c2fd
+SHA1 (patch-ab) = 245a3b852e77fe3ac2870852510eaee1a5210ad1
+SHA1 (patch-ac) = 515869cc0c258aef07d0db090770f20be6d2f06a
+SHA1 (patch-ad) = 3565400245f583fd6a74aedaae27b7491952a0c9
+SHA1 (patch-ae) = 2815cb827ee15cbdd979d4866b8a3bcdf453cc54
diff --git a/x11/tk/patches/patch-aa b/x11/tk/patches/patch-aa
index f644a03c1c5..179e694f4a5 100644
--- a/x11/tk/patches/patch-aa
+++ b/x11/tk/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.15 2005/07/19 11:12:25 adam Exp $
+$NetBSD: patch-aa,v 1.16 2005/11/03 23:09:24 rillig Exp $
 
---- Makefile.in.orig	2005-06-29 16:43:10.000000000 +0000
-+++ Makefile.in
+--- unix/Makefile.in.orig	2005-06-29 16:43:10.000000000 +0000
++++ unix/Makefile.in
 @@ -93,7 +93,7 @@ HTML_INSTALL_DIR	= $(INSTALL_ROOT)$(HTML
  # The directory containing the Tcl sources and headers appropriate
  # for this version of Tk ("srcdir" will be replaced or has already
diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab
index bcc73510db5..2fa86296bcc 100644
--- a/x11/tk/patches/patch-ab
+++ b/x11/tk/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.21 2005/11/02 15:41:25 joerg Exp $
+$NetBSD: patch-ab,v 1.22 2005/11/03 23:09:24 rillig Exp $
 
---- configure.orig	2005-06-29 16:43:10.000000000 +0000
-+++ configure
+--- unix/configure.orig	2005-06-29 16:43:10.000000000 +0000
++++ unix/configure
 @@ -1910,12 +1910,13 @@ fi
      # Step 3: set configuration options based on system name and version.
  
diff --git a/x11/tk/patches/patch-ac b/x11/tk/patches/patch-ac
index ce1bc86c42b..e137acd61fe 100644
--- a/x11/tk/patches/patch-ac
+++ b/x11/tk/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.11 2005/07/19 11:12:25 adam Exp $
+$NetBSD: patch-ac,v 1.12 2005/11/03 23:09:24 rillig Exp $
 
---- tcl.m4.orig	2005-06-29 16:43:10.000000000 +0000
-+++ tcl.m4
+--- unix/tcl.m4.orig	2005-06-29 16:43:10.000000000 +0000
++++ unix/tcl.m4
 @@ -866,6 +866,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
      # Step 3: set configuration options based on system name and version.
  
diff --git a/x11/tk/patches/patch-ad b/x11/tk/patches/patch-ad
index dae84f0465a..4690ec13e6a 100644
--- a/x11/tk/patches/patch-ad
+++ b/x11/tk/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.6 2005/07/19 11:12:25 adam Exp $
+$NetBSD: patch-ad,v 1.7 2005/11/03 23:09:24 rillig Exp $
 
---- configure.in.orig	2005-06-29 16:43:10.000000000 +0000
-+++ configure.in
+--- unix/configure.in.orig	2005-06-29 16:43:10.000000000 +0000
++++ unix/configure.in
 @@ -283,6 +283,10 @@ if test "x${x_libraries}" != "x"; then
  fi
  if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
diff --git a/x11/tk/patches/patch-ae b/x11/tk/patches/patch-ae
index 4845c166273..6cb13675d7e 100644
--- a/x11/tk/patches/patch-ae
+++ b/x11/tk/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1 2005/09/21 14:49:08 joerg Exp $
+$NetBSD: patch-ae,v 1.2 2005/11/03 23:09:24 rillig Exp $
 
---- tkUnixPort.h.orig	2005-07-30 21:02:48.000000000 +0000
-+++ tkUnixPort.h
+--- unix/tkUnixPort.h.orig	2005-07-30 21:02:48.000000000 +0000
++++ unix/tkUnixPort.h
 @@ -119,12 +119,7 @@
  #endif
  #define MASK_SIZE howmany(FD_SETSIZE, NFDBITS)