summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorjwise <jwise@pkgsrc.org>2000-08-24 22:48:15 +0000
committerjwise <jwise@pkgsrc.org>2000-08-24 22:48:15 +0000
commit544e0a6750f52752b29a9f5b68c945b76995d378 (patch)
treebb2fef5f9a41800a4179a874c71dfc11b614b05e /lang
parenta11951fe0eaa857cce033f1a44dd8f64f6ba0c10 (diff)
downloadpkgsrc-544e0a6750f52752b29a9f5b68c945b76995d378.tar.gz
Quick aesthetic fix. Tcl as shipped leaves two @foo@ cookies in the generated
tclConfig.sh. Even thought we have nothing to sub in for these, sub them out.
Diffstat (limited to 'lang')
-rw-r--r--lang/tcl/files/patch-sum4
-rw-r--r--lang/tcl/patches/patch-ab18
2 files changed, 15 insertions, 7 deletions
diff --git a/lang/tcl/files/patch-sum b/lang/tcl/files/patch-sum
index aaa5ae2da69..4ec0dba99bf 100644
--- a/lang/tcl/files/patch-sum
+++ b/lang/tcl/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/08/24 19:53:32 jwise Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/24 22:48:15 jwise Exp $
MD5 (patch-aa) = 2ec4e0d0fba9939168ded0af10bad055
-MD5 (patch-ab) = 9f77ddec9f238c20e4b6fbb1dc656e1d
+MD5 (patch-ab) = 84805ac4fd2dea2a29e94138aea6863a
MD5 (patch-ac) = 6d7acb944f0ffc6111cd9a250b4ecea2
diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab
index a528ef2b83c..e8047aef13d 100644
--- a/lang/tcl/patches/patch-ab
+++ b/lang/tcl/patches/patch-ab
@@ -1,7 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/08/24 19:53:33 jwise Exp $
--- configure.orig Tue Aug 8 15:17:11 2000
-+++ configure Thu Aug 24 12:03:49 2000
-@@ -5070,8 +5070,8 @@
++++ configure Thu Aug 24 17:27:16 2000
+@@ -5070,8 +5071,8 @@
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
@@ -12,7 +11,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/08/24 19:53:33 jwise Exp $
echo $ac_n "checking for ELF""... $ac_c" 1>&6
echo "configure:5077: checking for ELF" >&5
cat > conftest.$ac_ext <<EOF
-@@ -5789,7 +5789,7 @@
+@@ -5789,7 +5790,7 @@
if test "x$DL_OBJS" = "xtclLoadAout.o"; then
MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}"
else
@@ -21,7 +20,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/08/24 19:53:33 jwise Exp $
RANLIB=":"
fi
else
-@@ -5859,9 +5859,9 @@
+@@ -5859,9 +5860,9 @@
#--------------------------------------------------------------------
if test "$prefix" != "$exec_prefix"; then
@@ -33,3 +32,12 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/08/24 19:53:33 jwise Exp $
fi
#--------------------------------------------------------------------
+@@ -6097,6 +6098,8 @@
+ s%@CFLAGS_DEBUG@%$CFLAGS_DEBUG%g
+ s%@CFLAGS_OPTIMIZE@%$CFLAGS_OPTIMIZE%g
+ s%@CFLAGS_WARNING@%$CFLAGS_WARNING%g
++s%@LDFLAGS_DEBUG@%$LDFLAGS_DEBUG%g
++s%@LDFLAGS_OPTIMIZE@%$LDFLAGS_OPTIMIZE%g
+ s%@STUB_LIB_FILE@%$STUB_LIB_FILE%g
+ s%@TCL_STUB_LIB_FILE@%$TCL_STUB_LIB_FILE%g
+ s%@TCL_STUB_LIB_FLAG@%$TCL_STUB_LIB_FLAG%g