aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjseger <jseger@FreeBSD.org>1999-04-20 06:07:43 +0800
committerjseger <jseger@FreeBSD.org>1999-04-20 06:07:43 +0800
commitf896b0eafd97fa48cedd33383ac07ab1214ca3b2 (patch)
tree016ee2a9f5da5429a2ee1f212765f75eedb5415d
parenta3985666080ebb917fdbaf135773b67690af8c94 (diff)
downloadfreebsd-ports-gnome-f896b0eafd97fa48cedd33383ac07ab1214ca3b2.tar.gz
freebsd-ports-gnome-f896b0eafd97fa48cedd33383ac07ab1214ca3b2.tar.zst
freebsd-ports-gnome-f896b0eafd97fa48cedd33383ac07ab1214ca3b2.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>
-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