diff options
Diffstat (limited to 'x11-toolkits/tix/files/patch-aa')
| -rw-r--r-- | x11-toolkits/tix/files/patch-aa | 162 |
1 files changed, 4 insertions, 158 deletions
diff --git a/x11-toolkits/tix/files/patch-aa b/x11-toolkits/tix/files/patch-aa index 4cf59732d792..8b559769f285 100644 --- a/x11-toolkits/tix/files/patch-aa +++ b/x11-toolkits/tix/files/patch-aa @@ -1,93 +1,6 @@ ---- configure.orig Mon Feb 15 04:20:06 1999 -+++ configure Fri Nov 28 11:11:28 2003 -@@ -14,9 +14,9 @@ - ac_help="$ac_help - --enable-gcc allow use of gcc if available" - ac_help="$ac_help -- --with-tcl=DIR use Tcl 8.0 source from DIR" -+ --with-tcl=DIR use Tcl 8.4 source from DIR" - ac_help="$ac_help -- --with-tk=DIR use Tk 8.0 source from DIR" -+ --with-tk=DIR use Tk 8.4 source from DIR" - ac_help="$ac_help - --enable-sam build stand-alone modules" - ac_help="$ac_help -@@ -512,7 +512,7 @@ - TIX_MAJOR_VERSION=4 - TIX_MINOR_VERSION=1 - --BIN_VERSION=${TIX_VERSION}.8.0 -+BIN_VERSION=${TIX_VERSION}.8.4 - - - VERSION=${BIN_VERSION} -@@ -1006,13 +1006,14 @@ - - if test "$val" != ""; then - TCL_SRC_DIR=$val -+ tclsrcdir=$val - if test ! -d $TCL_SRC_DIR; then - { echo "configure: error: Directory $TCL_SRC_DIR doesn't exist" 1>&2; exit 1; } -- { echo "configure: error: Please install the source code of Tcl 8.0" 1>&2; exit 1; } -+ { echo "configure: error: Please install the source code of Tcl 8.4" 1>&2; exit 1; } - exit 1 - fi - else -- dirs="../../../tcl8.0" -+ dirs="../../../tcl8.4" - TCL_SRC_DIR="no-no" - for i in $dirs; do - if test -d $i; then -@@ -1022,13 +1023,13 @@ - - if test ! -d $TCL_SRC_DIR; then - { echo "configure: error: Cannot locate Tcl source directory in $dirs" 1>&2; exit 1; } -- { echo "configure: error: Please install the source code of Tcl 8.0" 1>&2; exit 1; } -+ { echo "configure: error: Please install the source code of Tcl 8.4" 1>&2; exit 1; } - exit 1 - fi - fi - echo "$ac_t""$TCL_SRC_DIR" 1>&6 - --TCL_BIN_DIR=$TCL_SRC_DIR/unix -+TCL_BIN_DIR=$TCL_SRC_DIR/../../lib/tcl8.4 - - #-------------------------------------------------------------------- - # See if there was a command-line option for where Tk is; if -@@ -1048,13 +1049,14 @@ - - if test "$val" != ""; then - TK_SRC_DIR=$val -+ tksrcdir=$val - if test ! -d $TK_SRC_DIR; then - { echo "configure: error: Directory $TK_SRC_DIR doesn't exist" 1>&2; exit 1; } -- { echo "configure: error: Please install the source code of Tk 8.0" 1>&2; exit 1; } -+ { echo "configure: error: Please install the source code of Tk 8.4" 1>&2; exit 1; } - exit 1 - fi - else -- dirs="../../../tk8.0" -+ dirs="../../../tk8.4" - TK_SRC_DIR="no-no" - for i in $dirs; do - if test -d $i; then -@@ -1064,13 +1066,13 @@ - - if test ! -d $TK_SRC_DIR; then - { echo "configure: error: Cannot locate Tk source directory in $dirs" 1>&2; exit 1; } -- { echo "configure: error: Please install the source code of Tk 8.0" 1>&2; exit 1; } -+ { echo "configure: error: Please install the source code of Tk 8.4" 1>&2; exit 1; } - exit 1 - fi - fi - echo "$ac_t""$TK_SRC_DIR" 1>&6 - --TK_BIN_DIR=$TK_SRC_DIR/unix -+TK_BIN_DIR=$TK_SRC_DIR/../../lib/tk8.4 - - #-------------------------------------------------------------------- - # Find out the top level source directory of the Tix package. -@@ -1146,12 +1148,14 @@ +--- configure.orig Sun Dec 15 05:20:37 2002 ++++ configure Tue Dec 2 21:05:55 2003 +@@ -1730,12 +1730,14 @@ TCL_BUILD_SAM_SPEC="-L`pwd` -ltclsam${TCL_VERSION}" TK_BUILD_SAM_SPEC="-L`pwd` -ltksam${TK_VERSION}" TIX_LIB_SPEC="-L${exec_prefix}/lib -ltix${VERSION}" @@ -102,7 +15,7 @@ fi #-------------------------------------------------------------------- -@@ -1173,25 +1177,25 @@ +@@ -1757,8 +1759,8 @@ # The main Tix library # @@ -113,70 +26,3 @@ # The Tcl SAM library # -- VERSION=8.0 -+ VERSION=8.4 - eval "TCL_SAM_FILE=libtclsam${TCL_SHARED_LIB_SUFFIX}" - TCL_MAKE_SAM="\${SHLIB_LD} -o ${TCL_SAM_FILE} \${TCL_SAM_OBJS} ${SHLIB_LD_LIBS}" - - # The Tk SAM library - # -- VERSION=8.0 -+ VERSION=8.4 - eval "TK_SAM_FILE=libtksam${TCL_SHARED_LIB_SUFFIX}" - TK_MAKE_SAM="\${SHLIB_LD} -o ${TK_SAM_FILE} \${TK_SAM_OBJS} ${SHLIB_LD_LIBS}" - - # The Tix SAM library - # - VERSION=${BIN_VERSION} -- eval "TIX_SAM_FILE=libtixsam${TCL_SHARED_LIB_SUFFIX}" -+ eval "TIX_SAM_FILE=libtixsam${LIB_VERSION}.so.1" - TIX_MAKE_SAM="\${SHLIB_LD} -o ${TIX_SAM_FILE} \${TIX_SAM_OBJS} ${SHLIB_LD_LIBS}" - - else -@@ -1204,13 +1208,13 @@ - - # The Tcl SAM library - -- VERSION=8.0 -+ VERSION=8.4 - eval "TCL_SAM_FILE=libtclsam${TCL_UNSHARED_LIB_SUFFIX}" - TCL_MAKE_SAM="ar cr ${TCL_SAM_FILE} \${TCL_SAM_OBJS}" - - # The Tk SAM library - # -- VERSION=8.0 -+ VERSION=8.4 - eval "TK_SAM_FILE=libtksam${TCL_UNSHARED_LIB_SUFFIX}" - TK_MAKE_SAM="ar cr ${TK_SAM_FILE} \${TK_SAM_OBJS}" - -@@ -1653,15 +1657,15 @@ - s%@SHLIB_VERSION@%$SHLIB_VERSION%g - s%@DL_LIBS@%$DL_LIBS%g - s%@LD_FLAGS@%$LD_FLAGS%g --s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g -+s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g - s%@TCL_LIBS@%$TCL_LIBS%g - s%@TCL_VERSION@%$TCL_VERSION%g --s%@TCL_SRC_DIR@%$TCL_SRC_DIR%g -+s%@TCL_SRC_DIR@%$tclsrcdir%g - s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g --s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g -+s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g - s%@TK_LIBS@%$TK_LIBS%g - s%@TK_VERSION@%$TK_VERSION%g --s%@TK_SRC_DIR@%$TK_SRC_DIR%g -+s%@TK_SRC_DIR@%$tksrcdir%g - s%@TK_BIN_DIR@%$TK_BIN_DIR%g - s%@TK_XINCLUDES@%$TK_XINCLUDES%g - s%@TIX_LD_SEARCH_FLAGS@%$TIX_LD_SEARCH_FLAGS%g -@@ -1684,8 +1688,8 @@ - s%@TIX_SAM_FILE@%$TIX_SAM_FILE%g - s%@TIX_MAKE_SAM@%$TIX_MAKE_SAM%g - s%@TIX_DEFS@%$TIX_DEFS%g --s%@ITCL_BUILD_LIB_SPEC@%$ITCL_BUILD_LIB_SPEC%g --s%@ITK_BUILD_LIB_SPEC@%$ITK_BUILD_LIB_SPEC%g -+s%@ITCL_LIB_SPEC@%$ITCL_LIB_SPEC%g -+s%@ITK_LIB_SPEC@%$ITK_LIB_SPEC%g - s%@TCL_SAMEXE_FILE@%$TCL_SAMEXE_FILE%g - s%@TK_SAMEXE_FILE@%$TK_SAMEXE_FILE%g - s%@TIX_SAMEXE_FILE@%$TIX_SAMEXE_FILE%g |