From c00a304d3f81b6cc7b65357db241a11208a997df Mon Sep 17 00:00:00 2001 From: jwise Date: Wed, 30 Aug 2000 16:20:35 +0000 Subject: Adapt this package to tcl-8.3.2 and tk-8.3.2. (Good to see the really important packages get done :-) ) --- editors/vigor/Makefile | 8 ++++---- editors/vigor/files/patch-sum | 3 ++- editors/vigor/patches/patch-ab | 20 ++++++++++++++++++++ 3 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 editors/vigor/patches/patch-ab diff --git a/editors/vigor/Makefile b/editors/vigor/Makefile index 108e3bee3ca..11fea7e9923 100644 --- a/editors/vigor/Makefile +++ b/editors/vigor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2000/01/21 14:54:05 jdolecek Exp $ +# $NetBSD: Makefile,v 1.4 2000/08/30 16:20:35 jwise Exp $ # DISTNAME= vigor-0.010 @@ -8,7 +8,7 @@ MASTER_SITES= http://www.red-bean.com:8080/ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://www.red-bean.com/~joelh/vigor/ -DEPENDS+= tk-8.0.*:../../x11/tk80 +DEPENDS+= tk-8.3.2:../../x11/tk CONFLICTS+= nvi-* @@ -21,8 +21,8 @@ CONFIGURE_ARGS+=--with-x # --disable-curses \ # --disable-db \ # --disable-re -CONFIGURE_ENV+= ADDCPPFLAGS=" -I${LOCALBASE}/include/tcl8.0 \ - -I${LOCALBASE}/include/tk8.0" \ +CONFIGURE_ENV+= ADDCPPFLAGS=" -I${LOCALBASE}/include \ + -I${LOCALBASE}/include" \ ADDLDFLAGS=" -L${LOCALBASE}/lib" post-build: diff --git a/editors/vigor/files/patch-sum b/editors/vigor/files/patch-sum index c60c9b7c08e..349d5b3bfa1 100644 --- a/editors/vigor/files/patch-sum +++ b/editors/vigor/files/patch-sum @@ -1,3 +1,4 @@ -$NetBSD: patch-sum,v 1.1 2000/01/21 14:54:06 jdolecek Exp $ +$NetBSD: patch-sum,v 1.2 2000/08/30 16:20:35 jwise Exp $ MD5 (patch-aa) = 3efec3c766db8f8b24abfa139994fc6d +MD5 (patch-ab) = 14d98167a3680865342447752b3c5242 diff --git a/editors/vigor/patches/patch-ab b/editors/vigor/patches/patch-ab new file mode 100644 index 00000000000..1ef6feee63b --- /dev/null +++ b/editors/vigor/patches/patch-ab @@ -0,0 +1,20 @@ +--- configure.orig Thu Jan 20 02:14:28 2000 ++++ configure Wed Aug 30 11:51:34 2000 +@@ -1880,7 +1880,7 @@ + cat conftest.$ac_ext >&5 + fi + rm -f conftest* +-test "$ac_cv_search_Tcl_Init" = "no" && for i in tcl tcl82 tcl80; do ++test "$ac_cv_search_Tcl_Init" = "no" && for i in tcl83 tcl tcl82 tcl80; do + LIBS="-l$i -lm $ac_func_search_save_LIBS" + cat > conftest.$ac_ext <&5 + fi + rm -f conftest* +-test "$ac_cv_search_Tk_Init" = "no" && for i in tk tk82 tk80; do ++test "$ac_cv_search_Tk_Init" = "no" && for i in tk tk83 tk82 tk80; do + LIBS="-l$i $XLIBS -lm $ac_func_search_save_LIBS" + cat > conftest.$ac_ext <