cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Backout last update, it broke x11-fm/tkdesk

Browse Source 
Reported by:	lkoeller
This commit is contained in:
Pav Lucistnik 2003-12-15 00:28:18 +00:00
parent e001b637e5
commit 8ba417cf50
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=95823
5 changed files with 7 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lang/itcl/Makefile
View File

@ -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/

4
lang/itcl/files/Makefile.lib
View File

@ -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

11
lang/itcl/files/patch-itcl_class.c
View File

@ -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) {

20
lang/itcl/files/patch-itcl_ensemble.c
View File

@ -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;

11
lang/itcl/files/patch-tests-ensemble.test
View File

@ -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