summaryrefslogtreecommitdiff
path: root/x11-toolkits/tk82/files/patch-aa
diff options
context:
space:
mode:
authorJustin M. Seger <jseger@FreeBSD.org>1999-06-20 14:05:44 +0000
committerJustin M. Seger <jseger@FreeBSD.org>1999-06-20 14:05:44 +0000
commit28b16a0a159647ec2eb3b3ce0a4b5e8d7e5707a2 (patch)
tree4d490b29e7c5f7f54024519aeac8a19d18a62440 /x11-toolkits/tk82/files/patch-aa
parentUpgrade to NPS version 0.9.18 (diff)
Upgrade to tcl and tk 8.1.
Move NO_LATEST_LINK from tcl81 and tk81 to tcl80 and tk80. Submitted by: YAZAKI Hiroyuki <yazaki@nn.iij4u.or.jp>
Notes
Notes: svn path=/head/; revision=19591
Diffstat (limited to 'x11-toolkits/tk82/files/patch-aa')
-rw-r--r--x11-toolkits/tk82/files/patch-aa18
1 files changed, 9 insertions, 9 deletions
diff --git a/x11-toolkits/tk82/files/patch-aa b/x11-toolkits/tk82/files/patch-aa
index f858d13c6249..66ed07aecf62 100644
--- a/x11-toolkits/tk82/files/patch-aa
+++ b/x11-toolkits/tk82/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Fri Dec 11 17:38:40 1998
-+++ configure Sun Jan 24 16:12:10 1999
-@@ -854,14 +854,14 @@
+--- configure.orig Fri Apr 30 08:27:45 1999
++++ configure Mon May 10 00:20:26 1999
+@@ -956,14 +956,14 @@
withval="$with_tcl"
TCL_BIN_DIR=$withval
else
@@ -18,7 +18,7 @@
fi
#--------------------------------------------------------------------
-@@ -902,6 +902,8 @@
+@@ -1004,6 +1004,8 @@
CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
@@ -27,18 +27,18 @@
LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
# If Tcl and Tk are installed in different places, adjust the library
-@@ -2302,7 +2304,7 @@
+@@ -2450,7 +2452,7 @@
if test "$ok" = "yes" -a "${SHLIB_SUFFIX}" != ""; then
TK_SHARED_BUILD=1
TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
- TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}
+ TK_LIB_FILE=${TK_LIB_FILE}
- MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
+ MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_BUILD_STUB_LIB_SPEC} \${LIBS}"
RANLIB=":"
- else
-@@ -2513,6 +2515,7 @@
- s%@SHLIB_VERSION@%$SHLIB_VERSION%g
+
+@@ -2729,6 +2731,7 @@
s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g
+ s%@TCL_BUILD_STUB_LIB_SPEC@%$TCL_BUILD_STUB_LIB_SPEC%g
s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g
+s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g
s%@TCL_DBGX@%$TCL_DBGX%g