Switch to Tcl/Tk-8.4.

Bump PKGREVISION due to dependency changes.

4 files changed, 38 insertions, 26 deletions

diff --git a/editors/vigor/Makefile b/editors/vigor/Makefile
index fc0b4c38d7e..ea4906b1805 100644
--- a/editors/vigor/Makefile
+++ b/editors/vigor/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2004/04/11 08:29:41 snj Exp $
+# $NetBSD: Makefile,v 1.16 2005/01/22 02:35:44 minskim Exp $
 #
 
 DISTNAME=	vigor-0.016
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=vigor/}
 
@@ -21,9 +22,10 @@ CONFIGURE_ARGS+=--with-x
 #		--disable-curses \
 #		--disable-db \
 #		--disable-re
-CONFIGURE_ENV+=	ADDCPPFLAGS="	-I${LOCALBASE}/include \
-				-I${LOCALBASE}/include" \
-		ADDLDFLAGS="	-L${LOCALBASE}/lib"
+CONFIGURE_ENV+=	TCLCONFIG_SH=${TCLCONFIG_SH:Q}
+
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
 
 .if exists(/usr/include/sys/queue.h)
 # this file obscures the system header
@@ -34,5 +36,4 @@ post-patch:
 post-build:
 	nroff -mandoc ${WRKSRC}/../docs/USD.doc/vi.man/vi.1 >${WRKSRC}/../docs/USD.doc/vi.man/vi.0
 
-.include "../../x11/tk83/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vigor/distinfo b/editors/vigor/distinfo
index e73db35174c..0efbe63e97d 100644
--- a/editors/vigor/distinfo
+++ b/editors/vigor/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/11/15 23:40:33 hubertf Exp $
+$NetBSD: distinfo,v 1.4 2005/01/22 02:35:44 minskim Exp $
 
 SHA1 (vigor-0.016.tar.gz) = cbbd7db8226421b86c50799178033c4248753706
 Size (vigor-0.016.tar.gz) = 1108486 bytes
 SHA1 (patch-aa) = 2e50c3612956840ee2cea7b6c2b508bef60ea270
-SHA1 (patch-ab) = 26986b721459b917db2f8079cec437fa1f3e8528
+SHA1 (patch-ab) = 4663f03370620fdf622c276a82102bb17a306661
+SHA1 (patch-ac) = e264e04341f41be2387a6125342bb4a2957e5035
diff --git a/editors/vigor/patches/patch-ab b/editors/vigor/patches/patch-ab
index 7a95e73d4ad..a93f73e28fa 100644
--- a/editors/vigor/patches/patch-ab
+++ b/editors/vigor/patches/patch-ab
@@ -1,22 +1,18 @@
-$NetBSD: patch-ab,v 1.3 2001/11/15 23:40:34 hubertf Exp $
+$NetBSD: patch-ab,v 1.4 2005/01/22 02:35:44 minskim Exp $
 
---- configure.orig	Wed May  3 04:27:53 2000
+--- configure.orig	2000-05-02 21:27:53.000000000 -0500
 +++ configure
-@@ -1881,7 +1881,7 @@
-   cat conftest.$ac_ext >&5
+@@ -1852,10 +1852,11 @@ else
+   echo "$ac_t""no" 1>&6
  fi
- rm -f conftest*
--test "$ac_cv_search_Tcl_Init" = "no" && for i in tcl tcl82 tcl8.2 tcl80 tcl8.0; do
-+test "$ac_cv_search_Tcl_Init" = "no" && for i in tcl83 tcl tcl82 tcl8.2 tcl80 tcl8.0; do
- LIBS="-l$i  $ac_func_search_save_LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1888 "configure"
-@@ -1943,7 +1943,7 @@
-   cat conftest.$ac_ext >&5
- fi
- rm -f conftest*
--test "$ac_cv_search_Tk_Init" = "no" && for i in tk tk82 tk8.2 tk80 tk8.0; do
-+test "$ac_cv_search_Tk_Init" = "no" && for i in tk83 tk tk82 tk8.2 tk80 tk8.0; do
- LIBS="-l$i $XLIBS $ac_func_search_save_LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 1950 "configure"
+ 
+-LIBS="$LIBS -lm"
++. $TCLCONFIG_SH
++LIBS="$LIBS $TCL_LIBS"
+ 
+ echo $ac_n "checking for library containing Tcl_Init""... $ac_c" 1>&6
+-echo "configure:1859: checking for library containing Tcl_Init" >&5
++echo "configure:1860: checking for library containing Tcl_Init" >&5
+ if eval "test \"`echo '$''{'ac_cv_search_Tcl_Init'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
diff --git a/editors/vigor/patches/patch-ac b/editors/vigor/patches/patch-ac
new file mode 100644
index 00000000000..bfed6885e26
--- /dev/null
+++ b/editors/vigor/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2005/01/22 02:35:44 minskim Exp $
+
+--- configure.in.orig	2000-05-02 21:27:52.000000000 -0500
++++ configure.in
+@@ -243,7 +243,8 @@ dnl Make sure we can find a Tcl/Tk inter
+ LIBOBJS="tcl.o $LIBOBJS"
+ dnl GNU/Linux Tcl requires -ldl
+ AC_CHECK_LIB(dl,dlopen)
+-LIBS="$LIBS -lm"
++. $TCLCONFIG_SH
++LIBS="$LIBS $TCL_LIBS"
+ AC_SEARCH_LIBS(Tcl_Init,tcl tcl82 tcl8.2 tcl80 tcl8.0,,dnl
+   AC_MSG_ERROR([Tcl is required for Vigor but could not be located.]))
+ AC_SEARCH_LIBS(Tk_Init,tk tk82 tk8.2 tk80 tk8.0,,dnl