Adapt this package to tk-8.3.2.

3 files changed, 83 insertions, 6 deletions

diff --git a/net/tcpillust/Makefile b/net/tcpillust/Makefile
index 71ee4c09bc2..2b4994609b8 100644
--- a/net/tcpillust/Makefile
+++ b/net/tcpillust/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/07/31 20:24:15 itojun Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/31 15:12:08 jwise Exp $
 # $FreeBSD: ports/net/tcpillust/Makefile,v 1.1.1.1 2000/07/29 06:26:00 sada Exp $
 #
 
@@ -9,13 +9,12 @@ MASTER_SITES=	ftp://ftp.csl.sony.co.jp/CSL/nishida/
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.csl.sony.co.jp/person/nishida/tcpillust.html
 
-DEPENDS+=	tk-*:../../x11/tk80
-DEPENDS+=	tcl-*:../../lang/tcl80
+DEPENDS+=	tk-8.3.2:../../x11/tk
 
 USE_IMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-tcl-include=${LOCALBASE}/include/tcl8.0 \
-		--with-tk-include=${LOCALBASE}/include/tk8.0 \
+CONFIGURE_ARGS+=--with-tcl-include=${LOCALBASE}/include \
+		--with-tk-include=${LOCALBASE}/include \
 		--with-tcl-lib=${LOCALBASE}/lib \
 		--with-tk-lib=${LOCALBASE}/lib
 
diff --git a/net/tcpillust/files/patch-sum b/net/tcpillust/files/patch-sum
index dc8c6c7f7cb..c11341d53ea 100644
--- a/net/tcpillust/files/patch-sum
+++ b/net/tcpillust/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.1 2000/07/31 20:24:18 itojun Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/31 15:12:12 jwise Exp $
 
 MD5 (patch-aa) = ad4bdd427de36209a8b2ed8333edec6e
 MD5 (patch-ab) = 7676d76cf634600ed904c195afc7212a
+MD5 (patch-ac) = af2c44bb2b3c72676f6490a74280b095
diff --git a/net/tcpillust/patches/patch-ac b/net/tcpillust/patches/patch-ac
new file mode 100644
index 00000000000..87ce932667b
--- /dev/null
+++ b/net/tcpillust/patches/patch-ac
@@ -0,0 +1,77 @@
+$NetBSD: patch-ac,v 1.1 2000/08/31 15:12:12 jwise Exp $
+--- configure.orig	Fri Apr 21 13:31:26 2000
++++ configure	Thu Aug 31 10:59:50 2000
+@@ -668,7 +668,7 @@
+ 		unset ac_cv_lib_tcl_Tcl_Init
+ 		unset ac_cv_lib_tcl80_Tcl_Init
+ 		unset ac_cv_lib_tcl81_Tcl_Init
+-		unset ac_cv_lib_tcl82_Tcl_Init
++		unset ac_cv_lib_tcl83_Tcl_Init
+ 		unset ac_cv_lib_tcl80jp_Tcl_Init
+ 		LIBS="-L$ac_dir -lm"
+ 		echo $ac_n "checking for tcllib""... $ac_c" 1>&6
+@@ -787,14 +787,14 @@
+   tcllib=tcl81;break
+ else
+   echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for Tcl_Init in -ltcl82""... $ac_c" 1>&6
+-echo "configure:792: checking for Tcl_Init in -ltcl82" >&5
+-ac_lib_var=`echo tcl82'_'Tcl_Init | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for Tcl_Init in -ltcl83""... $ac_c" 1>&6
++echo "configure:792: checking for Tcl_Init in -ltcl83" >&5
++ac_lib_var=`echo tcl83'_'Tcl_Init | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-ltcl82  $LIBS"
++LIBS="-ltcl83  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 800 "configure"
+ #include "confdefs.h"
+@@ -822,7 +822,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  tcllib=tcl82;break
++  tcllib=tcl83;break
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for Tcl_Init in -ltcl80jp""... $ac_c" 1>&6
+@@ -1203,7 +1203,7 @@
+ 		unset ac_cv_lib_tk_Tk_Init
+ 		unset ac_cv_lib_tk42_Tk_Init
+ 		unset ac_cv_lib_tk80_Tk_Init
+-		unset ac_cv_lib_tk82_Tk_Init
++		unset ac_cv_lib_tk83_Tk_Init
+ 		unset ac_cv_lib_tk80jp_Tk_Init
+ 		LIBS="-L$ac_dir -L$x_libraries -L$tcllibdir -lX11 -l$tcllib -lm"
+ 		echo $ac_n "checking for tklib""... $ac_c" 1>&6
+@@ -1322,14 +1322,14 @@
+   tklib=tk80;break
+ else
+   echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for Tk_Init in -ltk82""... $ac_c" 1>&6
+-echo "configure:1327: checking for Tk_Init in -ltk82" >&5
+-ac_lib_var=`echo tk82'_'Tk_Init | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for Tk_Init in -ltk83""... $ac_c" 1>&6
++echo "configure:1327: checking for Tk_Init in -ltk83" >&5
++ac_lib_var=`echo tk83'_'Tk_Init | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-ltk82  $LIBS"
++LIBS="-ltk83  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 1335 "configure"
+ #include "confdefs.h"
+@@ -1357,7 +1357,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  tklib=tk82;break
++  tklib=tk83;break
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for Tk_Init in -ltk80jp""... $ac_c" 1>&6