1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-07 11:49:40 +00:00

- updated to 1.19

- added USE_TK same as lang/otcl uses
- added patch: patch-Tcl.cc (fixes support for tcl/tk 8.3 and lower)
- uses REINPLACE_CMD for correct library search paths

Approved by:	garga (mentor)
This commit is contained in:
Martin Matuska 2007-04-30 13:00:03 +00:00
parent 382ab54192
commit 6c67af15a7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=191202
6 changed files with 43 additions and 37 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= tclcl
PORTVERSION= 1.18
PORTVERSION= 1.19
DISTVERSIONPREFIX= src-
CATEGORIES= devel tcl84 tk84
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
@ -19,20 +19,35 @@ LIB_DEPENDS= otcl:${PORTSDIR}/lang/otcl
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_TK= yes
USE_TK_BUILD= yes
USE_AUTOTOOLS= autoconf:259
GNU_CONFIGURE= yes
.if !defined(NOPORTDOCS)
PORTDOCS= CHANGES.html
PORTDOCS= CHANGES.html TODO.html
.endif
.include <bsd.port.pre.mk>
# We have to link against the same Tcl/Tk version as OTcl does
.if exists(${LOCALBASE}/bin/otclsh)
OTCL_TCLVER!= ${ECHO_CMD} puts \$$tcl_version | ${LOCALBASE}/bin/otclsh
USE_TK= ${OTCL_TCLVER:S/.//}
.else
USE_TK= 80+
.endif
.include "${PORTSDIR}/Mk/bsd.tcl.mk"
CONFIGURE_ARGS= --with-tcl-ver=${TCL_VER} --with-tk-ver=${TK_VER} \
--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
post-patch:
@${REINPLACE_CMD} -e 's|exec tclsh|exec ${TCLSH}|g' ${WRKSRC}/otcldoc
@${REINPLACE_CMD} -e 's|../lib/tcl$$TCL_HI_VERS|${TCL_LIBDIR}|g' \
-e 's|../include|${TCL_INCLUDEDIR}/generic|g' ${WRKSRC}/conf/configure.in.tcl
@${REINPLACE_CMD} -e 's|../lib/tk$$TK_HI_VERS|${TK_LIBDIR}|g' \
-e 's|../include|${TK_INCLUDEDIR}/generic|g' ${WRKSRC}/conf/configure.in.tk
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/tcl2c++ ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/otcldoc ${PREFIX}/bin

View File

@ -1,3 +1,3 @@
MD5 (tclcl-src-1.18.tar.gz) = 88f46da7ca7fd95786cf200b75177471
SHA256 (tclcl-src-1.18.tar.gz) = f8a82b2d918207b0adf4fdc982052c467aac1e3071a0b9caeb9bbed18698e745
SIZE (tclcl-src-1.18.tar.gz) = 155757
MD5 (tclcl-src-1.19.tar.gz) = 023aefbd2e6d99ad96eb2cbe8acdbf4a
SHA256 (tclcl-src-1.19.tar.gz) = 460fbad1f9bca42ec41581df008c2b450155f655cfc7df46a92f80179efd9b36
SIZE (tclcl-src-1.19.tar.gz) = 174080

View File

@ -1,9 +0,0 @@
--- Makefile.in Wed Jan 19 14:21:21 2005
+++ Makefile.in Sat Jul 2 20:33:28 2005
@@ -110,5 +110,5 @@
TCL_84_LIBRARY_FILES = \
$(TCL_BASE_LIBRARY_FILES) \
- $(LIBRARY_TCL)/http2.4/http.tcl
+ $(LIBRARY_TCL)/http2.5/http.tcl
TCL_LIBRARY_FILES = \

View File

@ -0,0 +1,11 @@
--- Tcl.cc.orig Sun Apr 29 16:21:14 2007
+++ Tcl.cc Sun Apr 29 16:21:26 2007
@@ -546,7 +546,7 @@
need_parse = 1;
continue;
};
- result = Tcl_SplitList(in, argv[i], &ac, (const char ***) &av);
+ result = Tcl_SplitList(in, argv[i], &ac, (CONST84 char ***) &av);
if (result != TCL_OK) break;
if (ac == 1) {
varName = localName = av[0];

View File

@ -1,11 +0,0 @@
--- tclcl-1.0b8/otcldoc.orig Mon Apr 26 10:53:34 1999
+++ otcldoc Mon Apr 26 10:53:43 1999
@@ -1,7 +1,7 @@
#!/bin/sh
# the exec restarts using tclsh which in turn ignores
# the command because of this backslash: \
-exec tclsh "$0" "$@"
+exec tclsh8.4 "$0" "$@"
#
# otcldoc - a simple script for translating otcl classes into

View File

@ -1,10 +1,10 @@
--- conf/configure.in.tcl.orig Fri Feb 23 13:11:09 2007
+++ conf/configure.in.tcl Fri Feb 23 13:11:32 2007
@@ -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_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)
--- conf/configure.in.tcl.orig Sun Feb 18 23:16:52 2007
+++ conf/configure.in.tcl Sun Apr 29 16:49:25 2007
@@ -197,6 +197,7 @@
tcl_http_places=" \
$V_LIBRARY_TCL \
$V_LIBRARY_TCL/http \
+ $V_LIBRARY_TCL/http2.5 \
$V_LIBRARY_TCL/http2.4 \
$V_LIBRARY_TCL/http2.3 \
$V_LIBRARY_TCL/http2.1 \