cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5b7c1e126d
freebsd-ports/x11-toolkits/tix/files/patch-aa
Jean-Marc Zucconi 7a2c4ae39e Unbreak the update to to use Tcl/Tk 8.2. The key is to compile with 
-fwritable-strings (it would probably better to find and fix the specific
portion of Tix code responsible of the core dump but that's not easy)
Install libs and program with the 82 or 8.2 suke the name (instead of 80 or
8.0 resp.)
1999-12-05 06:46:34 +00:00

189 lines
6.3 KiB
Plaintext
Raw Blame History

--- configure.orig Mon Feb 15 04:20:06 1999
+++ configure Sun Dec 5 07:03:17 1999
@@ -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.2 source from DIR"
ac_help="$ac_help
- --with-tk=DIR use Tk 8.0 source from DIR"
+ --with-tk=DIR use Tk 8.2 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.2
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.2" 1>&2; exit 1; }
exit 1
fi
else
- dirs="../../../tcl8.0"
+ dirs="../../../tcl8.2"
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.2" 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.2
#--------------------------------------------------------------------
# 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.2" 1>&2; exit 1; }
exit 1
fi
else
- dirs="../../../tk8.0"
+ dirs="../../../tk8.2"
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.2" 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.2
#--------------------------------------------------------------------
# Find out the top level source directory of the Tix package.
@@ -1141,17 +1143,19 @@
# up the Tcl library.
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
- TIX_BUILD_LIB_SPEC="-L`pwd` -ltix${VERSION}"
+ TIX_BUILD_LIB_SPEC="`pwd`/libtix${VERSION}.so.1"
TIX_BUILD_SAM_SPEC="-L`pwd` -ltixsam${VERSION}"
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}"
+ LIB_VERSION="${VERSION}"
else
- TIX_BUILD_LIB_SPEC="-L`pwd` -ltix`echo ${VERSION} | tr -d .`"
+ TIX_BUILD_LIB_SPEC="`pwd`/libtix`echo ${VERSION} | tr -d .`.so.1"
TIX_BUILD_SAM_SPEC="-L`pwd` -ltixsam`echo ${VERSION} | tr -d .`"
TCL_BUILD_SAM_SPEC="-L`pwd` -ltclsam`echo ${TCL_VERSION} | tr -d .`"
TK_BUILD_SAM_SPEC="-L`pwd` -ltksam`echo ${TK_VERSION} | tr -d .`"
TIX_LIB_SPEC="-L${exec_prefix}/lib -ltix`echo ${VERSION} | tr -d .`"
+ LIB_VERSION="`echo ${VERSION} | tr -d .`"
fi
#--------------------------------------------------------------------
@@ -1173,25 +1177,25 @@
# The main Tix library
#
- eval "TIX_LIB_FILE=libtix${TCL_SHARED_LIB_SUFFIX}"
+ eval "TIX_LIB_FILE=libtix${LIB_VERSION}.so.1"
TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
# The Tcl SAM library
#
- VERSION=8.0
+ VERSION=8.2
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.2
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.2
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.2
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
Reference in New Issue View Git Blame Copy Permalink