diff options
| author | Justin M. Seger <jseger@FreeBSD.org> | 1998-02-16 16:00:13 +0000 |
|---|---|---|
| committer | Justin M. Seger <jseger@FreeBSD.org> | 1998-02-16 16:00:13 +0000 |
| commit | a9dbb48a6439092f94311a037b1d7e9b11af611e (patch) | |
| tree | 4444f6ca2c25404f9dcaf7bf0187ee9fdb340e49 /x11-toolkits/tk84/files | |
| parent | Upgrade a repository copy of 8.0 to version 8.1 (diff) | |
Upgrade repository copy of tk 8.0 to version 8.1
Notes
Notes:
svn path=/head/; revision=9764
Diffstat (limited to 'x11-toolkits/tk84/files')
| -rw-r--r-- | x11-toolkits/tk84/files/patch-aa | 10 | ||||
| -rw-r--r-- | x11-toolkits/tk84/files/patch-ab | 20 |
2 files changed, 15 insertions, 15 deletions
diff --git a/x11-toolkits/tk84/files/patch-aa b/x11-toolkits/tk84/files/patch-aa index c39f29c64f77..20acaaba2844 100644 --- a/x11-toolkits/tk84/files/patch-aa +++ b/x11-toolkits/tk84/files/patch-aa @@ -1,11 +1,11 @@ ---- configure.orig Fri Aug 15 22:17:52 1997 -+++ configure Wed Oct 1 10:50:54 1997 +--- configure.orig Fri Jan 23 11:48:42 1998 ++++ configure Thu Feb 12 19:46:09 1998 @@ -662,14 +662,14 @@ if test -n "$withval"; then TCL_BIN_DIR=$withval else -- TCL_BIN_DIR=`cd ../../tcl8.0/unix; pwd` -+ TCL_BIN_DIR=${prefix}/lib/tcl8.0 +- TCL_BIN_DIR=`cd ../../tcl8.1a1/unix; pwd` ++ TCL_BIN_DIR=${prefix}/lib/tcl8.1 fi if test ! -d $TCL_BIN_DIR; then @@ -27,7 +27,7 @@ LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}' # If Tcl and Tk are installed in different places, adjust the library -@@ -2271,6 +2273,7 @@ +@@ -2222,6 +2224,7 @@ s%@SHLIB_VERSION@%$SHLIB_VERSION%g s%@TCL_BIN_DIR@%$TCL_BIN_DIR%g s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g diff --git a/x11-toolkits/tk84/files/patch-ab b/x11-toolkits/tk84/files/patch-ab index feae30fefebc..eba83e4fb7df 100644 --- a/x11-toolkits/tk84/files/patch-ab +++ b/x11-toolkits/tk84/files/patch-ab @@ -16,7 +16,7 @@ # Libraries to use when linking. This definition is determined by the # configure script. -LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc -+LIBS = -L${PREFIX}/lib -ltcl80 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc ++LIBS = -L${PREFIX}/lib -ltcl81 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc # To change the compiler switches, for example to change from -O # to -g, change the following line: @@ -38,10 +38,10 @@ @MAKE_LIB@ $(RANLIB) @TK_LIB_FILE@ -+libtk80.a: ${OBJS} -+ rm -f libtk80.a -+ ar cr libtk80.a ${OBJS} -+ $(RANLIB) libtk80.a ++libtk81.a: ${OBJS} ++ rm -f libtk81.a ++ ar cr libtk81.a ${OBJS} ++ $(RANLIB) libtk81.a + # Make target which outputs the list of the .o contained in the Tk lib # usefull to build a single big shared library containing Tcl/Tk and other @@ -51,7 +51,7 @@ # possible (e.g. if installing as root). -install-binaries: $(TK_LIB_FILE) wish -+install-binaries: $(TK_LIB_FILE) libtk80.a wish ++install-binaries: $(TK_LIB_FILE) libtk81.a wish @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ do \ if [ ! -d $$i ] ; then \ @@ -59,10 +59,10 @@ @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE)) @chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) -+ @echo "Installing libtk80.a" -+ @$(INSTALL_DATA) libtk80.a $(LIB_INSTALL_DIR)/libtk80.a -+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk80.a) -+ @chmod 555 $(LIB_INSTALL_DIR)/libtk80.a ++ @echo "Installing libtk81.a" ++ @$(INSTALL_DATA) libtk81.a $(LIB_INSTALL_DIR)/libtk81.a ++ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk81.a) ++ @chmod 555 $(LIB_INSTALL_DIR)/libtk81.a @echo "Installing wish" @$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION) @echo "Installing tkConfig.sh" |