From d3905e1614ff6a27fedcdbd22e602aa811ec8b34 Mon Sep 17 00:00:00 2001 From: minskim Date: Thu, 13 May 2004 22:06:03 +0000 Subject: - 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. --- lang/tk-tclX/Makefile | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'lang/tk-tclX/Makefile') 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 -- cgit v1.2.3