Adapt this package to tcl-8.3.2.

4 files changed, 84 insertions, 11 deletions

diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile
index d659e488303..76d33b91c6c 100644
--- a/converters/xdeview/Makefile
+++ b/converters/xdeview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1999/04/01 13:38:43 agc Exp $
+# $NetBSD: Makefile,v 1.14 2000/08/30 19:06:40 jwise Exp $
 # FreeBSD Id: Makefile,v 1.11 1998/02/24 21:43:45 jseger Exp
 #
 
@@ -10,16 +10,16 @@ MASTER_SITES=	http://www.informatik.uni-frankfurt.de/~fp/uudeview/Apps/frank/
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.informatik.uni-frankfurt.de/~fp/uudeview/
 
-DEPENDS+=	tk-8.0.5:../../x11/tk80
+DEPENDS+=	tk-8.3.2:../../x11/tk
 DEPENDS+=	uulib-0.5.13:../../converters/uulib
 
 USE_X11BASE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-tcl="${LOCALBASE}" --enable-tk="${LOCALBASE}"
 # Season to taste --- anything over tcl7.5
-CONFIGURE_ENV=	LDFLAGS=-s \
-		CPPFLAGS="-I${LOCALBASE}/include/tcl8.0 \
-		          -I${LOCALBASE}/include/tk8.0"
+CONFIGURE_ENV=	LDFLAGS=-s\
+		CPPFLAGS="-I${LOCALBASE}/include/ \
+		          -I${LOCALBASE}/include/"
 
 ALL_TARGET=	xdeview
 INSTALL_TARGET=	install-tcl
diff --git a/converters/xdeview/files/patch-sum b/converters/xdeview/files/patch-sum
index 5b241519c54..1f31666fba8 100644
--- a/converters/xdeview/files/patch-sum
+++ b/converters/xdeview/files/patch-sum
@@ -1,5 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:28 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/30 19:06:40 jwise Exp $
 
-MD5 (patch-aa) = 4804390aabc34b064085e516e31e88e7
+MD5 (patch-aa) = e8bee9b119c058576f406cab2dc66856
 MD5 (patch-ab) = d396508873b0323aa338b066b7828f08
 MD5 (patch-ac) = 9795ee61f33702eb712aadcadc02ea34
+MD5 (patch-ad) = 1f88e6c7b042de1f320f383d8f33318b
diff --git a/converters/xdeview/patches/patch-aa b/converters/xdeview/patches/patch-aa
index c32c3e7fb87..cda0bfba686 100644
--- a/converters/xdeview/patches/patch-aa
+++ b/converters/xdeview/patches/patch-aa
@@ -1,7 +1,50 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:40:18 agc Exp $
-
---- ./configure.org	Thu Jan  9 06:22:00 1997
-+++ ./configure	Sun Mar 30 04:25:11 1997
+--- configure.orig	Thu Jan  9 09:22:00 1997
++++ configure	Wed Aug 30 13:07:40 2000
+@@ -2202,14 +2202,14 @@
+ cat > conftest.$ac_ext <<EOF
+ #line 2204 "configure"
+ #include "confdefs.h"
++#include <tk.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char Tk_Main();
+ 
+ int main() { return 0; }
+ int t() {
+-Tk_Main()
++Tk_MainEx(0, (char **)0, (char *)0)
+ ; return 0; }
+ EOF
+ if { (eval echo configure:2216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+@@ -2245,11 +2245,11 @@
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char Tk_Main();
++char Tk_MainEx();
+ 
+ int main() { return 0; }
+ int t() {
+-Tk_Main()
++Tk_MainEx(0, (char **)0, (char *)0)
+ ; return 0; }
+ EOF
+ if { (eval echo configure:2256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+@@ -2286,11 +2286,11 @@
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char Tk_Main();
++char Tk_MainEx();
+ 
+ int main() { return 0; }
+ int t() {
+-Tk_Main()
++Tk_Main(0, (char **)0, (char *)0)
+ ; return 0; }
+ EOF
+ if { (eval echo configure:2297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
 @@ -3148,7 +3148,7 @@
  
  fi
diff --git a/converters/xdeview/patches/patch-ad b/converters/xdeview/patches/patch-ad
new file mode 100644
index 00000000000..b113acdf09a
--- /dev/null
+++ b/converters/xdeview/patches/patch-ad
@@ -0,0 +1,29 @@
+--- tcl/uuwish.c.orig	Thu Jun  6 15:41:11 1996
++++ tcl/uuwish.c	Wed Aug 30 13:24:05 2000
+@@ -79,17 +79,20 @@
+ main (int argc, char *argv[])
+ {
+ #ifdef HAVE_TK
+-  Tk_Main
++#ifdef TMAIN_THREE
++  Tk_Main(argc, argv, Tcl_AppInit);
++#else
++  Tk_Main(argc, argv);
++#endif
+ #else
+ #ifdef HAVE_TCL
+-  Tcl_Main
++#ifdef TMAIN_THREE
++  Tcl_Main(argc, argv, Tcl_AppInit);
++#else
++  Tcl_Main(argc, argv);
+ #endif
+ #endif
+-    (argc, argv
+-#ifdef TMAIN_THREE
+-     , Tcl_AppInit
+ #endif
+-     );
+ 
+   return 0;
+ }