diff options
author | Eric L. Hernes <erich@FreeBSD.org> | 1996-09-17 12:50:36 +0000 |
---|---|---|
committer | Eric L. Hernes <erich@FreeBSD.org> | 1996-09-17 12:50:36 +0000 |
commit | a9a5e5b05356990318c7e4c790eaf304c5e6da6d (patch) | |
tree | 23d1053a881bcfb25212b53619dd8c9beb2ff3b4 /net/scotty/files | |
parent | Add slash to MASTER_SITES (diff) |
upgrade to 2.1.3
Notes
Notes:
svn path=/head/; revision=3796
Diffstat (limited to 'net/scotty/files')
-rw-r--r-- | net/scotty/files/patch-aa | 86 |
1 files changed, 30 insertions, 56 deletions
diff --git a/net/scotty/files/patch-aa b/net/scotty/files/patch-aa index 163b9f8b840a..34f23419c975 100644 --- a/net/scotty/files/patch-aa +++ b/net/scotty/files/patch-aa @@ -1,58 +1,32 @@ ---- configure.orig Wed Jun 5 08:06:34 1996 -+++ configure Wed Jun 5 11:27:59 1996 -@@ -938,7 +938,7 @@ +--- Makefile.in~ Fri Sep 13 07:42:06 1996 ++++ Makefile.in Fri Sep 13 09:28:45 1996 +@@ -469,7 +469,7 @@ + @$(INSTALL_PROGRAM) scotty $(BIN_INSTALL_DIR)/scotty$(TNM_VERSION) + @$(INSTALL_DATA) tnm$(SHLIB_SUFFIX) $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)$(SHLIB_SUFFIX) + @chmod 555 $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)$(SHLIB_SUFFIX) +- @echo 'package ifneeded Tnm $(TNM_VERSION) "load $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION)[info sharedlibextension]"' > $(TNM_INSTALL_DIR)/pkgIndex.tcl ++ @echo 'package ifneeded Tnm $(TNM_VERSION) "load $(LIB_RUNTIME_DIR)/tnm$(TNM_VERSION).so"' > $(TNM_INSTALL_DIR)/pkgIndex.tcl - dynamic=0 - # Extract the first word of "tclsh", so it can be a program name with args. --set dummy tclsh; ac_word=$2 -+set dummy tclsh7.4; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 - if eval "test \"`echo '$''{'ac_cv_prog_have_tclsh'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1026,7 +1026,7 @@ - echo $ac_n "checking for tcl version number""... $ac_c" 1>&6 - tcl_major_version=`awk '/TCL_MAJOR_VERSION/ {print $3}' $f/tcl.h` - tcl_minor_version=`awk '/TCL_MINOR_VERSION/ {print $3}' $f/tcl.h` --tcl_version="$tcl_major_version.$tcl_minor_version" -+tcl_version="$tcl_major_version$tcl_minor_version" - echo "$ac_t"""$tcl_version"" 1>&6 + tnm-install-mibs: + @for i in $(TNM_INSTALL_DIR)/mibs ; \ +@@ -567,10 +567,12 @@ + fi; \ + done; + @echo "Installing tkined$(TNM_VERSION) and tkined$(TNM_VERSION)$(SHLIB_SUFFIX)" +- @$(INSTALL_PROGRAM) $(UNIX_DIR)/tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION) ++ @sed s,@PREFIX@,${prefix},g tkined.sh.in >tkined.sh ++ @$(INSTALL) -m 555 ${UNIX_DIR}/tkined.sh ${BIN_INSTALL_DIR}/tkined ++ @$(INSTALL) -m 555 $(UNIX_DIR)/tkined $(BIN_INSTALL_DIR)/tkined$(TKI_VERSION) + @$(INSTALL_DATA) tkined$(SHLIB_SUFFIX) $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)$(SHLIB_SUFFIX) + @chmod 555 $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)$(SHLIB_SUFFIX) +- @echo 'package ifneeded Tkined $(TKI_VERSION) "load $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION)[info sharedlibextension]"' > $(TKI_INSTALL_DIR)/pkgIndex.tcl ++ @echo 'package ifneeded Tkined $(TKI_VERSION) "load $(LIB_RUNTIME_DIR)/tkined$(TKI_VERSION).so"' > $(TKI_INSTALL_DIR)/pkgIndex.tcl + @$(INSTALL_DATA) $(TKI_DIR)/tkined.defaults $(TKI_INSTALL_DIR) - if test 7 -ne $tcl_major_version ; then -@@ -1038,9 +1038,9 @@ - - for f in $tcl_library $scotty_cv_path_tcl_lib $prefix/lib /usr/local/tk4.0/lib /usr/local/lib /usr/lib ; do - echo $ac_n "checking for libtcl$tcl_version in $f""... $ac_c" 1>&6 -- if test -f "$f/libtcl$tcl_version.a" ; then -+ if test -f "$f/libtcl$tcl_version.so.1.0" ; then - scotty_cv_path_tcl_lib=$f -- TCL_LIB="$TCL_LIB $f/libtcl$tcl_version.a" -+ TCL_LIB="-L$f $TCL_LIB -ltcl$tcl_version" - echo "$ac_t""yes" 1>&6 - break - else -@@ -1112,21 +1112,21 @@ - echo $ac_n "checking for tk version number""... $ac_c" 1>&6 - tk_major_version=`awk '/TK_MAJOR_VERSION/ {print $3}' $f/tk.h` - tk_minor_version=`awk '/TK_MINOR_VERSION/ {print $3}' $f/tk.h` --tk_version="$tk_major_version.$tk_minor_version" -+tk_version="$tk_major_version$tk_minor_version" - echo "$ac_t"""$tk_version"" 1>&6 - - if test 4 -ne $tk_major_version ; then - { echo "configure: error: "tk 4.0 or later needed"" 1>&2; exit 1; } - fi - if test 0 -gt $tk_minor_version ; then -- { echo "configure: error: "tcl 4.0 or later needed"" 1>&2; exit 1; } -+ { echo "configure: error: "tk 4.0 or later needed"" 1>&2; exit 1; } - fi - - for f in $tk_library $scotty_cv_path_tk_lib $tcl_library $prefix/lib /usr/local/tk4.0/lib /usr/local/lib /usr/lib /usr/X386/lib /usr/X11/lib ; do - echo $ac_n "checking for libtk$tk_version in $f""... $ac_c" 1>&6 -- if test -f "$f/libtk$tk_version.a" ; then -+ if test -f "$f/libtk$tk_version.so.1.0" ; then - scotty_cv_path_tk_lib=$f -- TK_LIB="$f/libtk$tk_version.a" -+ TK_LIB="-L $f -ltk$tk_version" - echo "$ac_t""yes" 1>&6 - break - else + tki-install-library: +--- tkined.sh.in~ Fri Sep 13 09:30:41 1996 ++++ tkined.sh.in Fri Sep 13 09:26:21 1996 +@@ -0,0 +1,3 @@ ++#!/bin/sh ++export TCLLIBPATH="@PREFIX@/lib/tkined1.4.3 @PREFIX@/lib/tnm2.1.3" ++exec @PREFIX@/bin/tkined1.4.3 |