Update tcl-otcl to 1.12. The build process was improved. No functional

changes.  Now the package builds on Linux.

5 files changed, 19 insertions, 28 deletions

diff --git a/lang/tcl-otcl/Makefile b/lang/tcl-otcl/Makefile
index 22d41b842e2..77fea28da53 100644
--- a/lang/tcl-otcl/Makefile
+++ b/lang/tcl-otcl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2006/02/05 23:09:52 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/09/29 16:28:55 minskim Exp $
 
-DISTNAME=	otcl-1.11
-PKGNAME=	tcl-${DISTNAME}
-PKGREVISION=	1
+DISTNAME=	otcl-src-1.12
+PKGNAME=	tcl-${DISTNAME:S/-src//}
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=otcl-tclcl/}
 
@@ -14,6 +13,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 
 CONFIGURE_ARGS+=	V_LIBS="`${CONFIG_SHELL} -c '. ${TCLCONFIG_SH}; ${ECHO} $$TCL_LIBS'`"
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}
diff --git a/lang/tcl-otcl/distinfo b/lang/tcl-otcl/distinfo
index 6d8b66e6d56..54468c95fe7 100644
--- a/lang/tcl-otcl/distinfo
+++ b/lang/tcl-otcl/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2006/01/27 01:18:19 minskim Exp $
+$NetBSD: distinfo,v 1.7 2006/09/29 16:28:55 minskim Exp $
 
-SHA1 (otcl-1.11.tar.gz) = a16f4b82e98a2fa9c6ba632e772af182f47f07d4
-RMD160 (otcl-1.11.tar.gz) = 02148865a0734fe01171f0456ed89beda1f6074e
-Size (otcl-1.11.tar.gz) = 315835 bytes
-SHA1 (patch-aa) = 8f0d35abe4cef5cbc03e2db870b5a2d59219d9a8
-SHA1 (patch-ab) = 8cf77eac42d84631d19cf4e2e9fdd46b51248cc7
-SHA1 (patch-ac) = 0bfd84ebef8125de5e9a5ce32fe7a1b4855d7268
+SHA1 (otcl-src-1.12.tar.gz) = 37563fa82c88368213ec30023dbb8e97db851851
+RMD160 (otcl-src-1.12.tar.gz) = 560b19229c321511b57c2a39debfa35bc9f4d523
+Size (otcl-src-1.12.tar.gz) = 315536 bytes
+SHA1 (patch-aa) = 499fc336891fb96392614b85bac4373d7f63be65
+SHA1 (patch-ab) = 0f735f21dd2204fe37990f201ec121af4eb7b470
+SHA1 (patch-ac) = c7b11d85eecc954424993f2410cb69da1d3dff1f
diff --git a/lang/tcl-otcl/patches/patch-aa b/lang/tcl-otcl/patches/patch-aa
index eb712f945c0..4c700ea8053 100644
--- a/lang/tcl-otcl/patches/patch-aa
+++ b/lang/tcl-otcl/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2006/01/27 01:18:19 minskim Exp $
+$NetBSD: patch-aa,v 1.4 2006/09/29 16:28:55 minskim Exp $
 
---- Makefile.in.orig	2005-10-13 23:45:28.000000000 -0700
+--- Makefile.in.orig	2006-09-25 05:02:37.000000000 +0000
 +++ Makefile.in
 @@ -5,6 +5,7 @@
  #
diff --git a/lang/tcl-otcl/patches/patch-ab b/lang/tcl-otcl/patches/patch-ab
index 400daff9a26..3dbdd943d0c 100644
--- a/lang/tcl-otcl/patches/patch-ab
+++ b/lang/tcl-otcl/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2006/01/27 01:18:19 minskim Exp $
+$NetBSD: patch-ab,v 1.2 2006/09/29 16:28:55 minskim Exp $
 
---- conf/configure.in.tcl.orig	2005-09-26 21:58:15.000000000 -0700
+--- conf/configure.in.tcl.orig	2006-09-25 05:02:37.000000000 +0000
 +++ conf/configure.in.tcl
-@@ -78,7 +78,7 @@ TCL_TCL_PLACES="../lib/tcl$TCL_HI_VERS \
+@@ -84,7 +84,7 @@ TCL_TCL_PLACES="../lib/tcl$TCL_HI_VERS \
                  $x_includes \
                  /usr/contrib/include \
                  /usr/include"
diff --git a/lang/tcl-otcl/patches/patch-ac b/lang/tcl-otcl/patches/patch-ac
index 22917fc19e1..64a864488af 100644
--- a/lang/tcl-otcl/patches/patch-ac
+++ b/lang/tcl-otcl/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2006/01/27 01:18:19 minskim Exp $
+$NetBSD: patch-ac,v 1.2 2006/09/29 16:28:55 minskim Exp $
 
---- configure.orig	2005-10-13 23:46:24.000000000 -0700
+--- configure.orig	2006-09-25 05:02:37.000000000 +0000
 +++ configure
-@@ -4128,7 +4128,7 @@ TCL_TCL_PLACES="../lib/tcl$TCL_HI_VERS \
+@@ -4134,7 +4134,7 @@ TCL_TCL_PLACES="../lib/tcl$TCL_HI_VERS \
                  $x_includes \
                  /usr/contrib/include \
                  /usr/include"
@@ -11,12 +11,3 @@ $NetBSD: patch-ac,v 1.1 2006/01/27 01:18:19 minskim Exp $
  		$d/unix \
  		$d/include/tcl$TCL_HI_VERS \
  		$d/include/tcl$TCL_VERS \
-@@ -6478,6 +6478,8 @@ do
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+    # Avoid regenerating for rechecks on pkgsrc
-+    exit 0
-     ac_cs_recheck=: ;;
-   --version | --vers* | -V )
-     echo "$ac_cs_version"; exit 0 ;;