- updated to 1.13

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

Approved by:	garga (mentor)

1 files changed, 10 insertions, 8 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