- Update to 1.12

- Pass maintainership to submitter

PR:             109464
Submitted by:   Martin Matuska <martin@matuska.org>

3 files changed, 35 insertions, 16 deletions

diff --git a/lang/otcl/Makefile b/lang/otcl/Makefile
index c8a8e88f095e..6a8f600865d4 100644
--- a/lang/otcl/Makefile
+++ b/lang/otcl/Makefile
@@ -6,23 +6,37 @@
 #
 
 PORTNAME=	otcl
-PORTVERSION=	1.9
+PORTVERSION=	1.12
+DISTVERSIONPREFIX=	src-
 CATEGORIES=	lang tcl84 tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	otcl-tclcl
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	martin@matuska.org
 COMMENT=	MIT Object Tcl
 
-LIB_DEPENDS=	tk84:${PORTSDIR}/x11-toolkits/tk84
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_AUTOTOOLS=	autoconf:213
-CONFIGURE_ARGS=	--with-tcl-ver=8.4 --with-tk-ver=8.4
+USE_TK=		yes
+USE_TK_BUILD=	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 \
+		doc/autoload.html doc/capi.html doc/class.html \
+		doc/object.html doc/otcl-paper.ps.gz doc/tutorial.html
+PORTDOCS=	${DOCS:S/doc\///}
+.endif
+
+.include <bsd.port.pre.mk>
+
+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
@@ -34,5 +48,11 @@ post-install:
 .if exists(${PKGINSTALL})
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
 .endif
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for FILE in ${DOCS}
+	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
+.endfor
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/otcl/distinfo b/lang/otcl/distinfo
index 929575bc4c2c..b196829cfe95 100644
--- a/lang/otcl/distinfo
+++ b/lang/otcl/distinfo
@@ -1,3 +1,3 @@
-MD5 (otcl-1.9.tar.gz) = d17331ef65912f43c530c57565f85600
-SHA256 (otcl-1.9.tar.gz) = 3c5ca1d8f1c3fce788371a2b30b63e2f0b51f8c359672f78b101418786cbd09e
-SIZE (otcl-1.9.tar.gz) = 309728
+MD5 (otcl-src-1.12.tar.gz) = 7d1d242c6600924d80558f0511bb070e
+SHA256 (otcl-src-1.12.tar.gz) = 47a8cd0f87f667c5f9de91b865838ba32436d39da4fb8749c1db6e0cca86e90b
+SIZE (otcl-src-1.12.tar.gz) = 315536
diff --git a/lang/otcl/files/patch-ac b/lang/otcl/files/patch-ac
index 921fd27b66a5..42254d6ff1b0 100644
--- a/lang/otcl/files/patch-ac
+++ b/lang/otcl/files/patch-ac
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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 \
@@ -9,12 +9,11 @@
  		/usr/local/include/tcl$TCL_HI_VERS \
  		/usr/local/include/tcl$TCL_ALT_VERS \
  		/usr/local/include \
-@@ -159,7 +159,7 @@
- 
+@@ -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_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)