diff --git a/lang/otcl/Makefile b/lang/otcl/Makefile
index 9679eb0bade..d0f5d991d7c 100644
--- a/lang/otcl/Makefile
+++ b/lang/otcl/Makefile
@@ -1,11 +1,11 @@
 #
 # $FreeBSD: ports/lang/otcl/Makefile,v 1.6 1999/11/28 18:31:28 steve Exp $
-# $OpenBSD: Makefile,v 1.9 2000/04/19 12:49:36 turan Exp $
+# $OpenBSD: Makefile,v 1.10 2000/07/14 05:15:14 kevlo Exp $
 #
 
-DISTNAME=	otcl-1.0a4
+DISTNAME=	otcl-1.0a5
 CATEGORIES=	lang
-NEED_VERSION=	1.230
+NEED_VERSION=	1.314
 MASTER_SITES=	http://www-mash.cs.berkeley.edu/dist/
 HOMEPAGE=	ftp://ftp.tns.lcs.mit.edu/pub/otcl/README.html
 
@@ -18,16 +18,9 @@ PERMIT_DISTFILES_FTP=	Yes
 
 LIB_DEPENDS=    tk83.1::x11/tk/8.3
 
-HAS_CONFIGURE=	Yes
-CONFIGURE_ARGS=	--prefix='$${DESTDIR}${PREFIX}' --sysconfdir='$${DESTDIR}/etc'
-CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/tcl8.3/generic \
-		--with-tcl-ver=8.3
-
-MAKE_FLAGS=	INST_OLIBSH='$${DESTDIR}${PREFIX}/lib'
-FAKE_FLAGS=	${MAKE_FLAGS}
-FAKE=		Yes
-
-post-install:
-	ln -sf libotcl.so.1 ${PREFIX}/lib/libotcl.so
+CONFIGURE_STYLE=	gnu dest
+CONFIGURE_ARGS+=--includedir=${PREFIX}/include/tcl8.3/generic \
+		--with-tcl-ver=8.3 \
+		--with-tk-ver=8.3
 
 .include <bsd.port.mk>
diff --git a/lang/otcl/files/md5 b/lang/otcl/files/md5
index d1222df3f1a..0f3c54fe402 100644
--- a/lang/otcl/files/md5
+++ b/lang/otcl/files/md5
@@ -1,3 +1,3 @@
-MD5 (otcl-1.0a4.tar.gz) = 1aafd63973857991b90d08b9dcf29e03
-RMD160 (otcl-1.0a4.tar.gz) = 7db17242007e49e5c800cb407403e58019dc306b
-SHA1 (otcl-1.0a4.tar.gz) = bd325ec1dbd7ba01b965e9b5775633f902acc20e
+MD5 (otcl-1.0a5.tar.gz) = 8099cc8660bb9e3403bf0e7a5f3e6c21
+RMD160 (otcl-1.0a5.tar.gz) = 852522009a93e8a10d96690980368b4b5746ff65
+SHA1 (otcl-1.0a5.tar.gz) = 593b02d603e3ba4cb555c22e249d5b5c7c417af2
diff --git a/lang/otcl/patches/patch-aa b/lang/otcl/patches/patch-aa
index 962f524e03c..c3f2238bf9b 100644
--- a/lang/otcl/patches/patch-aa
+++ b/lang/otcl/patches/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Mon Feb 22 17:18:58 1999
-+++ configure	Wed Jan  5 19:57:45 2000
-@@ -2602,16 +2602,16 @@
+--- configure.orig	Fri Jul 14 04:07:54 2000
++++ configure	Fri Jul 14 04:09:00 2000
+@@ -2681,16 +2681,16 @@
          DL_LIBS="-ldl"
          SHLD_FLAGS="-Wl,-Bexport"
          ;;
diff --git a/lang/otcl/patches/patch-ab b/lang/otcl/patches/patch-ab
deleted file mode 100644
index 1ae01e16bb9..00000000000
--- a/lang/otcl/patches/patch-ab
+++ /dev/null
@@ -1,34 +0,0 @@
---- otcl.c.orig	Fri Feb 19 14:33:36 1999
-+++ otcl.c	Wed Nov  3 15:31:47 1999
-@@ -762,13 +762,7 @@
-     for (; args!=0 && i<3; args = args->nextPtr, i++) ;
-     Tcl_ResetResult(in);
-     while (args != 0) {
--#if TCL_MAJOR_VERSION >= 8
--#if TCL_RELEASE_SERIAL >= 3
- 	    if (TclIsVarArgument(args))
--#else
--	    if (args->isArg)
--#endif
--#endif
- 		    Tcl_AppendElement(in, args->name);
- 	    args = args->nextPtr;
-     }
-@@ -802,7 +796,7 @@
-       if (ap->defValuePtr != 0) {
- 	if (Tcl_SetVar(in, 
- 		       var, 
--		       TclGetStringFromObj(ap->defValuePtr, 
-+		       Tcl_GetStringFromObj(ap->defValuePtr, 
- 					   (int *) NULL),
- 		       0) == NULL) {
- #endif
-@@ -840,7 +834,7 @@
-     Tcl_AppendResult(in, proc->command, 0);
- #else 
-     Tcl_AppendResult(in, 
--		     TclGetStringFromObj(proc->bodyPtr, (int *)NULL),
-+		     Tcl_GetStringFromObj(proc->bodyPtr, (int *)NULL),
- 		     0);
- #endif
-     return TCL_OK;
diff --git a/lang/otcl/pkg/PFRAG.shared b/lang/otcl/pkg/PFRAG.shared
new file mode 100644
index 00000000000..08d6e8d8ce5
--- /dev/null
+++ b/lang/otcl/pkg/PFRAG.shared
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1 2000/07/14 05:15:33 kevlo Exp $
+lib/libotcl.so.1
+DYNLIBDIR(%B)
diff --git a/lang/otcl/pkg/PLIST b/lang/otcl/pkg/PLIST
index 00574abc847..3f64922acf6 100644
--- a/lang/otcl/pkg/PLIST
+++ b/lang/otcl/pkg/PLIST
@@ -1,8 +1,6 @@
+@comment $OpenBSD: PLIST,v 1.2 2000/07/14 05:15:33 kevlo Exp $
 bin/otclsh
 bin/owish
 include/otcl.h
 lib/libotcl.a
-lib/libotcl.so.1
-lib/libotcl.so
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+%%SHARED%%