- Update {tcl,tk}-tclX to 8.3.5.

- Bl3ify.
- Enable pkgviews installation.

OK'ed by jwise@, the maintainer.

Changes since 8.2:
	* got "make buildhelp" working
	* tcl/generic/tclXgeneral.c (TclX_EchoObjCmd): use encoding aware
	functions in 8.1+. [Bug #514053]
	* win/Makefile.in:
	* win/configure.in:
	* win/configure: Changed to use TCL_LIBS and TK_LIBS as the source
	  for the list of Windows libraries to link against. Fixes #501990.
	* tcl/generic/tclXlib.c (MakeAbsFile): Replaced a call to the
	  internal 'TclpGetCwd' with an access to the public API
	  'Tcl_GetCwd'. [457266]. Reported by Vincent Darley.
	* doc/TclX.n:
	* tcl/generic/tclXoscmds.c: allowed sleep to accept double values,
	to match the Expect sleep command.  This prevents conflicts that
	depended on the order of package requires.  [Patch #444332]
	* unix/tools/tclmanpages: Added "re_syntax.n" to the list of
	  processed manpages [#405956].
	* All of the changes below are there to fix bug [418295].
	* tcl/generic/tclXoscmds.c (TclX_OsCmdsInit): "system" and
	  "sleep" now use the new command creation procedure.
	* tcl/generic/tclXprocess.c (TclX_ProcessInit): "fork" and
	  "wait" now use the new command creation procedure.
	* tcl/generic/tclXutil.c (TclX_CreateObjCommand): Added
	  the implementation of this new procedure.
	* tcl/generic/tclExtdInt.h: Added TclX_CreateObjCommand to
	  encapsulate the logic for the creation of commands FOO and
	  tclx_FOO.
	* tcl/generic/tclXlist.c (TclX_LassignObjCmd): Added
	  TCL_LEAVE_ERR_MSG to call of 'Tcl_SetVar2Ex'. This
	  fixes the bug [227478].
	* tcl/generic/tclXgeneral.c (TclX_LoopObjCmd): Changed
	  'Tcl_AppendStringsToObj' into 'Tcl_AddErrorInfo'.
	  Fixes bug [226388]. Associated patch is [403050]. No need to
	  extend the testsuite, it already contained a test exercising the
	  bug.
	* tcl/unix/Makefile.in:
	* tk/unix/Makefile.in:
	Fixed bogus "test -f" on the new HELP_DIR directory, which should
	be "test -d".
	* win/Makefile.in - fixed because of new definition of
	TCL_SRC_DIR and TK_SRC_DIR
	* Changed the HELP_DIR to be configurable so I could have parallel
		builds not all trying to create the same help files.
	* tcl/win/configure.in, common.bc, common.vc
	    Fixed version number to 8.3
	* {tcl,tk}/unix/Makefile.in, tweaks to get references to LIB_RUNTIME_DIR
	    properly expanded on irix builds.  Also added BUILDHELP macro
	    that is conditional on nroff being present so we don't try to
	    build help files on systems with out nroff.
	* tcl/win/tclXAppInit.c, tk/generic/tkXshell.c, tk/win/tkXAppInit.c
	    - turn off USE_TCL_STUBS
	* win/Makefile.in, win/configure.in: Cleanup use of stubs library.
	* tcl/win/tclXwinOS.c (TclXOSkill): Added support for "kill"
	command on Windows platforms.

3 files changed, 89 insertions, 100 deletions

diff --git a/lang/tk-tclX/Makefile b/lang/tk-tclX/Makefile
index 443f3fa9b4e..76682d4afa8 100644
--- a/lang/tk-tclX/Makefile
+++ b/lang/tk-tclX/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2004/03/20 19:28:52 minskim Exp $
+# $NetBSD: Makefile,v 1.17 2004/05/13 22:06:04 minskim Exp $
 #
 
-DISTNAME=	tclX8.2.0
-PKGNAME=	tk-tclX-8.2.0
-PKGREVISION=	1
+DISTNAME=	tclx8.3.5-src
+PKGNAME=	tk-tclX-8.3.5
 CATEGORIES=	lang tcl tk
-MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/TclX/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tclx/}
 
 MAINTAINER=	jwise@NetBSD.org
 HOMEPAGE=	http://tclx.sourceforge.net/
@@ -13,8 +12,10 @@ COMMENT=	Extended Tcl (TclX), a set of Tcl extensions for system programming
 
 CONFLICTS+=	tclX-[0-9]*
 
-WRKSRC=		${WRKDIR}/tclX8.2.0/unix
-USE_BUILDLINK2=		yes
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+WRKSRC=			${WRKDIR}/${DISTNAME:S/-src//}/unix
+USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-shared \
@@ -29,20 +30,18 @@ CONFIGURE_ENV+=		\
 
 MAKE_ENV+=		GTAR=${GTAR} CHOWN=${CHOWN} CHMOD=${CHMOD} \
 			SHAREMODE=${SHAREMODE} SHAREOWN=${SHAREOWN} \
-			SHAREGRP=${SHAREGRP}
+			SHAREGRP=${SHAREGRP} \
+			TCLX_PREFIX=${BUILDLINK_PREFIX.tcl-tclX}
 
 FILESDIR=	${.CURDIR}/../../lang/tcl-tclX/files
 PATCHDIR=	${.CURDIR}/../../lang/tcl-tclX/patches
+DISTINFO_FILE=	${.CURDIR}/../../lang/tcl-tclX/distinfo
 
-SUBST_CLASSES+=		paths
-SUBST_MESSAGE.paths=	"Fixing Tcl/Tk library names."
-SUBST_STAGE.paths=	post-patch
-SUBST_FILES.paths=	${WRKSRC}/../tk/unix/Makefile.in
-SUBST_SED.paths=	-e 's,ltcl83,ltcl,g' -e 's,ltk83,ltk,g'
+INSTALLATION_DIRS=	bin include
 
-.include "../../lang/tcl/buildlink2.mk"
-.include "../../lang/tcl-tclX/buildlink2.mk"
-.include "../../x11/tk/buildlink2.mk"
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../lang/tcl-tclX/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
 
 post-extract:
 	${MV} ${WRKSRC}/../doc/Memory.n ${WRKSRC}/../doc/TclXMemory.n
@@ -67,8 +66,8 @@ post-build:
 	cd ${WRKSRC}/../tk/unix && ${MAKE_ENV} ${MAKE} buildhelp
 
 post-install:
-	${FIND} ${PREFIX}/lib/tcl/tclX8.2/help -type d -exec ${CHMOD} 555 '{}' \;
-	${FIND} ${PREFIX}/lib/tcl/tclX8.2/help -type f -exec ${CHMOD} 444 '{}' \;
+	${FIND} ${PREFIX}/lib/tcl/tclX8.3/help -type d -exec ${CHMOD} 555 '{}' \;
+	${FIND} ${PREFIX}/lib/tcl/tclX8.3/help -type f -exec ${CHMOD} 444 '{}' \;
 
 # 	@${RM} ${PREFIX}/man/man3/TkX_Main.3
 # 	@${RM} ${PREFIX}/man/man3/Tkx_Init.3
diff --git a/lang/tk-tclX/PLIST b/lang/tk-tclX/PLIST
index c92bdf848bb..a8fcda25be7 100644
--- a/lang/tk-tclX/PLIST
+++ b/lang/tk-tclX/PLIST
@@ -1,72 +1,74 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:25:21 zuntum Exp $
-bin/wishx
+@comment $NetBSD: PLIST,v 1.2 2004/05/13 22:06:04 minskim Exp $
 bin/tclhelp
+bin/wishx
+lib/libtkx83.a
+lib/libtkx83.la
+lib/libtkx83.so
+lib/libtkx83.so.1
+lib/libtkx83.so.1.0
+lib/tcl/tclX8.3/help/Tk.brf
+lib/tcl/tclX8.3/help/tk/control/bell
+lib/tcl/tclX8.3/help/tk/control/bind
+lib/tcl/tclX8.3/help/tk/control/bindtags
+lib/tcl/tclX8.3/help/tk/control/clipboard
+lib/tcl/tclX8.3/help/tk/control/destroy
+lib/tcl/tclX8.3/help/tk/control/event
+lib/tcl/tclX8.3/help/tk/control/focus
+lib/tcl/tclX8.3/help/tk/control/font
+lib/tcl/tclX8.3/help/tk/control/grab
+lib/tcl/tclX8.3/help/tk/control/grid
+lib/tcl/tclX8.3/help/tk/control/loadTk
+lib/tcl/tclX8.3/help/tk/control/lower
+lib/tcl/tclX8.3/help/tk/control/option
+lib/tcl/tclX8.3/help/tk/control/pack
+lib/tcl/tclX8.3/help/tk/control/pack-old
+lib/tcl/tclX8.3/help/tk/control/place
+lib/tcl/tclX8.3/help/tk/control/raise
+lib/tcl/tclX8.3/help/tk/control/selection
+lib/tcl/tclX8.3/help/tk/control/send
+lib/tcl/tclX8.3/help/tk/control/tk
+lib/tcl/tclX8.3/help/tk/control/tk_bisque
+lib/tcl/tclX8.3/help/tk/control/tk_focusNext
+lib/tcl/tclX8.3/help/tk/control/tk_setPalette
+lib/tcl/tclX8.3/help/tk/control/tkerror
+lib/tcl/tclX8.3/help/tk/control/tkvars
+lib/tcl/tclX8.3/help/tk/control/tkwait
+lib/tcl/tclX8.3/help/tk/control/winfo
+lib/tcl/tclX8.3/help/tk/control/wm
+lib/tcl/tclX8.3/help/tk/images/bitmap
+lib/tcl/tclX8.3/help/tk/images/image
+lib/tcl/tclX8.3/help/tk/images/photo
+lib/tcl/tclX8.3/help/tk/widgets/button
+lib/tcl/tclX8.3/help/tk/widgets/canvas
+lib/tcl/tclX8.3/help/tk/widgets/checkbutton
+lib/tcl/tclX8.3/help/tk/widgets/entry
+lib/tcl/tclX8.3/help/tk/widgets/frame
+lib/tcl/tclX8.3/help/tk/widgets/label
+lib/tcl/tclX8.3/help/tk/widgets/listbox
+lib/tcl/tclX8.3/help/tk/widgets/menu
+lib/tcl/tclX8.3/help/tk/widgets/menubutton
+lib/tcl/tclX8.3/help/tk/widgets/message
+lib/tcl/tclX8.3/help/tk/widgets/options
+lib/tcl/tclX8.3/help/tk/widgets/radiobutton
+lib/tcl/tclX8.3/help/tk/widgets/scale
+lib/tcl/tclX8.3/help/tk/widgets/scrollbar
+lib/tcl/tclX8.3/help/tk/widgets/text
+lib/tcl/tclX8.3/help/tk/widgets/tk_chooseColor
+lib/tcl/tclX8.3/help/tk/widgets/tk_dialog
+lib/tcl/tclX8.3/help/tk/widgets/tk_getOpenFile
+lib/tcl/tclX8.3/help/tk/widgets/tk_menuBar
+lib/tcl/tclX8.3/help/tk/widgets/tk_messageBox
+lib/tcl/tclX8.3/help/tk/widgets/tk_optionMenu
+lib/tcl/tclX8.3/help/tk/widgets/tk_popup
+lib/tcl/tclX8.3/help/tk/widgets/toplevel
+lib/tcl/tkX8.3/pkgIndex.tcl
+lib/tcl/tkX8.3/tkXAppInit.c
+lib/tcl/tkX8.3/tkx.tcl
 lib/tkxConfig.sh
-lib/libtkx82.so
-lib/libtkx82.so.1
-lib/libtkx82.so.1.0
-lib/libtkx82.la
-lib/libtkx82.a
-lib/tcl/tclX8.2/help/Tk.brf
-lib/tcl/tclX8.2/help/tk/control/bell
-lib/tcl/tclX8.2/help/tk/control/bind
-lib/tcl/tclX8.2/help/tk/control/bindtags
-lib/tcl/tclX8.2/help/tk/control/clipboard
-lib/tcl/tclX8.2/help/tk/control/destroy
-lib/tcl/tclX8.2/help/tk/control/event
-lib/tcl/tclX8.2/help/tk/control/focus
-lib/tcl/tclX8.2/help/tk/control/tk_focusNext
-lib/tcl/tclX8.2/help/tk/control/font
-lib/tcl/tclX8.2/help/tk/control/grab
-lib/tcl/tclX8.2/help/tk/control/grid
-lib/tcl/tclX8.2/help/tk/control/loadTk
-lib/tcl/tclX8.2/help/tk/control/lower
-lib/tcl/tclX8.2/help/tk/control/option
-lib/tcl/tclX8.2/help/tk/control/pack
-lib/tcl/tclX8.2/help/tk/control/pack-old
-lib/tcl/tclX8.2/help/tk/control/tk_setPalette
-lib/tcl/tclX8.2/help/tk/control/tk_bisque
-lib/tcl/tclX8.2/help/tk/control/place
-lib/tcl/tclX8.2/help/tk/control/raise
-lib/tcl/tclX8.2/help/tk/control/selection
-lib/tcl/tclX8.2/help/tk/control/send
-lib/tcl/tclX8.2/help/tk/control/tk
-lib/tcl/tclX8.2/help/tk/control/tkerror
-lib/tcl/tclX8.2/help/tk/control/tkvars
-lib/tcl/tclX8.2/help/tk/control/tkwait
-lib/tcl/tclX8.2/help/tk/control/winfo
-lib/tcl/tclX8.2/help/tk/control/wm
-lib/tcl/tclX8.2/help/tk/images/bitmap
-lib/tcl/tclX8.2/help/tk/images/image
-lib/tcl/tclX8.2/help/tk/images/photo
-lib/tcl/tclX8.2/help/tk/widgets/button
-lib/tcl/tclX8.2/help/tk/widgets/canvas
-lib/tcl/tclX8.2/help/tk/widgets/checkbutton
-lib/tcl/tclX8.2/help/tk/widgets/tk_chooseColor
-lib/tcl/tclX8.2/help/tk/widgets/tk_dialog
-lib/tcl/tclX8.2/help/tk/widgets/entry
-lib/tcl/tclX8.2/help/tk/widgets/frame
-lib/tcl/tclX8.2/help/tk/widgets/tk_getOpenFile
-lib/tcl/tclX8.2/help/tk/widgets/label
-lib/tcl/tclX8.2/help/tk/widgets/listbox
-lib/tcl/tclX8.2/help/tk/widgets/menu
-lib/tcl/tclX8.2/help/tk/widgets/tk_menuBar
-lib/tcl/tclX8.2/help/tk/widgets/menubutton
-lib/tcl/tclX8.2/help/tk/widgets/message
-lib/tcl/tclX8.2/help/tk/widgets/tk_messageBox
-lib/tcl/tclX8.2/help/tk/widgets/tk_optionMenu
-lib/tcl/tclX8.2/help/tk/widgets/options
-lib/tcl/tclX8.2/help/tk/widgets/tk_popup
-lib/tcl/tclX8.2/help/tk/widgets/radiobutton
-lib/tcl/tclX8.2/help/tk/widgets/scale
-lib/tcl/tclX8.2/help/tk/widgets/scrollbar
-lib/tcl/tclX8.2/help/tk/widgets/text
-lib/tcl/tclX8.2/help/tk/widgets/toplevel
-lib/tcl/tkX8.2/pkgIndex.tcl
-lib/tcl/tkX8.2/tkx.tcl
-lib/tcl/tkX8.2/tkXAppInit.c
-@dirrm lib/tcl/tclX8.2/help/tk/control
-@dirrm lib/tcl/tclX8.2/help/tk/images
-@dirrm lib/tcl/tclX8.2/help/tk/widgets
-@dirrm lib/tcl/tclX8.2/help/tk
-@dirrm lib/tcl/tkX8.2
+@dirrm lib/tcl/tkX8.3
+@dirrm lib/tcl/tclX8.3/help/tk/widgets
+@dirrm lib/tcl/tclX8.3/help/tk/images
+@dirrm lib/tcl/tclX8.3/help/tk/control
+@dirrm lib/tcl/tclX8.3/help/tk
+@comment in tcl-tclX: @dirrm lib/tcl/tclX8.3/help
+@comment in tcl-tclX: @dirrm lib/tcl/tclX8.3
diff --git a/lang/tk-tclX/distinfo b/lang/tk-tclX/distinfo
deleted file mode 100644
index a81922be82c..00000000000
--- a/lang/tk-tclX/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.4 2004/03/20 19:28:52 minskim Exp $
-
-SHA1 (tclX8.2.0.tar.gz) = 51295ad001d9d057e4ec2f13016f6aa4111fdd28
-Size (tclX8.2.0.tar.gz) = 721198 bytes
-SHA1 (patch-aa) = 47eb7e69e714a8bccf862c5115f6694c3b213881
-SHA1 (patch-ab) = da32caa8d65643f2159496ef016ce68b3f304e9e
-SHA1 (patch-ac) = 10f778e6a8336ff41164e2f089ac8ad7c8d5ccdb
-SHA1 (patch-ad) = 252a21da464267d7c7d45e168a89b29a40273359
-SHA1 (patch-ae) = a43144f37706245779362026073e09d8505a3d3f
-SHA1 (patch-af) = 5b68c6ea909437c66dad60bf7b330805d854baca
-SHA1 (patch-ag) = 6c8876699bfe325b3370bb554d4727e05fc64b8b
-SHA1 (patch-ah) = 8283f991ccc4f1cf35e9e100596bfbdf54157ad2