aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Seger <jseger@FreeBSD.org>1999-04-19 22:07:43 +0000
committerJustin M. Seger <jseger@FreeBSD.org>1999-04-19 22:07:43 +0000
commit57d8967709abde953caa93855462041522454172 (patch)
tree3b2ac2edd9a360fa75ad342b21307ee96b5ca1a3
parenta79a38d7ad6d686151456d0e2c09a91f367edaff (diff)
downloadports-57d8967709abde953caa93855462041522454172.tar.gz
ports-57d8967709abde953caa93855462041522454172.zip
Fix patch-aa so that it patches the correct part of configure.
PR: ports/9142 Submitted by: Duncan Barclay <dmlb@ragnet.demon.co.uk>
Notes
Notes: svn path=/head/; revision=18016
-rw-r--r--x11-fm/tkdesk/files/patch-aa34
1 files changed, 13 insertions, 21 deletions
diff --git a/x11-fm/tkdesk/files/patch-aa b/x11-fm/tkdesk/files/patch-aa
index da77335de82d..8c0334d6e3a4 100644
--- a/x11-fm/tkdesk/files/patch-aa
+++ b/x11-fm/tkdesk/files/patch-aa
@@ -1,21 +1,13 @@
-*** configure~ Sun Sep 20 20:41:40 1998
---- configure Mon Sep 21 20:00:18 1998
-***************
-*** 2109,2116 ****
- s%@TCL_LD_SEARCH_FLAGS@%$TCL_LD_SEARCH_FLAGS%g
- s%@TCL_EXEC_PREFIX@%$TCL_EXEC_PREFIX%g
- s%@TK_EXEC_PREFIX@%$TK_EXEC_PREFIX%g
-! s%@TCL_INCLUDE_PATH@%$TCL_INCLUDE_PATH%g
-! s%@TK_INCLUDE_PATH@%$TK_INCLUDE_PATH%g
- s%@TK_XINCLUDES@%$TK_XINCLUDES%g
- s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
- s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g
---- 2109,2116 ----
- s%@TCL_LD_SEARCH_FLAGS@%$TCL_LD_SEARCH_FLAGS%g
- s%@TCL_EXEC_PREFIX@%$TCL_EXEC_PREFIX%g
- s%@TK_EXEC_PREFIX@%$TK_EXEC_PREFIX%g
-! s%@TCL_INCLUDE_PATH@%$TCL_INCLUDE_PATH/tcl7.6%g
-! s%@TK_INCLUDE_PATH@%$TK_INCLUDE_PATH/tk4.2%g
- s%@TK_XINCLUDES@%$TK_XINCLUDES%g
- s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
- s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g
+--- configure~ Sun Sep 20 20:41:40 1998
++++ configure Sun Dec 20 10:57:19 1998
+@@ -647,8 +647,8 @@
+ # ITCL_LIB_SPEC already set in itclConfig.sh
+ ITCL_LIB_STATIC=${TCLCONF_PATH}/libitcl${ITCL_VERSION}.a
+ else
+- TCL_INCLUDE_PATH=$TCL_EXEC_PREFIX/include
+- TK_INCLUDE_PATH=$TK_EXEC_PREFIX/include
++ TCL_INCLUDE_PATH=$TCL_EXEC_PREFIX/include/tcl${TCL_VERSION}
++ TK_INCLUDE_PATH=$TK_EXEC_PREFIX/include/tk${TK_VERSION}
+ NEED_ITCL_LIB=lib_itcl
+ ITCL_LIB_SPEC=itcl/libitcl.a
+ ITCL_LIB_STATIC=itcl/libitcl.a