aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits/tk84
diff options
context:
space:
mode:
authorMikhail Teterin <mi@FreeBSD.org>2005-07-05 17:30:52 +0000
committerMikhail Teterin <mi@FreeBSD.org>2005-07-05 17:30:52 +0000
commitd650c29c029b7dd36c20adb07a615045d0beb857 (patch)
tree9a1858ef24821c02c0fb7a197a4ea980487e3bad /x11-toolkits/tk84
parent6250aa00fcc678d32d2adcffe0151eef64a48d97 (diff)
downloadports-d650c29c029b7dd36c20adb07a615045d0beb857.tar.gz
ports-d650c29c029b7dd36c20adb07a615045d0beb857.zip
Notes
Diffstat (limited to 'x11-toolkits/tk84')
-rw-r--r--x11-toolkits/tk84/Makefile11
-rw-r--r--x11-toolkits/tk84/distinfo4
-rw-r--r--x11-toolkits/tk84/files/patch-ab3
3 files changed, 7 insertions, 11 deletions
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@