diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 1999-04-07 11:03:11 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 1999-04-07 11:03:11 +0000 |
| commit | 661abcace045dadb4b22fd93c8ae6fcbade44ef7 (patch) | |
| tree | 17a727749741b96a5a2e99623d0d0b4e74647099 /x11-toolkits/tix/files/patch-aa | |
| parent | PR: ports/10297 & ports/10476 (diff) | |
A cleaner fix for the mis-naming of the libs.
Notes
Notes:
svn path=/head/; revision=17684
Diffstat (limited to 'x11-toolkits/tix/files/patch-aa')
| -rw-r--r-- | x11-toolkits/tix/files/patch-aa | 41 |
1 files changed, 37 insertions, 4 deletions
diff --git a/x11-toolkits/tix/files/patch-aa b/x11-toolkits/tix/files/patch-aa index 5c378ca5a859..3957fdd8b318 100644 --- a/x11-toolkits/tix/files/patch-aa +++ b/x11-toolkits/tix/files/patch-aa @@ -1,5 +1,5 @@ ---- configure.orig Thu Sep 25 20:32:47 1997 -+++ configure Sun Oct 4 20:21:17 1998 +--- configure.orig Tue Sep 23 16:57:21 1997 ++++ configure Wed Apr 7 03:53:11 1999 @@ -1060,6 +1060,7 @@ if test "$val" != ""; then @@ -34,7 +34,40 @@ #-------------------------------------------------------------------- # Find out the top level source directory of the Tix package. -@@ -1707,15 +1709,15 @@ +@@ -1200,12 +1202,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}" ++ LIB_VERSION="${VERSION}" + else + TIX_BUILD_LIB_SPEC="-L`pwd` -ltix`echo ${VERSION} | tr -d .`" + 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 + + #-------------------------------------------------------------------- +@@ -1227,7 +1231,7 @@ + + # The main Tix library + # +- eval "TIX_LIB_FILE=libtix${TCL_SHARED_LIB_SUFFIX}" ++ eval "TIX_LIB_FILE=libtix${LIB_VERSION}" + TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}" + + # The Tcl SAM library +@@ -1245,7 +1249,7 @@ + # The Tix SAM library + # + VERSION=${BIN_VERSION} +- eval "TIX_SAM_FILE=libtixsam${TCL_SHARED_LIB_SUFFIX}" ++ eval "TIX_SAM_FILE=libtixsam${LIB_VERSION}" + TIX_MAKE_SAM="\${SHLIB_LD} -o ${TIX_SAM_FILE} \${TIX_SAM_OBJS} ${SHLIB_LD_LIBS}" + + else +@@ -1707,15 +1711,15 @@ s%@SHLIB_VERSION@%$SHLIB_VERSION%g s%@DL_LIBS@%$DL_LIBS%g s%@LD_FLAGS@%$LD_FLAGS%g @@ -54,7 +87,7 @@ s%@TK_BIN_DIR@%$TK_BIN_DIR%g s%@TK_XINCLUDES@%$TK_XINCLUDES%g s%@TIX_LD_SEARCH_FLAGS@%$TIX_LD_SEARCH_FLAGS%g -@@ -1738,8 +1740,8 @@ +@@ -1738,8 +1742,8 @@ s%@TIX_SAM_FILE@%$TIX_SAM_FILE%g s%@TIX_MAKE_SAM@%$TIX_MAKE_SAM%g s%@TIX_DEFS@%$TIX_DEFS%g |