Update tcl-otcl to 1.11.

Changes:
- Support more platforms: Mac OS X, Debian, and Fedora.

6 files changed, 66 insertions, 42 deletions

diff --git a/lang/tcl-otcl/Makefile b/lang/tcl-otcl/Makefile
index bebdcf5e650..f1bbb9338b2 100644
--- a/lang/tcl-otcl/Makefile
+++ b/lang/tcl-otcl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:28 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2006/01/27 01:18:19 minskim Exp $
 
-DISTNAME=	otcl-1.9
+DISTNAME=	otcl-1.11
 PKGNAME=	tcl-${DISTNAME}
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=otcl-tclcl/}
@@ -20,10 +20,8 @@ CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_PREFIX.tk}
 
 CPPFLAGS+=	-I${BUILDLINK_PREFIX.tcl}/include/tcl/generic
 
-HTMLDOCS=	CHANGES.html autoload.html capi.html class.html object.html \
-		tutorial.html
-DOCS=		otcl-paper.ps.gz
-HTMLDOCDIR=	${PREFIX}/share/doc/html/tcl/otcl
+DOCS=		autoload.html capi.html class.html object.html \
+		tutorial.html otcl-paper.ps.gz
 DOCDIR=		${PREFIX}/share/doc/tcl/otcl
 
 INSTALLATION_DIRS=	bin include lib
@@ -32,11 +30,8 @@ INSTALLATION_DIRS=	bin include lib
 .include "../../x11/tk/buildlink3.mk"
 
 post-install:
-	${INSTALL_DATA_DIR} ${HTMLDOCDIR}
 	${INSTALL_DATA_DIR} ${DOCDIR}
-.for _file_ in ${HTMLDOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${_file_} ${HTMLDOCDIR}
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/CHANGES.html ${DOCDIR}
 .for _file_ in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${_file_} ${DOCDIR}
 .endfor
diff --git a/lang/tcl-otcl/PLIST b/lang/tcl-otcl/PLIST
index 8fa52f78573..b6f786ee4f1 100644
--- a/lang/tcl-otcl/PLIST
+++ b/lang/tcl-otcl/PLIST
@@ -1,16 +1,14 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:41 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/01/27 01:18:19 minskim Exp $
 bin/otclsh
 bin/owish
 include/otcl.h
 lib/libotcl.la
-share/doc/html/tcl/otcl/CHANGES.html
-share/doc/html/tcl/otcl/autoload.html
-share/doc/html/tcl/otcl/capi.html
-share/doc/html/tcl/otcl/class.html
-share/doc/html/tcl/otcl/object.html
-share/doc/html/tcl/otcl/tutorial.html
+share/doc/tcl/otcl/CHANGES.html
+share/doc/tcl/otcl/autoload.html
+share/doc/tcl/otcl/capi.html
+share/doc/tcl/otcl/class.html
+share/doc/tcl/otcl/object.html
+share/doc/tcl/otcl/tutorial.html
 share/doc/tcl/otcl/otcl-paper.ps.gz
 @dirrm share/doc/tcl/otcl
 @unexec ${RMDIR} %D/share/doc/tcl 2>/dev/null || ${TRUE}
-@dirrm share/doc/html/tcl/otcl
-@unexec ${RMDIR} %D/share/doc/html/tcl 2>/dev/null || ${TRUE}
diff --git a/lang/tcl-otcl/distinfo b/lang/tcl-otcl/distinfo
index 87ce8b52485..6d8b66e6d56 100644
--- a/lang/tcl-otcl/distinfo
+++ b/lang/tcl-otcl/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 09:03:12 agc Exp $
+$NetBSD: distinfo,v 1.6 2006/01/27 01:18:19 minskim Exp $
 
-SHA1 (otcl-1.9.tar.gz) = 1ab1e40e7064720e04d7df56afc6d4a64aac2311
-RMD160 (otcl-1.9.tar.gz) = f3021de27b40abbc6eb805a29b5facaa136e7167
-Size (otcl-1.9.tar.gz) = 309728 bytes
-SHA1 (patch-aa) = 87f242437f8c22c9e6260d9343fa3ef3eabf2c8f
+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
diff --git a/lang/tcl-otcl/patches/patch-aa b/lang/tcl-otcl/patches/patch-aa
index b43d83621ea..eb712f945c0 100644
--- a/lang/tcl-otcl/patches/patch-aa
+++ b/lang/tcl-otcl/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2002/09/02 23:12:24 seb Exp $
+$NetBSD: patch-aa,v 1.3 2006/01/27 01:18:19 minskim Exp $
 
---- Makefile.in.orig	Thu Nov  2 01:45:59 2000
+--- Makefile.in.orig	2005-10-13 23:45:28.000000000 -0700
 +++ Makefile.in
 @@ -5,6 +5,7 @@
  #
@@ -61,7 +61,7 @@ $NetBSD: patch-aa,v 1.2 2002/09/02 23:12:24 seb Exp $
  
  #
  # compile otcl.c and link it into a library archive
-@@ -89,36 +89,25 @@ owish: otkAppInit.c libotcl.a
+@@ -89,19 +89,8 @@ owish: otkAppInit.c libotcl.a
  
  libotcl.a: otcl.c
  	rm -f libotcl.a otcl.o
@@ -78,35 +78,29 @@ $NetBSD: patch-aa,v 1.2 2002/09/02 23:12:24 seb Exp $
 -	rm -f libotcl$(SHLIB_SUFFIX) otcl.o so_locations
 -	$(CC) -c $(CFLAGS) $(DEFINES) $(SHLIB_CFLAGS) $(INCLUDES) otcl.c
 -	$(SHLIB_LD) -o libotcl$(SHLIB_SUFFIX) otcl.o
-+	${LIBTOOL} --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES) otcl.c
++	${LIBTOOL} --mode=compile $(CC) -c $(CFLAGS) $(DEFINES) $(INCLUDES) otcl.c
 +	${LIBTOOL} --mode=link ${CC} -o ${.TARGET:.a=.la} otcl.lo -rpath ${PREFIX}/lib -version-info 0:0
  
  test: otclsh owish
  	./otclsh lib/test.tcl
- 	./owish lib/test.tcl
+@@ -114,12 +103,10 @@ dirs:
+ 		fi;\
+ 	done
  
--install: owish otclsh libotcl.a libotcl$(SHLIB_SUFFIX) otcl.h
+-install: owish otclsh libotcl.a libotcl$(SHLIB_SUFFIX) otcl.h dirs
 -	$(INSTALL) owish $(INST_OWISH)
 -	$(INSTALL) otclsh $(INST_OTCLSH)
 -	$(INSTALL) libotcl.a $(INST_OLIB)
+-	$(RANLIB)  $(INST_OLIB)/libotcl.a
 -	$(INSTALL) libotcl$(SHLIB_SUFFIX) $(INST_OLIBSH)
-+install: owish otclsh libotcl.a otcl.h
++install: owish otclsh libotcl.a otcl.h dirs
 +	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libotcl.la ${PREFIX}/lib
 +	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} owish $(INST_OWISH)
 +	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} otclsh $(INST_OTCLSH)
- 	$(INSTALL) otcl.h $(INST_OINC)
+ 	$(INSTALL) -m 644 otcl.h $(INST_OINC)
  
  clean:
--	rm -f owish otclsh libotcl.a libotcl$(SHLIB_SUFFIX) \
-+	rm -f owish otclsh libotcl.la \
- 	otcl.o otkAppInit.o otclAppInit.o \
- 	config.status config.log config.cache \
- 	core so_locations *.core Makefile
-+	rm -rf .libs
- 
- # To be compatible with ns/nam
- distclean: clean
-@@ -146,7 +135,7 @@ srctar:
+@@ -154,7 +141,7 @@ srctar:
  
  depend: $(CFILES)
  	@echo Making dependencies for $(srcdir){$(CFILES)}
diff --git a/lang/tcl-otcl/patches/patch-ab b/lang/tcl-otcl/patches/patch-ab
new file mode 100644
index 00000000000..400daff9a26
--- /dev/null
+++ b/lang/tcl-otcl/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2006/01/27 01:18:19 minskim Exp $
+
+--- conf/configure.in.tcl.orig	2005-09-26 21:58:15.000000000 -0700
++++ conf/configure.in.tcl
+@@ -78,7 +78,7 @@ TCL_TCL_PLACES="../lib/tcl$TCL_HI_VERS \
+                 $x_includes \
+                 /usr/contrib/include \
+                 /usr/include"
+-TCL_H_PLACES_D="$d/generic \
++TCL_H_PLACES_D="$d/include/tcl/generic \
+ 		$d/unix \
+ 		$d/include/tcl$TCL_HI_VERS \
+ 		$d/include/tcl$TCL_VERS \
diff --git a/lang/tcl-otcl/patches/patch-ac b/lang/tcl-otcl/patches/patch-ac
new file mode 100644
index 00000000000..22917fc19e1
--- /dev/null
+++ b/lang/tcl-otcl/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1 2006/01/27 01:18:19 minskim Exp $
+
+--- configure.orig	2005-10-13 23:46:24.000000000 -0700
++++ configure
+@@ -4128,7 +4128,7 @@ TCL_TCL_PLACES="../lib/tcl$TCL_HI_VERS \
+                 $x_includes \
+                 /usr/contrib/include \
+                 /usr/include"
+-TCL_H_PLACES_D="$d/generic \
++TCL_H_PLACES_D="$d/include/tcl/generic \
+ 		$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 ;;