Update tcl-otcl to 1.8 and take maintainership.

Changes:
    * Define macros CONST84 and CONST84_RETURN in otcl.h
    * Change char* to CONST84 char* (or CONST84_RETRUN char * if it is a
      function return) in otcl.c
    * test hangs for lib/test.tcl (autoload), see comments in lib/test.tcl

4 files changed, 37 insertions, 31 deletions

diff --git a/lang/tcl-otcl/Makefile b/lang/tcl-otcl/Makefile
index a298f5cc0aa..838fb2a22f5 100644
--- a/lang/tcl-otcl/Makefile
+++ b/lang/tcl-otcl/Makefile
@@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.8 2004/03/08 20:27:14 minskim Exp $
+# $NetBSD: Makefile,v 1.9 2004/03/08 23:47:44 minskim Exp $
 
-DISTNAME=	otcl-1.0a8
-PKGNAME=	tcl-${DISTNAME:S/a/rc/}
-PKGREVISION=	2
+DISTNAME=	otcl-1.8
+PKGNAME=	tcl-${DISTNAME}
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=otcl-tclcl/}
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://otcl-tclcl.sourceforge.net/otcl/
 COMMENT=	MIT Object Tcl
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_BUILDLINK2=	yes
 USE_X11=	yes
 
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}
@@ -26,6 +27,11 @@ DOCS=		otcl-paper.ps.gz
 HTMLDOCDIR=	${PREFIX}/share/doc/html/tcl/otcl
 DOCDIR=		${PREFIX}/share/doc/tcl/otcl
 
+INSTALLATION_DIRS=	bin include lib
+
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
+
 post-install:
 	${INSTALL_DATA_DIR} ${HTMLDOCDIR}
 	${INSTALL_DATA_DIR} ${DOCDIR}
@@ -36,5 +42,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/${_file_} ${DOCDIR}
 .endfor
 
-.include "../../x11/tk83/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/tcl-otcl/buildlink2.mk b/lang/tcl-otcl/buildlink2.mk
deleted file mode 100644
index cccbd7c521b..00000000000
--- a/lang/tcl-otcl/buildlink2.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.3 2004/03/08 20:27:14 minskim Exp $
-
-.if !defined(TCL_OTCL_BUILDLINK2_MK)
-TCL_OTCL_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			tcl-otcl
-BUILDLINK_DEPENDS.tcl-otcl?=		tcl-otcl>=1.0rc8nb1
-BUILDLINK_PKGSRCDIR.tcl-otcl?=		../../lang/tcl-otcl
-
-EVAL_PREFIX+=				BUILDLINK_PREFIX.tcl-otcl=tcl-otcl
-BUILDLINK_PREFIX.tcl-otcl_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.tcl-otcl+=		include/otcl.h
-BUILDLINK_FILES.tcl-otcl+=		lib/libotcl.*
-
-.include "../../x11/tk83/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	tcl-otcl-buildlink
-
-tcl-otcl-buildlink: _BUILDLINK_USE
-
-.endif	# TCL_OTCL_BUILDLINK2_MK
diff --git a/lang/tcl-otcl/buildlink3.mk b/lang/tcl-otcl/buildlink3.mk
new file mode 100644
index 00000000000..9c4f28a0505
--- /dev/null
+++ b/lang/tcl-otcl/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/08 23:47:44 minskim Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+TCL_OTCL_BUILDLINK3_MK:=	${TCL_OTCL_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	tcl-otcl
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-otcl}
+BUILDLINK_PACKAGES+=	tcl-otcl
+
+.if !empty(TCL_OTCL_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.tcl-otcl+=	tcl-otcl>=1.8
+BUILDLINK_PKGSRCDIR.tcl-otcl?=	../../lang/tcl-otcl
+
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
+
+.endif	# TCL_OTCL_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/tcl-otcl/distinfo b/lang/tcl-otcl/distinfo
index f74dc83626b..2e88270a0c8 100644
--- a/lang/tcl-otcl/distinfo
+++ b/lang/tcl-otcl/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2002/09/02 23:12:23 seb Exp $
+$NetBSD: distinfo,v 1.3 2004/03/08 23:47:44 minskim Exp $
 
-SHA1 (otcl-1.0a8.tar.gz) = 84cf8ec97a79230f5de6ae65ccee3ff788c7c20c
-Size (otcl-1.0a8.tar.gz) = 300607 bytes
+SHA1 (otcl-1.8.tar.gz) = 7ff767c1d4ef981f7cfa207a2f277e726105d001
+Size (otcl-1.8.tar.gz) = 300954 bytes
 SHA1 (patch-aa) = 87f242437f8c22c9e6260d9343fa3ef3eabf2c8f