Update to 3.4.1, based on othyro's package from wip.

This version compiles with tcl-8.5.

5 files changed, 26 insertions, 71 deletions

diff --git a/lang/tcl-itcl/DESCR b/lang/tcl-itcl/DESCR
index 570d33366e8..7f509b16eee 100644
--- a/lang/tcl-itcl/DESCR
+++ b/lang/tcl-itcl/DESCR
@@ -1,8 +1,3 @@
-[incr Tcl] provides the extra language support needed to build large Tcl/Tk
-applications. It introduces the notion of objects, which act as building
-blocks for an application. Each object is a bag of data with a set of
-procedures or "methods" that are used to manipulate it. Objects are organized
-into "classes" with identical characteristics, and classes can inherit
-functionality from one another. This object-oriented paradigm adds another
-level of organization on top of the basic variable/procedure elements, and
-the resulting code is easier to understand and maintain.
+[incr Tcl] is the most widely used O-O system for Tcl. The name is a play on
+C++, and [incr Tcl] provides a similar object model, including multiple
+inheritence and public and private classes and variables.
diff --git a/lang/tcl-itcl/Makefile b/lang/tcl-itcl/Makefile
index 64a818e40bf..da37a1afb94 100644
--- a/lang/tcl-itcl/Makefile
+++ b/lang/tcl-itcl/Makefile
@@ -1,34 +1,18 @@
-# $NetBSD: Makefile,v 1.24 2012/10/02 20:11:55 asau Exp $
+# $NetBSD: Makefile,v 1.25 2013/01/07 13:26:41 wiz Exp $
+#
 
-DISTNAME=	itcl3.2.1_src
-PKGNAME=	tcl-itcl-3.2.1
-PKGREVISION=	2
-CATEGORIES=	lang
+DISTNAME=	itcl3.4.1
+PKGNAME=	${DISTNAME:S/itcl/tcl-itcl-/}
+PKGREVISION=	1
+CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=incrtcl/}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://incrtcl.sourceforge.net/itcl/
-COMMENT=	[incr Tcl] object-oriented extension to Tcl/Tk
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-CONFLICTS+=	tcl-itcl-current-[0-9]*
+HOMEPAGE=	http://incrtcl.sourceforge.net/
+COMMENT=	O-O system for Tcl
+LICENSE=	2-clause-bsd # ?
 
 GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-
-WRKSRC=		${WRKDIR}/itcl3.2.1
-CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl:Q}/lib
-CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_PREFIX.tk:Q}/lib
-CONFIGURE_ARGS+=	--enable-shared
-CONFIGURE_ENV+=	AR=${AR:Q}
-
-MAKE_ENV+=	TCL_HEADER_DIR=${BUILDLINK_PREFIX.tcl}/include/tcl
-
-INSTALL_MAKE_FLAGS+=	mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} \
-			includedir=${DESTDIR}${PREFIX}/include
 
-.include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/tcl-itcl/PLIST b/lang/tcl-itcl/PLIST
index 3b5f1d09424..0a265e8bcfa 100644
--- a/lang/tcl-itcl/PLIST
+++ b/lang/tcl-itcl/PLIST
@@ -1,25 +1,13 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:03:43 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2013/01/07 13:26:41 wiz Exp $
 include/itcl.h
 include/itclDecls.h
 include/itclInt.h
 include/itclIntDecls.h
-include/itk.h
-include/itkDecls.h
-lib/libitcl32.la
-lib/libitclstub32.a
-lib/libitk32.la
-lib/libitkstub32.a
-lib/tcl/itcl3.2/itcl.tcl
-lib/tcl/itcl3.2/pkgIndex.tcl
-lib/tcl/itk3.2/Archetype.itk
-lib/tcl/itk3.2/Toplevel.itk
-lib/tcl/itk3.2/Widget.itk
-lib/tcl/itk3.2/itk.tcl
-lib/tcl/itk3.2/pkgIndex.tcl
-lib/tcl/itk3.2/tclIndex
-man/mann/Archetype.n
-man/mann/Toplevel.n
-man/mann/Widget.n
+lib/itcl3.4/itcl.tcl
+lib/itcl3.4/libitcl3.4.so
+lib/itcl3.4/libitclstub3.4.a
+lib/itcl3.4/pkgIndex.tcl
+lib/itclConfig.sh
 man/mann/body.n
 man/mann/class.n
 man/mann/code.n
@@ -27,12 +15,8 @@ man/mann/configbody.n
 man/mann/delete.n
 man/mann/ensemble.n
 man/mann/find.n
+man/mann/is.n
 man/mann/itcl.n
-man/mann/itcl_class.n
-man/mann/itcl_info.n
 man/mann/itclvars.n
-man/mann/itk.n
-man/mann/itkvars.n
 man/mann/local.n
 man/mann/scope.n
-man/mann/usual.n
diff --git a/lang/tcl-itcl/buildlink3.mk b/lang/tcl-itcl/buildlink3.mk
index 1650171a72e..7155df019f8 100644
--- a/lang/tcl-itcl/buildlink3.mk
+++ b/lang/tcl-itcl/buildlink3.mk
@@ -1,16 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.11 2012/08/21 23:49:23 marino Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2013/01/07 13:26:41 wiz Exp $
 
 BUILDLINK_TREE+=	tcl-itcl
 
 .if !defined(TCL_ITCL_BUILDLINK3_MK)
 TCL_ITCL_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.tcl-itcl+=	tcl-itcl>=3.2.1
-BUILDLINK_ABI_DEPENDS.tcl-itcl+=	tcl-itcl>=3.2.1nb2
+BUILDLINK_API_DEPENDS.tcl-itcl+=	tcl-itcl>=3.4.1
 BUILDLINK_PKGSRCDIR.tcl-itcl?=	../../lang/tcl-itcl
 
-.include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
-.endif # TCL_ITCL_BUILDLINK3_MK
+.endif	# TCL_ITCL_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-tcl-itcl
diff --git a/lang/tcl-itcl/distinfo b/lang/tcl-itcl/distinfo
index d7c5d12cad2..0ddb42a9a45 100644
--- a/lang/tcl-itcl/distinfo
+++ b/lang/tcl-itcl/distinfo
@@ -1,11 +1,5 @@
-$NetBSD: distinfo,v 1.9 2010/02/11 13:44:02 joerg Exp $
+$NetBSD: distinfo,v 1.10 2013/01/07 13:26:41 wiz Exp $
 
-SHA1 (itcl3.2.1_src.tgz) = 890f56e61826a9c3522fb24bf3c08f73cea8a1dd
-RMD160 (itcl3.2.1_src.tgz) = 6a6bbc5596e3c7b8bfd6783533d26d07b1c3a7c1
-Size (itcl3.2.1_src.tgz) = 427026 bytes
-SHA1 (patch-aa) = 5357555498f874a5d90de6451847e50df167ab9f
-SHA1 (patch-ab) = 7d27e16f77fd4723d6bb639cf5be6cdb35149509
-SHA1 (patch-ac) = 7885a8d126449068f3af7e748193b2cdf3051fce
-SHA1 (patch-ad) = 4f21f77b68fa3c406f9e3d24d01c7158f6a7825a
-SHA1 (patch-ag) = 3d12b3a2cf0cd35c39f622cf8f9b4872772c12c6
-SHA1 (patch-ah) = 759946f4f066b5e6d41a4120c983b1a169dff3df
+SHA1 (itcl3.4.1.tar.gz) = b791374d8fe4c5b31d6f45793622499a9d08d3e1
+RMD160 (itcl3.4.1.tar.gz) = a3293d8e7beeee8cd308a7c56edf7c790a374ef4
+Size (itcl3.4.1.tar.gz) = 263316 bytes