summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2003-12-15 00:28:18 +0000
committerPav Lucistnik <pav@FreeBSD.org>2003-12-15 00:28:18 +0000
commit8ba417cf507fa54f2cc0e22acba3aa0c947ea853 (patch)
tree20d9faf95e6eb429218287806e95c13361d492ff /lang
parentBuild this port with tix8184. (diff)
- Backout last update, it broke x11-fm/tkdesk
Reported by: lkoeller
Diffstat (limited to 'lang')
-rw-r--r--lang/itcl/Makefile10
-rw-r--r--lang/itcl/files/Makefile.lib4
-rw-r--r--lang/itcl/files/patch-itcl_class.c11
-rw-r--r--lang/itcl/files/patch-itcl_ensemble.c20
-rw-r--r--lang/itcl/files/patch-tests-ensemble.test11
5 files changed, 7 insertions, 49 deletions
diff --git a/lang/itcl/Makefile b/lang/itcl/Makefile
index dc8a6ab2bee5..45d838be77ef 100644
--- a/lang/itcl/Makefile
+++ b/lang/itcl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= itcl
PORTVERSION= ${MAJOR}.${MINOR}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=incrtcl
@@ -16,13 +16,13 @@ DISTNAME= itcl${PORTVERSION}
MAINTAINER= ports@freebsd.org
COMMENT= [incr Tcl] (A.K.A. "itcl")
-LIB_DEPENDS= tcl84:${PORTSDIR}/lang/tcl84
+LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83
WRKSRC= ${WRKDIR}/${DISTNAME}/itcl
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-PKGINSTALL= ${PORTSDIR}/lang/tcl84/pkg-install.tclsh
-PKGDEINSTALL= ${PORTSDIR}/lang/tcl84/pkg-deinstall.tclsh
+PKGINSTALL= ${PORTSDIR}/lang/tcl83/pkg-install.tclsh
+PKGDEINSTALL= ${PORTSDIR}/lang/tcl83/pkg-deinstall.tclsh
MAKE_ENV+= ${PLIST_SUB} \
SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR}
@@ -57,7 +57,7 @@ post-patch:
post-build test:
cd ${WRKSRC} && ${SETENV} ITCL_LIBRARY=${WRKSRC}/library \
- ${PREFIX}/bin/tclsh8.4 tests/all.tcl
+ ${PREFIX}/bin/tclsh8.3 tests/all.tcl
post-install:
${INSTALL_DATA} ${WRKSRC}/doc/*.n ${PREFIX}/man/mann/
diff --git a/lang/itcl/files/Makefile.lib b/lang/itcl/files/Makefile.lib
index 09b414b44173..c9fe57f90e05 100644
--- a/lang/itcl/files/Makefile.lib
+++ b/lang/itcl/files/Makefile.lib
@@ -2,7 +2,7 @@ NOPROFILE= yes
LIB= itcl${MAJOR}${MINOR}
ITCL_LIBRARY= ${PREFIX}/lib/itcl${MAJOR}.${MINOR}
CFLAGS+= -I. -I./../generic \
- -I${PREFIX}/include/tcl8.4/generic \
+ -I${PREFIX}/include/tcl8.3/generic \
-DHAVE_GETCWD=1 -DNO_VALUES_H=1 -DHAVE_UNISTD_H=1 -DUSE_TERMIOS=1\
-DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1\
-DHAVE_TM_GMTOFF=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1\
@@ -11,7 +11,7 @@ CFLAGS+= -I. -I./../generic \
-DHAVE_SYS_FILIO_H=1 \
-DRETSIGTYPE=void \
-DITCL_LIBRARY=\"${ITCL_LIBRARY}\"
-LDADD+= -L${PREFIX}/lib -ltcl84
+LDADD+= -L${PREFIX}/lib -ltcl83
.PATH: ${.CURDIR}/unix ${.CURDIR}/generic ${.CURDIR}/man
diff --git a/lang/itcl/files/patch-itcl_class.c b/lang/itcl/files/patch-itcl_class.c
deleted file mode 100644
index 0ccd8dabb726..000000000000
--- a/lang/itcl/files/patch-itcl_class.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- generic/itcl_class.c.orig Thu Oct 23 17:58:16 2003
-+++ generic/itcl_class.c Thu Oct 23 17:59:01 2003
-@@ -960,7 +960,7 @@
- * it--as it is being resolved again by the compiler.
- */
- cmdPtr = (Command*)mfunc->accessCmd;
-- if (!cmdPtr || cmdPtr->deleted) {
-+ if (!cmdPtr || (cmdPtr->flags & CMD_IS_DELETED)) {
- mfunc->accessCmd = NULL;
-
- if ((flags & TCL_LEAVE_ERR_MSG) != 0) {
diff --git a/lang/itcl/files/patch-itcl_ensemble.c b/lang/itcl/files/patch-itcl_ensemble.c
deleted file mode 100644
index dc5266a617c5..000000000000
--- a/lang/itcl/files/patch-itcl_ensemble.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- generic/itcl_ensemble.c.orig Thu Oct 23 17:59:33 2003
-+++ generic/itcl_ensemble.c Thu Oct 23 18:00:52 2003
-@@ -819,7 +819,7 @@
- cmdPtr->clientData = NULL;
- cmdPtr->deleteProc = DeleteEnsemble;
- cmdPtr->deleteData = cmdPtr->objClientData;
-- cmdPtr->deleted = 0;
-+ cmdPtr->flags = 0;
- cmdPtr->importRefPtr = NULL;
-
- ensPart->cmdPtr = cmdPtr;
-@@ -896,7 +896,7 @@
- cmdPtr->clientData = NULL;
- cmdPtr->deleteProc = deleteProc;
- cmdPtr->deleteData = (ClientData)clientData;
-- cmdPtr->deleted = 0;
-+ cmdPtr->flags = 0;
- cmdPtr->importRefPtr = NULL;
-
- ensPart->cmdPtr = cmdPtr;
diff --git a/lang/itcl/files/patch-tests-ensemble.test b/lang/itcl/files/patch-tests-ensemble.test
deleted file mode 100644
index 55d990d9278f..000000000000
--- a/lang/itcl/files/patch-tests-ensemble.test
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/ensemble.test.orig Fri Oct 24 20:00:39 2003
-+++ tests/ensemble.test Fri Oct 24 20:00:53 2003
-@@ -46,7 +46,7 @@
-
- test ensemble-1.5 {invoking parts with improper arguments} {
- list [catch "test_numbers three x" msg] $msg
--} {1 {no value given for parameter "y" to "test_numbers three"}}
-+} {1 {wrong # args: should be "test_numbers three x y z"}}
-
- test ensemble-1.6 {errors trigger a usage summary} {
- list [catch "test_numbers foo x y" msg] $msg