Pullup ticket #4016 - requested by wiz

lang/tcl-itcl: build fix update

Revisions pulled up:
- cad/tnt-mmtl/Makefile                                         1.20
- lang/tcl-itcl/DESCR                                           1.3
- lang/tcl-itcl/Makefile                                        1.25
- lang/tcl-itcl/PLIST                                           1.7
- lang/tcl-itcl/buildlink3.mk                                   1.12
- lang/tcl-itcl/distinfo                                        1.10
- lang/tcl-itcl/patches/patch-aa                                deleted
- lang/tcl-itcl/patches/patch-ab                                deleted
- lang/tcl-itcl/patches/patch-ac                                deleted
- lang/tcl-itcl/patches/patch-ad                                deleted
- lang/tcl-itcl/patches/patch-ag                                deleted
- lang/tcl-itcl/patches/patch-ah                                deleted
- sysutils/tkdesk/Makefile                                      1.21

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Mon Jan  7 13:26:41 UTC 2013

   Modified Files:
   	pkgsrc/lang/tcl-itcl: DESCR Makefile PLIST buildlink3.mk distinfo

   Log Message:
   Update to 3.4.1, based on othyro's package from wip.
   This version compiles with tcl-8.5.

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Mon Jan  7 13:27:04 UTC 2013

   Modified Files:
   	pkgsrc/cad/tnt-mmtl: Makefile

   Log Message:
   Use tcl-itcl, bump PKGREVISION.

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Mon Jan  7 13:27:29 UTC 2013

   Modified Files:
   	pkgsrc/sysutils/tkdesk: Makefile

   Log Message:
   Bump PKGREVISION for tcl-itcl shlib path change.

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Mon Jan  7 13:28:30 UTC 2013

   Removed Files:
   	pkgsrc/lang/tcl-itcl/patches: patch-aa patch-ab patch-ac patch-ad
   	    patch-ag patch-ah

   Log Message:
   Remove unused patches (after 3.4.1 update)

11 files changed, 26 insertions, 400 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..8c42c9a3fb0 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.24.2.1 2013/01/14 13:34:11 tron 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..55b5ba2568b 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.6.30.1 2013/01/14 13:34:11 tron 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..cc52d50ec1c 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.11.4.1 2013/01/14 13:34:11 tron 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..2e2684c4bc3 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.9.24.1 2013/01/14 13:34:11 tron 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
diff --git a/lang/tcl-itcl/patches/patch-aa b/lang/tcl-itcl/patches/patch-aa
deleted file mode 100644
index 84999ba050f..00000000000
--- a/lang/tcl-itcl/patches/patch-aa
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/10/26 04:22:38 minskim Exp $
-
---- itcl/configure.orig	2001-05-28 02:18:31.000000000 -0500
-+++ itcl/configure
-@@ -1130,7 +1130,7 @@ case "`uname -s`" in
-     ;;
-     *)
- 	CYGPATH=echo
--	RELPATH=..
-+	RELPATH=../..
-     ;;
- esac
- 
-@@ -1314,7 +1314,7 @@ echo "configure:1304: checking for Tcl p
- 	    TCL_PLATFORM_DIR_NATIVE=${TCL_WIN_DIR_NATIVE}
- 	;;
- 	*)
--	    TCL_TOP_DIR_NATIVE='$(TCL_SRC_DIR)'
-+	    TCL_TOP_DIR_NATIVE='$(TCL_HEADER_DIR)'
- 	    TCL_GENERIC_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/generic'
- 	    TCL_UNIX_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/unix'
- 	    TCL_WIN_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/win'
-@@ -1586,12 +1586,12 @@ fi
- # link against the non-stubbed Tcl library.
- #--------------------------------------------------------------------
- 
--if test "${SHARED_BUILD}" = "1" ; then
--    cat >> confdefs.h <<\EOF
--#define USE_TCL_STUBS 1
--EOF
-+#  if test "${SHARED_BUILD}" = "1" ; then
-+#      cat >> confdefs.h <<\EOF
-+#  #define USE_TCL_STUBS 1
-+#  EOF
- 
--fi
-+#  fi
- 
- #--------------------------------------------------------------------
- # This macro generates a line to use when building a library.  It
-@@ -1609,7 +1609,7 @@ fi
- 	    ;;
- 	*)
- 	    MAKE_STATIC_LIB="\${STLIB_LD} \$@ \$(\$@_OBJECTS)"
--	    MAKE_SHARED_LIB="\${SHLIB_LD} -o \$@ \$(\$@_OBJECTS) \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS}"
-+	    MAKE_SHARED_LIB="\${SHLIB_LD} -o \${@:C/\.so.*/.la/} \${\$@_OBJECTS:.o=.lo} \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS} -version-info 0:0"
- 	    ;;
-     esac
- 
diff --git a/lang/tcl-itcl/patches/patch-ab b/lang/tcl-itcl/patches/patch-ab
deleted file mode 100644
index 661b9fac089..00000000000
--- a/lang/tcl-itcl/patches/patch-ab
+++ /dev/null
@@ -1,87 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2010/02/11 13:44:02 joerg Exp $
-
---- itcl/Makefile.in.orig	Tue Aug 29 03:58:00 2000
-+++ itcl/Makefile.in
-@@ -115,7 +115,7 @@
- 
- SAMPLE_NEW_VAR=@SAMPLE_NEW_VAR@
- 
--ITCL_LIBRARY = $(prefix)/lib/itcl$(VERSION)
-+ITCL_LIBRARY = ${DESTDIR}$(prefix)/lib/tcl/itcl$(VERSION)
- 
- ITCL_GENERIC_DIR_NATIVE = @ITCL_GENERIC_DIR_NATIVE@
- ITCL_UNIX_DIR_NATIVE = @ITCL_UNIX_DIR_NATIVE@
-@@ -150,16 +150,16 @@
- DESTDIR =
- 
- pkgdatadir = $(datadir)/@PACKAGE@@VERSION@
--pkglibdir = $(libdir)/@PACKAGE@@VERSION@
-+pkglibdir = ${DESTDIR}$(libdir)/tcl/@PACKAGE@@VERSION@
- pkgincludedir = $(includedir)/@PACKAGE@@VERSION@
- 
- top_builddir = .
- 
- #INSTALL = $(top_srcdir)/../config/install-sh -c
--INSTALL = $(TCLSH_PROG) `@CYGPATH@ $(srcdir)/../config/installFile.tcl` -c
--INSTALL_PROGRAM = @INSTALL_PROGRAM@
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL = ${LIBTOOL} --mode=install ${BSD_INSTALL}
-+INSTALL_PROGRAM = ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM}
-+INSTALL_DATA = ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA}
-+INSTALL_SCRIPT = ${LIBTOOL} --mode=install ${BSD_INSTALL_SCRIPT}
- INSTALL_STRIP_FLAG =
- transform = @program_transform_name@
- 
-@@ -172,7 +172,7 @@
- 
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
--CC = @CC@
-+CC = ${LIBTOOL} --mode=compile @CC@
- CFLAGS_DEBUG = @CFLAGS_DEBUG@
- CFLAGS_DEFAULT = @CFLAGS_DEFAULT@
- CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
-@@ -187,9 +187,9 @@
- OBJEXT = @OBJEXT@
- RANLIB = @RANLIB@
- SHLIB_CFLAGS = @SHLIB_CFLAGS@
--SHLIB_LD = @SHLIB_LD@
-+SHLIB_LD = ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
- SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
--SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
-+SHLIB_LD_LIBS = -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltcl -lm
- STLIB_LD = @STLIB_LD@
- TCL_BIN_DIR = @TCL_BIN_DIR@
- TCL_DEFS = @TCL_DEFS@
-@@ -230,7 +230,7 @@
- AR = ar
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
-+CCLD = ${LIBTOOL} --mode=link @CC@
- LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
- 
- #========================================================================
-@@ -319,12 +319,10 @@
- $(itcl_LIB_FILE): $(itcl_OBJECTS)
- 	-rm -f $(itcl_LIB_FILE)
- 	@MAKE_LIB@
--	$(RANLIB) $(itcl_LIB_FILE)
- 
- $(itclstub_LIB_FILE): $(itclstub_OBJECTS)
- 	-rm -f $(itclstub_LIB_FILE)
- 	@MAKE_STATIC_LIB@
--	$(RANLIB) $(itclstub_LIB_FILE)
- 
- #========================================================================
- # We need to enumerate the list of .c to .o lines here.
-@@ -420,7 +418,7 @@
- #========================================================================
- 
- install-lib-binaries: installdirs
--	@list='$(lib_BINARIES)'; for p in $$list; do \
-+	@list='${itcl_LIB_FILE:C/\.so.*/.la/} $(lib_BINARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    ext=`echo $$p|sed -e "s/.*\.//"`; \
- 	    if test "x$$ext" = "xdll"; then \
diff --git a/lang/tcl-itcl/patches/patch-ac b/lang/tcl-itcl/patches/patch-ac
deleted file mode 100644
index 93cb39c5b92..00000000000
--- a/lang/tcl-itcl/patches/patch-ac
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2005/10/26 04:22:38 minskim Exp $
-
---- itk/configure.orig	2001-05-28 02:18:56.000000000 -0500
-+++ itk/configure
-@@ -1130,7 +1130,7 @@ case "`uname -s`" in
-     ;;
-     *)
- 	CYGPATH=echo
--	RELPATH=..
-+	RELPATH=../..
-     ;;
- esac
- 
-@@ -1575,7 +1575,7 @@ echo "configure:1565: checking for Tcl p
- 	    TCL_PLATFORM_DIR_NATIVE=${TCL_WIN_DIR_NATIVE}
- 	;;
- 	*)
--	    TCL_TOP_DIR_NATIVE='$(TCL_SRC_DIR)'
-+	    TCL_TOP_DIR_NATIVE='$(TCL_HEADER_DIR)'
- 	    TCL_GENERIC_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/generic'
- 	    TCL_UNIX_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/unix'
- 	    TCL_WIN_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/win'
-@@ -1882,20 +1882,20 @@ fi
- # link against the non-stubbed Tcl library.
- #--------------------------------------------------------------------
- 
--if test "${SHARED_BUILD}" = "1" ; then
--    cat >> confdefs.h <<\EOF
--#define USE_TCL_STUBS 1
--EOF
--
--    cat >> confdefs.h <<\EOF
--#define USE_TK_STUBS 1
--EOF
-+#  if test "${SHARED_BUILD}" = "1" ; then
-+#      cat >> confdefs.h <<\EOF
-+#  #define USE_TCL_STUBS 1
-+#  EOF
-+
-+#      cat >> confdefs.h <<\EOF
-+#  #define USE_TK_STUBS 1
-+#  EOF
-+
-+#      cat >> confdefs.h <<\EOF
-+#  #define USE_ITCL_STUBS 1
-+#  EOF
- 
--    cat >> confdefs.h <<\EOF
--#define USE_ITCL_STUBS 1
--EOF
--
--fi
-+#  fi
- 
- #--------------------------------------------------------------------
- # This macro generates a line to use when building a library.  It
-@@ -1902,7 +1902,7 @@ fi
- 	    ;;
- 	*)
- 	    MAKE_STATIC_LIB="\${STLIB_LD} \$@ \$(\$@_OBJECTS)"
--	    MAKE_SHARED_LIB="\${SHLIB_LD} -o \$@ \$(\$@_OBJECTS) \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS}"
-+	    MAKE_SHARED_LIB="\${SHLIB_LD} -o \${@:C/\.so.*/.la/} \${\$@_OBJECTS:.o=.lo} \${SHLIB_LDFLAGS} \${SHLIB_LD_LIBS} -version-info 0:0"
- 	    ;;
-     esac
- 
-@@ -1941,7 +1941,7 @@ case "`uname -s`" in
- 	;;
-     *)
- 	if test "${SHARED_BUILD}" = "1" ; then
--	    SHLIB_LD_LIBS="${tkstub_LIB_SPEC} ${TCL_BUILD_STUB_LIB_SPEC} ../itcl/${itclstub_LIB_FILE}"
-+	    SHLIB_LD_LIBS="${tkstub_LIB_SPEC} ${TCL_BUILD_STUB_LIB_SPEC} ../itcl/itclStubLib.lo"
- 	    eval "${PACKAGE}_LIB_FILE=lib${PACKAGE}${SHARED_LIB_SUFFIX}"
- 	    RANLIB=:
- 	else
diff --git a/lang/tcl-itcl/patches/patch-ad b/lang/tcl-itcl/patches/patch-ad
deleted file mode 100644
index e933ae8f058..00000000000
--- a/lang/tcl-itcl/patches/patch-ad
+++ /dev/null
@@ -1,87 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2010/02/11 13:44:02 joerg Exp $
-
---- itk/Makefile.in.orig	Tue Aug 29 03:58:00 2000
-+++ itk/Makefile.in
-@@ -103,7 +103,7 @@
- 
- SAMPLE_NEW_VAR=@SAMPLE_NEW_VAR@
- 
--ITK_LIBRARY = $(prefix)/lib/itk$(VERSION)
-+ITK_LIBRARY = ${DESTDIR}$(prefix)/lib/tcl/itk$(VERSION)
- 
- ITK_GENERIC_DIR_NATIVE = @ITK_GENERIC_DIR_NATIVE@
- ITK_UNIX_DIR_NATIVE = @ITK_UNIX_DIR_NATIVE@
-@@ -138,16 +138,16 @@
- DESTDIR =
- 
- pkgdatadir = $(datadir)/@PACKAGE@@VERSION@
--pkglibdir = $(libdir)/@PACKAGE@@VERSION@
-+pkglibdir = ${DESTDIR}$(libdir)/tcl/@PACKAGE@@VERSION@
- pkgincludedir = $(includedir)/@PACKAGE@@VERSION@
- 
- top_builddir = .
- 
- #INSTALL = $(top_srcdir)/../config/install-sh -c
--INSTALL = $(TCLSH_PROG) `@CYGPATH@ $(top_srcdir)/../config/installFile.tcl` -c
--INSTALL_PROGRAM = @INSTALL_PROGRAM@
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL = ${LIBTOOL} --mode=install ${BSD_INSTALL}
-+INSTALL_PROGRAM = ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM}
-+INSTALL_DATA = ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA}
-+INSTALL_SCRIPT = ${LIBTOOL} --mode=install ${BSD_INSTALL_SCRIPT}
- INSTALL_STRIP_FLAG =
- transform = @program_transform_name@
- 
-@@ -160,7 +160,7 @@
- 
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
--CC = @CC@
-+CC = ${LIBTOOL} --mode=compile @CC@
- CFLAGS_DEBUG = @CFLAGS_DEBUG@
- CFLAGS_DEFAULT = @CFLAGS_DEFAULT@
- CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@
-@@ -175,9 +175,9 @@
- OBJEXT = @OBJEXT@
- RANLIB = @RANLIB@
- SHLIB_CFLAGS = @SHLIB_CFLAGS@
--SHLIB_LD = @SHLIB_LD@
-+SHLIB_LD = ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
- SHLIB_LDFLAGS = @SHLIB_LDFLAGS@
--SHLIB_LD_LIBS = @SHLIB_LD_LIBS@
-+SHLIB_LD_LIBS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltk -ltcl -lX11 -lm
- STLIB_LD = @STLIB_LD@
- TCL_BIN_DIR = @TCL_BIN_DIR@
- TCL_DEFS = @TCL_DEFS@
-@@ -225,7 +225,7 @@
- AR = ar
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
-+CCLD = ${LIBTOOL} --mode=link @CC@
- LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
- 
- #========================================================================
-@@ -314,12 +314,10 @@
- $(itk_LIB_FILE): $(itk_OBJECTS)
- 	-rm -f $(itk_LIB_FILE)
- 	@MAKE_LIB@
--	$(RANLIB) $(itk_LIB_FILE)
- 
- $(itkstub_LIB_FILE): $(itkstub_OBJECTS)
- 	-rm -f $(itkstub_LIB_FILE)
- 	@MAKE_STATIC_LIB@
--	$(RANLIB) $(itkstub_LIB_FILE)
- 
- #========================================================================
- # We need to enumerate the list of .c to .o lines here.
-@@ -394,7 +392,7 @@
- #========================================================================
- 
- install-lib-binaries: installdirs
--	@list='$(lib_BINARIES)'; for p in $$list; do \
-+	@list='${itk_LIB_FILE:C/\.so.*/.la/} $(lib_BINARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    ext=`echo $$p|sed -e "s/.*\.//"`; \
- 	    if test "x$$ext" = "xdll"; then \
diff --git a/lang/tcl-itcl/patches/patch-ag b/lang/tcl-itcl/patches/patch-ag
deleted file mode 100644
index 5ff4d68bd74..00000000000
--- a/lang/tcl-itcl/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2005/10/26 04:22:38 minskim Exp $
-
---- itcl/generic/itcl_cmds.c.orig	2001-05-21 20:50:21.000000000 -0500
-+++ itcl/generic/itcl_cmds.c
-@@ -62,9 +62,9 @@ namespace eval ::itcl {\n\
-             if {[info exists env(ITCL_LIBRARY)]} {\n\
-                 lappend dirs $env(ITCL_LIBRARY)\n\
-             }\n\
--            lappend dirs [file join [file dirname $tcl_library] itcl$version]\n\
-+            lappend dirs [file join [file dirname $tcl_library] tcl itcl$version]\n\
-             set bindir [file dirname [info nameofexecutable]]\n\
--            lappend dirs [file join $bindir .. lib itcl$version]\n\
-+            lappend dirs [file join $bindir .. lib tcl itcl$version]\n\
-             lappend dirs [file join $bindir .. library]\n\
-             lappend dirs [file join $bindir .. .. library]\n\
-             lappend dirs [file join $bindir .. .. itcl library]\n\
diff --git a/lang/tcl-itcl/patches/patch-ah b/lang/tcl-itcl/patches/patch-ah
deleted file mode 100644
index 339b2e05f3a..00000000000
--- a/lang/tcl-itcl/patches/patch-ah
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2005/11/04 16:35:58 minskim Exp $
-
---- itk/generic/itk_cmds.c.orig	2001-06-22 04:38:54.000000000 +0000
-+++ itk/generic/itk_cmds.c
-@@ -67,9 +67,9 @@ namespace eval ::itk {\n\
-             if {[info exists env(ITK_LIBRARY)]} {\n\
-                 lappend dirs $env(ITK_LIBRARY)\n\
-             }\n\
--            lappend dirs [file join [file dirname $tcl_library] itk$version]\n\
-+            lappend dirs [file join [file dirname $tcl_library] tcl itk$version]\n\
-             set bindir [file dirname [info nameofexecutable]]\n\
--            lappend dirs [file join $bindir .. lib itk$version]\n\
-+            lappend dirs [file join $bindir .. lib tcl itk$version]\n\
-             lappend dirs [file join $bindir .. library]\n\
-             lappend dirs [file join $bindir .. .. library]\n\
-             lappend dirs [file join $bindir .. .. itk library]\n\