diff options
| -rw-r--r-- | x11/tk80/patches/patch-aa | 25 | ||||
| -rw-r--r-- | x11/tk80/patches/patch-ae | 82 |
2 files changed, 87 insertions, 20 deletions
diff --git a/x11/tk80/patches/patch-aa b/x11/tk80/patches/patch-aa index a4cc0a3ffb3..24fdb7dcaeb 100644 --- a/x11/tk80/patches/patch-aa +++ b/x11/tk80/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.6 1999/04/03 13:44:24 tron Exp $ +$NetBSD: patch-aa,v 1.7 1999/04/03 16:17:01 tron Exp $ ---- configure.orig Tue Mar 9 07:53:50 1999 -+++ configure Sat Apr 3 15:35:29 1999 +--- configure.orig Tue Mar 9 06:53:50 1999 ++++ configure Thu Apr 1 13:19:46 1999 @@ -874,15 +874,12 @@ withval="$with_tcl" TCL_BIN_DIR=$withval @@ -28,12 +28,8 @@ $NetBSD: patch-aa,v 1.6 1999/04/03 13:44:24 tron Exp $ LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}' # If Tcl and Tk are installed in different places, adjust the library -@@ -2397,18 +2396,21 @@ - MAKE_LIB="ar cr \${TK_LIB_FILE} \${OBJS}" - fi - --DBGX='${TK_DBGX}' -+DBGX=${TK_DBGX} +@@ -2400,6 +2399,9 @@ + DBGX='${TK_DBGX}' eval "TK_LIB_FILE=${TK_LIB_FILE}" +# Force the issue @@ -42,17 +38,6 @@ $NetBSD: patch-aa,v 1.6 1999/04/03 13:44:24 tron Exp $ # Note: in the following variable, it's important to use the absolute # path name of the Tcl directory rather than "..": this is because # AIX remembers this path and will attempt to use it at run-time to look - # up the Tcl library. - - if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then -- TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}" -+ TK_LIB_FLAG="-ltk${VERSION}${TK_DBGX}" - else -- TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}" -+ TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`${TK_DBGX}" - fi - TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}" - TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_FLAG}" @@ -2598,6 +2600,7 @@ s%@SHLIB_VERSION@%$SHLIB_VERSION%g s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g diff --git a/x11/tk80/patches/patch-ae b/x11/tk80/patches/patch-ae new file mode 100644 index 00000000000..11384c359ae --- /dev/null +++ b/x11/tk80/patches/patch-ae @@ -0,0 +1,82 @@ +$NetBSD: patch-ae,v 1.1 1999/04/03 16:17:02 tron Exp $ + +--- tkConfig.sh.in.orig Tue Mar 9 07:53:51 1999 ++++ tkConfig.sh.in Sat Apr 3 16:52:02 1999 +@@ -14,13 +14,13 @@ + # RCS: @(#) $Id: patch-ae,v 1.1 1999/04/03 16:17:02 tron Exp $ + + # Tk's version number. +-TK_VERSION='@TK_VERSION@' +-TK_MAJOR_VERSION='@TK_MAJOR_VERSION@' +-TK_MINOR_VERSION='@TK_MINOR_VERSION@' +-TK_PATCH_LEVEL='@TK_PATCH_LEVEL@' ++TK_VERSION="@TK_VERSION@" ++TK_MAJOR_VERSION="@TK_MAJOR_VERSION@" ++TK_MINOR_VERSION="@TK_MINOR_VERSION@" ++TK_PATCH_LEVEL="@TK_PATCH_LEVEL@" + + # -D flags for use with the C compiler. +-TK_DEFS='@DEFS@' ++TK_DEFS="@DEFS@" + + # Flag, 1: we built a shared lib, 0 we didn't + TK_SHARED_BUILD=@TK_SHARED_BUILD@ +@@ -29,35 +29,35 @@ + TK_DBGX=@TK_DBGX@ + + # The name of the Tk library (may be either a .a file or a shared library): +-TK_LIB_FILE='@TK_LIB_FILE@' ++TK_LIB_FILE="@TK_LIB_FILE@" + + # Additional libraries to use when linking Tk. +-TK_LIBS='@XLIBSW@ @DL_LIBS@ @LIBS@ @MATH_LIBS@' ++TK_LIBS="@XLIBSW@ @DL_LIBS@ @LIBS@ @MATH_LIBS@" + + # Top-level directory in which Tcl's platform-independent files are + # installed. +-TK_PREFIX='@prefix@' ++TK_PREFIX="@prefix@" + + # Top-level directory in which Tcl's platform-specific files (e.g. + # executables) are installed. +-TK_EXEC_PREFIX='@exec_prefix@' ++TK_EXEC_PREFIX="@exec_prefix@" + + # -I switch(es) to use to make all of the X11 include files accessible: +-TK_XINCLUDES='@XINCLUDES@' ++TK_XINCLUDES="@XINCLUDES@" + + # Linker switch(es) to use to link with the X11 library archive. +-TK_XLIBSW='@XLIBSW@' ++TK_XLIBSW="@XLIBSW@" + + # -l flag to pass to the linker to pick up the Tcl library +-TK_LIB_FLAG='@TK_LIB_FLAG@' ++TK_LIB_FLAG="@TK_LIB_FLAG@" + + # String to pass to linker to pick up the Tk library from its + # build directory. +-TK_BUILD_LIB_SPEC='@TK_BUILD_LIB_SPEC@' ++TK_BUILD_LIB_SPEC="@TK_BUILD_LIB_SPEC@" + + # String to pass to linker to pick up the Tk library from its + # installed directory. +-TK_LIB_SPEC='@TK_LIB_SPEC@' ++TK_LIB_SPEC="@TK_LIB_SPEC@" + + # Location of the top-level source directory from which Tk was built. + # This is the directory that contains a README file as well as +@@ -65,10 +65,10 @@ + # different place than the directory containing the source files, this + # points to the location of the sources, not the location where Tk was + # compiled. +-TK_SRC_DIR='@TK_SRC_DIR@' ++TK_SRC_DIR="@TK_SRC_DIR@" + + # Needed if you want to make a 'fat' shared library library + # containing tk objects or link a different wish. +-TK_CC_SEARCH_FLAGS='@TK_CC_SEARCH_FLAGS@' +-TK_LD_SEARCH_FLAGS='@TK_LD_SEARCH_FLAGS@' ++TK_CC_SEARCH_FLAGS="@TK_CC_SEARCH_FLAGS@" ++TK_LD_SEARCH_FLAGS="@TK_LD_SEARCH_FLAGS@" + |