summaryrefslogtreecommitdiff
path: root/lang/tcl/patches/patch-ae
diff options
context:
space:
mode:
authorminskim <minskim>2004-03-08 19:55:35 +0000
committerminskim <minskim>2004-03-08 19:55:35 +0000
commite44b8b8044d5ff37f8135fd72871670e73f22ba7 (patch)
treea728d1788b2c0d2603436c86f68af7a94bedda40 /lang/tcl/patches/patch-ae
parente4871b8d69dd009e6f9ab57f31141853acda76f2 (diff)
downloadpkgsrc-e44b8b8044d5ff37f8135fd72871670e73f22ba7.tar.gz
Update tcl to 8.4.5. Too many changes since 8.3.4. Please see
ChangeLog in the distfile.
Diffstat (limited to 'lang/tcl/patches/patch-ae')
-rw-r--r--lang/tcl/patches/patch-ae57
1 files changed, 17 insertions, 40 deletions
diff --git a/lang/tcl/patches/patch-ae b/lang/tcl/patches/patch-ae
index 64665e13b0c..ded40f77a3b 100644
--- a/lang/tcl/patches/patch-ae
+++ b/lang/tcl/patches/patch-ae
@@ -1,60 +1,37 @@
-$NetBSD: patch-ae,v 1.3 2004/01/05 11:22:13 jlam Exp $
+$NetBSD: patch-ae,v 1.4 2004/03/08 19:55:35 minskim Exp $
---- configure.in.orig Fri Oct 19 17:24:15 2001
-+++ configure.in Tue Nov 25 05:16:06 2003
-@@ -386,7 +386,7 @@
- if test "x$DL_OBJS" = "xtclLoadAout.o"; then
- MAKE_LIB="\${STLIB_LD} \[$]@ \${OBJS}"
- else
-- MAKE_LIB="\${SHLIB_LD} ${TCL_SHLIB_LD_EXTRAS} -o \[$]@ \${OBJS} ${SHLIB_LD_LIBS}"
-+ MAKE_LIB="\${SHLIB_LD} ${TCL_SHLIB_LD_EXTRAS} -o \${@:C/\.so.*/.la/} \${OBJS:.o=.lo} ${SHLIB_LD_LIBS} -version-info 1:0"
- fi
- else
- case $system in
-@@ -424,7 +424,7 @@
+--- configure.in.orig 2003-11-21 14:17:14.000000000 -0600
++++ configure.in
+@@ -479,7 +479,7 @@ elif test "$SHARED_BUILD" = "0" || test
TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
fi
TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
-- TCL_LIB_SPEC="-L${exec_prefix}/lib ${TCL_LIB_FLAG}"
-+ TCL_LIB_SPEC="${TCL_LIB_SPEC_RPATH} -L${exec_prefix}/lib ${TCL_LIB_FLAG}"
+- TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}"
++ TCL_LIB_SPEC="${TCL_LIB_SPEC_RPATH} -L${libdir} ${TCL_LIB_FLAG}"
else
TCL_BUILD_EXP_FILE="lib.exp"
eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -454,10 +454,17 @@
+@@ -509,13 +509,19 @@ VERSION=${TCL_VERSION}
#--------------------------------------------------------------------
- if test "$prefix" != "$exec_prefix"; then
-- TCL_PACKAGE_PATH="${exec_prefix}/lib ${prefix}/lib"
-+ TCL_PACKAGE_PATH_ADD="${exec_prefix}/lib/tcl ${prefix}/lib"
+ if test "$FRAMEWORK_BUILD" = "1" ; then
+- TCL_PACKAGE_PATH="${libdir}/Resources/Scripts"
++ TCL_PACKAGE_PATH_ADD="${libdir}/Resources/Scripts"
+ elif test "$prefix" != "$exec_prefix"; then
+- TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
++ TCL_PACKAGE_PATH_ADD="${libdir}/tcl ${prefix}/lib"
else
- TCL_PACKAGE_PATH="${prefix}/lib"
+ TCL_PACKAGE_PATH_ADD="${prefix}/lib/tcl"
fi
+-
+for dir in ${TCL_PACKAGE_PATH_ADD}; do
+ if test -z "${TCL_PACKAGE_PATH}"; then
-+ TCL_PACKAGE_PATH="$dir"
++ TCL_PACKAGE_PATH="$dir"
+ else
-+ TCL_PACKAGE_PATH="${TCL_PACKAGE_PATH} $dir"
++ TCL_PACKAGE_PATH="${TCL_PACKAGE_PATH} $dir"
+ fi
+done
-
#--------------------------------------------------------------------
# The statements below define various symbols relating to Tcl
-@@ -469,7 +476,7 @@
- # Replace DBGX with TCL_DBGX
- eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
-
--MAKE_STUB_LIB="\${STLIB_LD} \[$]@ \${STUB_LIB_OBJS}"
-+MAKE_STUB_LIB="\${STLIB_LD} -o \[$]@ \${STUB_LIB_OBJS}"
-
- if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
- TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}"
-@@ -511,6 +518,8 @@
- AC_SUBST(CFG_TCL_EXPORT_FILE_SUFFIX)
-
- AC_SUBST(CFLAGS)
-+AC_SUBST(LDFLAGS_DEBUG)
-+AC_SUBST(LDFLAGS_OPTIMIZE)
- AC_SUBST(CFLAGS_DEFAULT)
- AC_SUBST(EXTRA_CFLAGS)
- AC_SUBST(DL_OBJS)
+ # stub support.