5 files changed, 49 insertions, 7 deletions

diff --git a/lang/otcl/Makefile b/lang/otcl/Makefile
index 8d1cbf7fd5a1..eb2f4959fb30 100644
--- a/lang/otcl/Makefile
+++ b/lang/otcl/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for: otcl
-# Version required:	1.0a4
+# Version required:	1.0a5
 # Date created:		23 April 1999
 # Whom:			obonilla
 #
 # $FreeBSD$
 #
 
-DISTNAME=	otcl-1.0a4
+DISTNAME=	otcl-1.0a5
 CATEGORIES=	lang
 MASTER_SITES=	http://www-mash.cs.berkeley.edu/dist/
 
@@ -15,11 +15,13 @@ MAINTAINER=	obonilla@fisicc-ufm.edu
 LIB_DEPENDS=    tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--includedir=${PREFIX}/include/tcl8.2/generic \
-		--with-tcl-ver=8.2
+CONFIGURE_ARGS=	--with-tcl-ver=8.2 --with-tk-ver=8.2
+USE_AUTOCONF= yes
 
 post-install:
-	${LN} -sf libotcl.so.1 ${PREFIX}/lib/libotcl.so
+	${LN} -sf libotcl.so ${PREFIX}/lib/libotcl.so.1
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+	strip ${PREFIX}/bin/otclsh
+	strip ${PREFIX}/bin/owish
 
 .include <bsd.port.mk>
diff --git a/lang/otcl/distinfo b/lang/otcl/distinfo
index ebd64c3df6c4..33e932c5ef1f 100644
--- a/lang/otcl/distinfo
+++ b/lang/otcl/distinfo
@@ -1 +1 @@
-MD5 (otcl-1.0a4.tar.gz) = 1aafd63973857991b90d08b9dcf29e03
+MD5 (otcl-1.0a5.tar.gz) = 8099cc8660bb9e3403bf0e7a5f3e6c21
diff --git a/lang/otcl/files/patch-ac b/lang/otcl/files/patch-ac
new file mode 100644
index 000000000000..921fd27b66a5
--- /dev/null
+++ b/lang/otcl/files/patch-ac
@@ -0,0 +1,20 @@
+--- conf/configure.in.tcl.orig	Tue Feb 22 16:34:51 2000
++++ conf/configure.in.tcl	Tue Feb 22 16:35:27 2000
+@@ -92,7 +92,7 @@
+ 		/usr/local/lib/tcl$TCL_VERS \
+ 		/usr/local/lib/tcl$TCL_HI_VERS \
+ 		/usr/local/lib/tcl$TCL_ALT_VERS \
+-		/usr/local/include/tcl$TCL_VERS \
++		/usr/local/include/tcl$TCL_VERS/generic \
+ 		/usr/local/include/tcl$TCL_HI_VERS \
+ 		/usr/local/include/tcl$TCL_ALT_VERS \
+ 		/usr/local/include \
+@@ -159,7 +159,7 @@
+ 
+ 
+ NS_BEGIN_PACKAGE(tcl)
+-NS_CHECK_HEADER_PATH(tcl.h,$TCL_H_PLACES,$d,$TCL_H_PLACES_D,V_INCLUDE_TCL,tcl)
++NS_CHECK_HEADER_PATH(tclInt.h,$TCL_H_PLACES,$d,$TCL_H_PLACES_D,V_INCLUDE_TCL,tcl)
+ NS_CHECK_LIB_PATH(tcl$TCL_HI_VERS,$TCL_LIB_PLACES,$d,$TCL_LIB_PLACES_D,V_LIB_TCL,tcl)
+ NS_CHECK_ANY_PATH(init.tcl,$TCL_TCL_PLACES,$d,$TCL_TCL_PLACES_D,V_LIBRARY_TCL,tcl)
+ 
diff --git a/lang/otcl/files/patch-ad b/lang/otcl/files/patch-ad
new file mode 100644
index 000000000000..5be32b352a06
--- /dev/null
+++ b/lang/otcl/files/patch-ad
@@ -0,0 +1,20 @@
+--- conf/configure.in.tk.orig	Tue Feb 22 16:38:48 2000
++++ conf/configure.in.tk	Tue Feb 22 16:39:14 2000
+@@ -87,7 +87,7 @@
+                 /usr/local/lib/tk$TK_VERS \
+                 /usr/local/lib/tk$TK_ALT_VERS \
+                 /usr/local/lib/tk$TK_HI_VERS \
+-                /usr/local/include/tk$TK_VERS \
++                /usr/local/include/tk$TK_VERS/generic \
+                 /usr/local/include/tk$TK_ALT_VERS \
+                 /usr/local/include/tk$TK_HI_VERS \
+                 /usr/local/include \
+@@ -136,7 +136,7 @@
+                 /usr/lib"
+ 
+ NS_BEGIN_PACKAGE(tk)
+-NS_CHECK_HEADER_PATH(tk.h,$TK_H_PLACES,$d,$TK_H_PLACES_D,V_INCLUDE_TK,tk)
++NS_CHECK_HEADER_PATH(tkInt.h,$TK_H_PLACES,$d,$TK_H_PLACES_D,V_INCLUDE_TK,tk)
+ NS_CHECK_LIB_PATH(tk$TK_HI_VERS,$TK_LIB_PLACES,$d,$TK_LIB_PLACES_D,V_LIB_TK,tk)
+ NS_CHECK_ANY_PATH(tk.tcl,$TK_TCL_PLACES,$d,$TK_TCL_PLACES_D,V_LIBRARY_TK,tk)
+ NS_END_PACKAGE(tk,no)
diff --git a/lang/otcl/pkg-plist b/lang/otcl/pkg-plist
index 00574abc8478..5cf826daa007 100644
--- a/lang/otcl/pkg-plist
+++ b/lang/otcl/pkg-plist
@@ -2,7 +2,7 @@ bin/otclsh
 bin/owish
 include/otcl.h
 lib/libotcl.a
-lib/libotcl.so.1
 lib/libotcl.so
+lib/libotcl.so.1
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R