diff options
| -rw-r--r-- | lang/tcl84/Makefile | 2 | ||||
| -rw-r--r-- | lang/tcl84/distinfo | 4 | ||||
| -rw-r--r-- | lang/tcl84/files/patch-tclUnixNotfy.c | 25 | ||||
| -rw-r--r-- | x11-toolkits/tk84/Makefile | 11 | ||||
| -rw-r--r-- | x11-toolkits/tk84/distinfo | 4 | ||||
| -rw-r--r-- | x11-toolkits/tk84/files/patch-ab | 3 |
6 files changed, 10 insertions, 39 deletions
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile index d5cf59b428d8..6ae8fb44de57 100644 --- a/lang/tcl84/Makefile +++ b/lang/tcl84/Makefile @@ -6,7 +6,7 @@ # PORTNAME= tcl -PORTVERSION= 8.4.10 +PORTVERSION= 8.4.11 PORTEPOCH= 1 CATEGORIES= lang tcl84 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} diff --git a/lang/tcl84/distinfo b/lang/tcl84/distinfo index 6661f3ba2ca6..18ea60c41d35 100644 --- a/lang/tcl84/distinfo +++ b/lang/tcl84/distinfo @@ -1,2 +1,2 @@ -MD5 (tcl8.4.10-src.tar.gz) = 409488e199a51803199d72b5dc534bb0 -SIZE (tcl8.4.10-src.tar.gz) = 3525737 +MD5 (tcl8.4.11-src.tar.gz) = 629dfea34e4087eb4683f834060abb63 +SIZE (tcl8.4.11-src.tar.gz) = 3474428 diff --git a/lang/tcl84/files/patch-tclUnixNotfy.c b/lang/tcl84/files/patch-tclUnixNotfy.c deleted file mode 100644 index e0160b7c1f4b..000000000000 --- a/lang/tcl84/files/patch-tclUnixNotfy.c +++ /dev/null @@ -1,25 +0,0 @@ -=================================================================== -RCS file: /cvsroot/tcl/tcl/unix/tclUnixNotfy.c,v -retrieving revision 1.11.2.11 -retrieving revision 1.11.2.12 -diff -u -r1.11.2.11 -r1.11.2.12 ---- tclUnixNotfy.c 2005/05/31 08:29:10 1.11.2.11 -+++ tclUnixNotfy.c 2005/06/07 10:26:58 1.11.2.12 -@@ -275,7 +275,7 @@ - */ - - if (notifierCount == 0) { -- int result; -+ int result, dummy; - if (triggerPipe < 0) { - panic("Tcl_FinalizeNotifier: notifier pipe not initialized"); - } -@@ -294,7 +294,7 @@ - close(triggerPipe); - - Tcl_ConditionWait(¬ifierCV, ¬ifierMutex, NULL); -- result = Tcl_JoinThread(notifierThread); -+ result = Tcl_JoinThread(notifierThread, &dummy); - if (result) { - Tcl_Panic("Tcl_FinalizeNotifier: unable to join notifier thread"); - } diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile index 7687f6708bdd..ecee18ea57c4 100644 --- a/x11-toolkits/tk84/Makefile +++ b/x11-toolkits/tk84/Makefile @@ -6,8 +6,7 @@ # PORTNAME= tk -PORTVERSION= 8.4.10 -PORTREVISION= 1 +PORTVERSION= 8.4.11 PORTEPOCH= 2 CATEGORIES= x11-toolkits tk84 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -17,8 +16,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION}-src MAINTAINER= ports@FreeBSD.org COMMENT= Graphical toolkit for TCL -BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/${TCL84_PORT}:extract -LIB_DEPENDS= tcl84.1:${PORTSDIR}/${TCL84_PORT} +LIB_DEPENDS= tcl84:${PORTSDIR}/${TCL84_PORT} LATEST_LINK= tk84 USE_XLIB= yes @@ -352,8 +350,6 @@ MLINKS= 3DBorder.3 Tk_Alloc3DBorderFromObj.3 \ .endif TKBASE?= ${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK} -TCLBASE!= ( cd ${PORTSDIR}/${TCL84_PORT} && make -V TCLBASE ) -TCLWRK!= ( cd ${PORTSDIR}/${TCL84_PORT} && make -V WRKDIR ) pre-everything:: @if ${TEST} -e "${NONEXISTENT}"; then ${ECHO_MSG} "=== Aborted, please remove ${NONEXISTENT}"; exit 1; fi @@ -366,9 +362,6 @@ post-configure: ${REINPLACE_CMD} \ -e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \ ${WRKSRC}/tkConfig.sh - ${REINPLACE_CMD} \ - -e 's|$${WRKDIRPREFIX}${TCLBASE}/work|${TCLWRK}|' \ - ${WRKSRC}/Makefile .if defined(WITHOUT_TK84_MAN) ${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \ ${WRKSRC}/Makefile diff --git a/x11-toolkits/tk84/distinfo b/x11-toolkits/tk84/distinfo index 2764d6ed3a07..772a11785df4 100644 --- a/x11-toolkits/tk84/distinfo +++ b/x11-toolkits/tk84/distinfo @@ -1,2 +1,2 @@ -MD5 (tk8.4.10-src.tar.gz) = a8679673d27b217a83c55f3843e79116 -SIZE (tk8.4.10-src.tar.gz) = 3293385 +MD5 (tk8.4.11-src.tar.gz) = 408e34fe8a1cec497f98f05bbe89b348 +SIZE (tk8.4.11-src.tar.gz) = 3236334 diff --git a/x11-toolkits/tk84/files/patch-ab b/x11-toolkits/tk84/files/patch-ab index e73699907472..cf29d6ed988b 100644 --- a/x11-toolkits/tk84/files/patch-ab +++ b/x11-toolkits/tk84/files/patch-ab @@ -5,6 +5,9 @@ +GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic +UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix +@@ -96,1 +96,1 @@ +-TCL_GENERIC_DIR = @TCL_SRC_DIR@/generic ++TCL_GENERIC_DIR = @prefix@/include/tcl@TCL_VERSION@/generic @@ -131,3 +133,3 @@ #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) -CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ |