From aae9e702edcde4976ed5f8a8ded94c31a9a42fe2 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Mon, 12 Nov 2001 16:24:10 +0000
Subject: [PATCH] rename patches, sync names with tcl8.3.4, remove config.guess
 patch. Tidy Makefile, simpler to set DISTNAME and DISTFILES.

---
 devel/tclcl/Makefile                                | 11 ++++++-----
 devel/tclcl/patches/{patch-ad => patch-Makefile_in} |  5 +++--
 devel/tclcl/patches/patch-ab                        | 12 ------------
 devel/tclcl/patches/{patch-ac => patch-config_sub}  |  7 ++++---
 devel/tclcl/patches/{patch-aa => patch-otcldoc}     |  5 +++--
 5 files changed, 16 insertions(+), 24 deletions(-)
 rename devel/tclcl/patches/{patch-ad => patch-Makefile_in} (81%)
 delete mode 100644 devel/tclcl/patches/patch-ab
 rename devel/tclcl/patches/{patch-ac => patch-config_sub} (73%)
 rename devel/tclcl/patches/{patch-aa => patch-otcldoc} (63%)

diff --git a/devel/tclcl/Makefile b/devel/tclcl/Makefile
index 865b6552f0f..977eafa5e29 100644
--- a/devel/tclcl/Makefile
+++ b/devel/tclcl/Makefile
@@ -1,12 +1,13 @@
 #
 # $FreeBSD: ports/devel/tclcl/Makefile,v 1.4 1999/11/28 18:31:57 steve Exp $
-# $OpenBSD: Makefile,v 1.11 2001/05/06 00:13:35 lebel Exp $
+# $OpenBSD: Makefile,v 1.12 2001/11/12 16:24:10 espie Exp $
 #
 
 COMMENT=	"Tcl/C++ interface used by ns and nam"
 
-DISTNAME=	tclcl-src-1.0b9
-PKGNAME=	tclcl-1.0b9
+V=1.0b9
+DISTFILES=	tclcl-src-$V.tar.gz
+DISTNAME=	tclcl-$V
 CATEGORIES=	devel
 NEED_VERSION=	1.402
 MASTER_SITES=	http://www-mash.cs.berkeley.edu/dist/
@@ -21,8 +22,6 @@ MAINTAINER=	Angelos D. Keromytis <angelos@openbsd.org>
 LIB_DEPENDS=    tk83.1::x11/tk/8.3 \
 		otcl.1::lang/otcl
 
-WRKDIST=	${WRKDIR}/${PKGNAME}
-
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=	--with-tcl-ver=8.3 --with-tk-ver=8.3
 
@@ -32,4 +31,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/*.h ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/libtclcl.a ${PREFIX}/lib
 	@ln -sf ${TRUEPREFIX}/lib/libtclcl.a ${PREFIX}/lib/libTcl.a
+
+NO_REGRESS=Yes
 .include <bsd.port.mk>
diff --git a/devel/tclcl/patches/patch-ad b/devel/tclcl/patches/patch-Makefile_in
similarity index 81%
rename from devel/tclcl/patches/patch-ad
rename to devel/tclcl/patches/patch-Makefile_in
index df70268a763..e15e0810dee 100644
--- a/devel/tclcl/patches/patch-ad
+++ b/devel/tclcl/patches/patch-Makefile_in
@@ -1,5 +1,6 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2001/11/12 16:24:10 espie Exp $
 --- Makefile.in.orig	Tue Nov 30 03:20:09 1999
-+++ Makefile.in	Fri Mar 16 19:31:07 2001
++++ Makefile.in	Mon Nov 12 17:04:58 2001
 @@ -66,7 +66,7 @@ INCLUDES = \
  LIB	= \
  	@V_LIBS@
@@ -17,7 +18,7 @@
 +	$(LIBRARY_TCL)/init.tcl \
 +	$(LIBRARY_TCL)/history.tcl \
 +	$(LIBRARY_TCL)/word.tcl \
-+	$(LIBRARY_TCL)/http2.3/http.tcl
++	$(LIBRARY_TCL)/http2.4/http.tcl
  TCL_76_LIBRARY_FILES = \
  	$(LIBRARY_TCL)/init.tcl
  
diff --git a/devel/tclcl/patches/patch-ab b/devel/tclcl/patches/patch-ab
deleted file mode 100644
index b488b22a724..00000000000
--- a/devel/tclcl/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.guess.orig	Wed Jan  5 21:30:48 2000
-+++ config.guess	Wed Jan  5 21:31:02 2000
-@@ -287,6 +287,9 @@
-     *:FreeBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- 	exit 0 ;;
-+    *:OpenBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+	exit 0 ;;
-     *:NetBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
- 	exit 0 ;;
diff --git a/devel/tclcl/patches/patch-ac b/devel/tclcl/patches/patch-config_sub
similarity index 73%
rename from devel/tclcl/patches/patch-ac
rename to devel/tclcl/patches/patch-config_sub
index 010450fac00..239da0261b0 100644
--- a/devel/tclcl/patches/patch-ac
+++ b/devel/tclcl/patches/patch-config_sub
@@ -1,6 +1,7 @@
---- config.sub.orig	Wed Jan  5 21:31:24 2000
-+++ config.sub	Wed Jan  5 21:31:38 2000
-@@ -609,7 +609,7 @@
+$OpenBSD: patch-config_sub,v 1.1 2001/11/12 16:24:10 espie Exp $
+--- config.sub.orig	Sat Feb 13 00:44:50 1999
++++ config.sub	Sat Nov 10 03:54:05 2001
+@@ -609,7 +609,7 @@ case $os in
  	      | -amigados* | -msdos* | -newsos* | -unicos* | -aos* \
  	      | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
  	      | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
diff --git a/devel/tclcl/patches/patch-aa b/devel/tclcl/patches/patch-otcldoc
similarity index 63%
rename from devel/tclcl/patches/patch-aa
rename to devel/tclcl/patches/patch-otcldoc
index 998811693e5..cd9c0d3404d 100644
--- a/devel/tclcl/patches/patch-aa
+++ b/devel/tclcl/patches/patch-otcldoc
@@ -1,5 +1,6 @@
---- otcldoc.orig	Fri Jul 14 06:21:20 2000
-+++ otcldoc	Fri Jul 14 06:21:34 2000
+$OpenBSD: patch-otcldoc,v 1.1 2001/11/12 16:24:10 espie Exp $
+--- otcldoc.orig	Sat Feb 13 00:44:51 1999
++++ otcldoc	Sat Nov 10 03:54:05 2001
 @@ -1,7 +1,7 @@
  #!/bin/sh
  # the exec restarts using tclsh which in turn ignores