- updated to 1.13

- added USE_TK=80+
- uses REINPLACE_CMD for correct library search paths

Approved by:	garga (mentor)

4 files changed, 13 insertions, 50 deletions

diff --git a/lang/otcl/Makefile b/lang/otcl/Makefile
index 8c0e2e501477..4ecf555ab12a 100644
--- a/lang/otcl/Makefile
+++ b/lang/otcl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	otcl
-PORTVERSION=	1.12
+PORTVERSION=	1.13
 DISTVERSIONPREFIX=	src-
 CATEGORIES=	lang tcl84 tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -17,17 +17,14 @@ COMMENT=	MIT Object Tcl
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_TK=		yes
-USE_TK_BUILD=	yes
+USE_TK=		80+
+USE_TK_NO_THREADS=	yes
 
 USE_AUTOTOOLS=	autoconf:259
 USE_LDCONFIG=	yes
 
-PKGINSTALL=	${PORTSDIR}/lang/tcl84/pkg-install.tclsh
-PKGDEINSTALL=	${PORTSDIR}/lang/tcl84/pkg-deinstall.tclsh
-
 .if !defined(NOPORTDOCS)
-DOCS=		CHANGES.html README.html TODO.html \
+DOCS=		CHANGES.html README.html \
 		doc/autoload.html doc/capi.html doc/class.html \
 		doc/object.html doc/otcl-paper.ps.gz doc/tutorial.html
 PORTDOCS=	${DOCS:S/doc\///}
@@ -35,11 +32,16 @@ PORTDOCS=	${DOCS:S/doc\///}
 
 .include <bsd.port.pre.mk>
 
-CONFIGURE_ARGS+= --with-tcl-ver=${TCL_VER} --with-tk-ver=${TK_VER}
+CFLAGS+=	-DHAVE_UNISTD_H
+CONFIGURE_ARGS+=	--with-tcl-ver=${TCL_VER} --with-tk-ver=${TK_VER}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/conf/configure.in.x11
+	@${REINPLACE_CMD} -e 's|../lib/tcl$$TCL_HI_VERS|${TCL_LIBDIR}|g' \
+		-e 's|../include|${TCL_INCLUDEDIR}/generic|g' ${WRKSRC}/conf/configure.in.tcl
+	@${REINPLACE_CMD} -e 's|../lib/tk$$TK_HI_VERS|${TK_LIBDIR}|g' \
+		-e 's|../include|${TK_INCLUDEDIR}/generic|g' ${WRKSRC}/conf/configure.in.tk
 
 post-install:
 	${LN} -sf libotcl.so ${PREFIX}/lib/libotcl.so.1
diff --git a/lang/otcl/distinfo b/lang/otcl/distinfo
index b196829cfe95..4480c7ccf032 100644
--- a/lang/otcl/distinfo
+++ b/lang/otcl/distinfo
@@ -1,3 +1,3 @@
-MD5 (otcl-src-1.12.tar.gz) = 7d1d242c6600924d80558f0511bb070e
-SHA256 (otcl-src-1.12.tar.gz) = 47a8cd0f87f667c5f9de91b865838ba32436d39da4fb8749c1db6e0cca86e90b
-SIZE (otcl-src-1.12.tar.gz) = 315536
+MD5 (otcl-src-1.13.tar.gz) = f3e4864445429506397b720c7232e4c6
+SHA256 (otcl-src-1.13.tar.gz) = 23b3b7a88fd5a7bfe9f91fd0afd0ac85981c1c2ff0cae6714aee54f7f38ab25d
+SIZE (otcl-src-1.13.tar.gz) = 317440
diff --git a/lang/otcl/files/patch-ac b/lang/otcl/files/patch-ac
deleted file mode 100644
index 42254d6ff1b0..000000000000
--- a/lang/otcl/files/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
---- conf/configure.in.tcl.orig	Mon Sep 25 05:02:37 2006
-+++ conf/configure.in.tcl	Fri Feb 23 12:46:04 2007
-@@ -112,7 +112,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 \
-@@ -188,7 +188,6 @@
- 
- 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
deleted file mode 100644
index 5be32b352a06..000000000000
--- a/lang/otcl/files/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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)