diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 1997-11-22 11:22:19 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 1997-11-22 11:22:19 +0000 |
| commit | 96d887606d7ca1bbc4d66f90f81c8c4e42f2c25a (patch) | |
| tree | d28c2c6e06808126f8855bff8ea6a948ff571dbc /x11-toolkits/blt | |
| parent | Move distfile into subdirectory. I don't think there are any other (diff) | |
Unbreak this port (needed by others) by hacking at the configure
script. Did I tell you that I absolutely hate these tcl/tk ports
with the humongous configure scripts that try to catch everything
from a rat's nest to a broken muffler? ;<
Notes
Notes:
svn path=/head/; revision=8753
Diffstat (limited to 'x11-toolkits/blt')
| -rw-r--r-- | x11-toolkits/blt/Makefile | 4 | ||||
| -rw-r--r-- | x11-toolkits/blt/files/patch-aa | 57 |
2 files changed, 55 insertions, 6 deletions
diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile index 1a711556ce50..ac1c7a23217f 100644 --- a/x11-toolkits/blt/Makefile +++ b/x11-toolkits/blt/Makefile @@ -3,7 +3,7 @@ # Date created: 3 August 1996 # Whom: lukin <lukin@okbmei.msk.su> # -# $Id: Makefile,v 1.14 1997/07/17 15:13:00 max Exp $ +# $Id: Makefile,v 1.15 1997/11/22 01:11:34 asami Exp $ # DISTNAME= blt-2.1 @@ -15,8 +15,6 @@ MAINTAINER= lukin@okbmei.msk.su LIB_DEPENDS= tk41\\.1:${PORTSDIR}/x11/tk41 -BROKEN= tcl.h - WRKSRC= ${WRKDIR}/blt2.1 GNU_CONFIGURE= yes MANN= BLT.n barchart.n bgexec.n bitmap.n bltdebug.n busy.n \ diff --git a/x11-toolkits/blt/files/patch-aa b/x11-toolkits/blt/files/patch-aa index e243ec9db2b5..82f201ac3045 100644 --- a/x11-toolkits/blt/files/patch-aa +++ b/x11-toolkits/blt/files/patch-aa @@ -9,6 +9,15 @@ else prefix=$PREFIX fi +@@ -2100,7 +2100,7 @@ + guesses="$TCLINCDIR \ + $TCL_LIBRARY/../../include \ + /usr/local/itcl/include \ +- /usr/local/tcl/tcl7.5/include /usr/local/tcl/tcl7.4/include \ ++ /usr/local/include/tcl7.5 /usr/local/tcl/tcl7.4/include \ + /usr/local/tcl/tcl7.3/include /usr/local/tcl/tcl7.2/include \ + /usr/local/tcl/tcl7.1/include /usr/local/tcl/tcl7.0/include \ + $PWD/../itcl2.0/tcl7.4 \ @@ -2165,8 +2165,8 @@ blt_path_tcl_lib="$dir/itcl" break @@ -20,7 +29,49 @@ blt_path_tcl_lib=$dir break fi -@@ -2312,10 +2311,7 @@ +@@ -2180,8 +2180,8 @@ + *-sunos4*) + ;; + *) +- if test -r $TCLLIBDIR/tclConfig.sh; then +- . $TCLLIBDIR/tclConfig.sh ++ if test -r $TCLLIBDIR/tcl7.5/tclConfig.sh; then ++ . $TCLLIBDIR/tcl7.5/tclConfig.sh + fi + ;; + esac +@@ -2192,9 +2192,7 @@ + TCLLIBDIR="__Edit_${saveFile}__" + echo "$ac_t""no" 1>&6 + fi +-if test "$TCLLIBDIR" != "/usr/lib" ; then +- TCLLIBSW="-L$TCLLIBDIR -ltcl${TCL_VERSION}" +-fi ++TCLLIBSW=${TCL_LIB_SPEC} + + + +@@ -2208,7 +2206,7 @@ + $TKINCDIR \ + /usr/local/itcl/include \ + /usr/local/tcl/include \ +- /usr/local/tcl/tk4.1/include \ ++ /usr/local/include/tk4.1 \ + /usr/local/tcl/tk4.0/include \ + /usr/local/tcl/tk3.6/include \ + /usr/local/tcl/tk3.5/include \ +@@ -2299,8 +2297,8 @@ + *-sunos4*) + ;; + *) +- if test -r $TKLIBDIR/tkConfig.sh; then +- . $TKLIBDIR/tkConfig.sh ++ if test -r $TKLIBDIR/tk4.1/tkConfig.sh; then ++ . $TKLIBDIR/tk4.1/tkConfig.sh + fi + ;; + esac +@@ -2312,10 +2310,7 @@ echo "$ac_t""no" 1>&6 fi @@ -28,11 +79,11 @@ - TKLIBSW="-L$TKLIBDIR -ltk${TK_VERSION}" -fi - -+TKLIBSW=$TK_LIB_SPEC ++TKLIBSW=${TK_LIB_SPEC} -@@ -2634,6 +2630,8 @@ +@@ -2634,6 +2629,8 @@ *-freebsd*|*-386bsd*|*-netbsd*) SHLIB_CCFLAGS="-fpic" SHLIB_LDFLAGS="-Bshareable" |