diff options
| author | jwise <jwise> | 2000-08-30 20:07:46 +0000 |
|---|---|---|
| committer | jwise <jwise> | 2000-08-30 20:07:46 +0000 |
| commit | f63d3332282fd1f92aadfd0d369e65160520e7f2 (patch) | |
| tree | 6135e829fd673a376fdaff566cfb89755d774cbc /sysutils/lavaps | |
| parent | 46db94519b6641b77b844b7cb36786d008cdc6e0 (diff) | |
| download | pkgsrc-f63d3332282fd1f92aadfd0d369e65160520e7f2.tar.gz | |
Adapt this to tk-8.3.2.
Diffstat (limited to 'sysutils/lavaps')
| -rw-r--r-- | sysutils/lavaps/Makefile | 9 | ||||
| -rw-r--r-- | sysutils/lavaps/files/patch-sum | 4 | ||||
| -rw-r--r-- | sysutils/lavaps/patches/patch-ab | 29 |
3 files changed, 28 insertions, 14 deletions
diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile index 4833540344f..00952d9fe15 100644 --- a/sysutils/lavaps/Makefile +++ b/sysutils/lavaps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/02/17 00:51:19 hubertf Exp $ +# $NetBSD: Makefile,v 1.5 2000/08/30 20:07:46 jwise Exp $ # DISTNAME= lavaps-1.10 @@ -8,12 +8,11 @@ MASTER_SITES= http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/ -DEPENDS+= tcl-8.0.5:../../lang/tcl80 -DEPENDS+= tk-8.0.5:../../x11/tk80 +DEPENDS+= tk-8.3.2:../../x11/tk USE_X11= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+=--with-additional-includes='-I${LOCALBASE}/include/tcl8.0 -I${LOCALBASE}/include/tk8.0' \ - --with-additional-libs='-L${LOCALBASE}/lib' +CONFIGURE_ARGS+=--with-additional-includes='-I${LOCALBASE}/include -I${LOCALBASE}/include' \ + --with-additional-libs='-L${LOCALBASE}/lib' --with-tcl-vers=8.3.2 --with-tk-vers=8.3.2 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/lavaps/files/patch-sum b/sysutils/lavaps/files/patch-sum index db1473e287d..9ca088f1463 100644 --- a/sysutils/lavaps/files/patch-sum +++ b/sysutils/lavaps/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.2 2000/03/13 14:14:45 agc Exp $ +$NetBSD: patch-sum,v 1.3 2000/08/30 20:07:46 jwise Exp $ MD5 (patch-aa) = 7134b5196ea1210ddd57798077063e07 -MD5 (patch-ab) = 720bd1d50990e5547595262d314422e8 +MD5 (patch-ab) = b77cba53d7870ea20f25c7d7c32b094f diff --git a/sysutils/lavaps/patches/patch-ab b/sysutils/lavaps/patches/patch-ab index db5b3995a0a..734345fe287 100644 --- a/sysutils/lavaps/patches/patch-ab +++ b/sysutils/lavaps/patches/patch-ab @@ -1,14 +1,29 @@ -$NetBSD: patch-ab,v 1.1 2000/03/13 14:14:47 agc Exp $ - -Manage tcl and tk on Solaris in a sane manner - ---- configure 2000/03/13 14:04:35 1.1 -+++ configure 2000/03/13 14:06:13 +$NetBSD: patch-ab,v 1.2 2000/08/30 20:07:47 jwise Exp $ +--- configure.orig Sat Feb 12 00:12:48 2000 ++++ configure Wed Aug 30 15:50:44 2000 +@@ -2383,7 +2383,7 @@ + withval="$with_tcl_ver" + TCL_VERS=$withval + else +- TCL_VERS=8.0.4 ++ TCL_VERS=8.3.2 + fi + + TCL_DOTTED_HI_VERS=`echo $TCL_VERS | sed "s/\([^\.]*\)\.\([^\.]*\).*/\1.\2/"` +@@ -2401,7 +2401,7 @@ + withval="$with_tk_ver" + TK_VERS=$withval + else +- TK_VERS=8.0.4 ++ TK_VERS=8.3.2 + fi + + TK_DOTTED_HI_VERS=`echo $TK_VERS | sed "s/\([^\.]*\)\.\([^\.]*\).*/\1.\2/"` @@ -2473,6 +2473,8 @@ if test `uname -r | cut -c 3` -lt 6 ; then { echo "configure: error: Sorry - only know how to build for Solaris 2.6 or later..." 1>&2; exit 1; } fi -+ TCLTK_INCLUDES="-I${ac_default_prefix}/include/tk$TK_DOTTED_HI_VERS -I${ac_default_prefix}/include/tcl$TCL_DOTTED_HI_VERS" ++ TCLTK_INCLUDES="-I${ac_default_prefix}/include -I${ac_default_prefix}/include" + TCLTK_LIBS="-ltcl$TCL_NODOT_HI_VERS -ltk$TK_NODOT_HI_VERS" PLATFORM_INCLUDES="-DUSE_PROCESS_SCAN_SOLARIS" PLATFORM_LIBS="" |