Update sather to 1.2.3.

Also update the tk dep to no longer demand tk83. It does not seem to
work all that well with tk84, but it works about the same as it does
with tk83. And depend explicitly on tcl; that was missing.

Primary changes since 1.2.1 seem to be GPLv2 -> GPLv3 and
whitespace/reindenting, but there seems to be a bit more in there
too. There's also now a 12 meg kdevelop blob in the distfile, yay.

Changelog:

    GNU Sather 1.2.3 - Jul 7, 2007 - Michael R. Taylor

    * Made INT 32-bit even on 64-bit systems
    * Changed license to (GPLv3/LGPLv3) or later

There's no changelog for 1.2.2, dunno why.

7 files changed, 18 insertions, 73 deletions

diff --git a/lang/sather/Makefile b/lang/sather/Makefile
index 150c394338f..bec75926a2a 100644
--- a/lang/sather/Makefile
+++ b/lang/sather/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.40 2008/05/26 02:13:21 joerg Exp $
+# $NetBSD: Makefile,v 1.41 2008/07/14 01:23:52 dholland Exp $
 
-DISTNAME=		sather-1.2.1
-PKGREVISION=		7
+DISTNAME=		sather-1.2.3
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=sather/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnu.org/software/sather/
 COMMENT=		Compiler for the Sather object oriented programming language
+#LICENSE=		gnu-gpl-v3 gnu-lgpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -97,6 +97,7 @@ do-install:
 		${DESTDIR}${PREFIX}/share/emacs/site-lisp
 
 .include "../../devel/boehm-gc/buildlink3.mk"
-.include "../../x11/tk83/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
+.include "../../lang/tcl/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/sather/distinfo b/lang/sather/distinfo
index 0c38f707c72..cd73b664d31 100644
--- a/lang/sather/distinfo
+++ b/lang/sather/distinfo
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.9 2007/07/28 13:10:59 wiz Exp $
+$NetBSD: distinfo,v 1.10 2008/07/14 01:23:52 dholland Exp $
 
-SHA1 (sather-1.2.1.tar.gz) = 434f6b9c69d63a022c83f3693011415ad9730cb1
-RMD160 (sather-1.2.1.tar.gz) = 73ff88f8035f7f6a98548a0ca6c359217cb58950
-Size (sather-1.2.1.tar.gz) = 4458088 bytes
+SHA1 (sather-1.2.3.tar.gz) = 85678468dc99ee1880a38d994d4231e799fcaae6
+RMD160 (sather-1.2.3.tar.gz) = 219594b2621df4f4bb75bd41c67b1a26ecb04042
+Size (sather-1.2.3.tar.gz) = 5535747 bytes
 SHA1 (patch-aa) = d326038193ce2fb459ed19f9ab2ae2b6dce1ace3
 SHA1 (patch-ab) = e45f8a8230d1fbe3fc72babbecfa8148699f7906
 SHA1 (patch-ac) = 586cdebde7a2c1b49f9b75a33d26980a2c0397f3
 SHA1 (patch-ad) = 47218ca16bb8aec4d43f96f0d72b879b24c95f26
-SHA1 (patch-ae) = 3d36a3dcbc6bc36af6353a619366189445e2b14e
+SHA1 (patch-ae) = ba1b6c0d47313793cfab8823cee76952090e53c9
 SHA1 (patch-af) = 1ab2a67446f48c088ec77550d199a9779c50ffb8
 SHA1 (patch-ag) = 5cd0a0ab1c1fbf80c6ba424fa1926957ede35715
 SHA1 (patch-ah) = 9dad48a3bc7e6af65eb51ae6070b8e67cab9ca2b
 SHA1 (patch-ai) = 032b6a4355bdd059d5b88ebe00ae2c1bf35c8eba
-SHA1 (patch-aj) = f9f4d36335fe4c20fa01f4ff6cba59edeb0deab7
+SHA1 (patch-aj) = 1c8a60bccde97d5527578e3ad624211032a7aed3
 SHA1 (patch-ak) = 9efae5b96d5e8b8040d74eebc20b3aa7153d2aee
 SHA1 (patch-al) = 52d12bc03d041dfa28140842f46a423644952a91
 SHA1 (patch-am) = b75d6812ee2bcb81205d82316c8215d500df077c
@@ -22,12 +22,9 @@ SHA1 (patch-ap) = 5fedfb90a13d36406486d1d86bbcf0a22a0e19a5
 SHA1 (patch-aq) = 82dd99ac9741766fb010764353451f990b027f58
 SHA1 (patch-ar) = 7add10b00c76179d864405f81b984fc38a185a2c
 SHA1 (patch-as) = 8970360fdae89308baacbf5beb39b62c7137d4cc
-SHA1 (patch-at) = 47662072aee4c924e33d6396eecf4ba56f87f2cb
 SHA1 (patch-au) = c014dc73d0dae3f777ecf18380efce7478147550
 SHA1 (patch-av) = 89573de88e99140dfb7fdae226646e40792a5752
 SHA1 (patch-aw) = 87dbb259e058d7f246b523b8b4e101b02435c004
-SHA1 (patch-ax) = 21801b475c59f48d561fed063fc758cc331f92ec
-SHA1 (patch-ay) = 69237cba23aef19677d681db60fabcd9029893a7
 SHA1 (patch-az) = 4898f196406c62a1b81188b989c56f3c6b69731a
 SHA1 (patch-ba) = c1399f620f7f7fae6b65efe98ca931ac1a586e16
 SHA1 (patch-bb) = 8e82e1d5796c9109527282d67c8f81ca0b9338dc
diff --git a/lang/sather/patches/patch-ae b/lang/sather/patches/patch-ae
index 0f92f45175e..051263b8d0c 100644
--- a/lang/sather/patches/patch-ae
+++ b/lang/sather/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2006/01/12 00:05:04 joerg Exp $
+$NetBSD: patch-ae,v 1.3 2008/07/14 01:23:52 dholland Exp $
 
 --- Makefile.orig	Thu Nov  4 08:04:28 1999
 +++ Makefile	Thu May  2 17:09:46 2002
@@ -13,7 +13,7 @@ $NetBSD: patch-ae,v 1.2 2006/01/12 00:05:04 joerg Exp $
 +MV?=mv
 +AR?=ar
  RM=rm -f
- LN=ln -s
+ LN=ln -sf
 -CP=cp
 +CP?=cp
  
@@ -24,11 +24,11 @@ $NetBSD: patch-ae,v 1.2 2006/01/12 00:05:04 joerg Exp $
  EXEC_SUFFIX=
  # CC is only used for bootstrapping, check System/Common/CONFIG.proto if
  # you want to change it for all Sather compilations
-@@ -90,7 +90,7 @@
+@@ -91,7 +91,7 @@
  # The platform to use if not overridden by a -<platform> option
  # or the SATHER_PLATFORM environment variable
  # Should be edited for a particular system
--DEFAULT_PLATFORM=unix
+-DEFAULT_PLATFORM=linux
 +DEFAULT_PLATFORM=${LOWER_OPSYS}
  
  # The platform used to compile the boot compiler. Usually just default, but has to
diff --git a/lang/sather/patches/patch-aj b/lang/sather/patches/patch-aj
index fbb35a4d0c7..266326b61eb 100644
--- a/lang/sather/patches/patch-aj
+++ b/lang/sather/patches/patch-aj
@@ -1,9 +1,9 @@
-$NetBSD: patch-aj,v 1.1.1.1 2002/05/04 00:45:36 jtb Exp $
+$NetBSD: patch-aj,v 1.2 2008/07/14 01:23:52 dholland Exp $
 
 --- System/Platforms/tcltk/Make.target.inc.orig	Thu May  2 17:21:52 2002
 +++ System/Platforms/tcltk/Make.target.inc	Thu May  2 17:21:35 2002
 @@ -1,2 +1,2 @@
 -TCL_LIB_NAME = $(shell if [ -e /usr/lib/libtcl8.0.so ] ; then echo "tcl8.0" ; else echo "tcl"; fi)
 -TK_LIB_NAME = $(shell if [ -e /usr/lib/libtk8.0.so ] ; then echo "tk8.0" ; else echo "tk"; fi)
-+TCL_LIB_NAME = tcl83
-+TK_LIB_NAME = tk83
++TCL_LIB_NAME = tcl84
++TK_LIB_NAME = tk84
diff --git a/lang/sather/patches/patch-at b/lang/sather/patches/patch-at
deleted file mode 100644
index 2fbba7cebb0..00000000000
--- a/lang/sather/patches/patch-at
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-at,v 1.3 2004/01/13 20:56:31 kristerw Exp $
-
---- System/Common/floatmath.h.orig	Tue Jan 13 20:35:43 2004
-+++ System/Common/floatmath.h	Tue Jan 13 20:36:30 2004
-@@ -104,14 +104,14 @@
- #else
- /* WITHOUT single-precision library */
- 
--#define _FM_F(name)	static FLT r_##name() {return name##();}
--#define _FM_F_I(name)	static FLT r_##name(INT i) {return name##(i);}
--#define _FM_F_F(name)	static FLT r_##name(FLT f) {return name##(f);}
--#define _FM_F_FF(name)	static FLT r_##name(FLT f,FLT g) {return name##(f,g);}
--#define _FM_F_FI(name)	static FLT r_##name(FLT f,INT i) {return name##(f,i);}
--#define _FM_F_IF(name)	static FLT r_##name(INT i,FLT f) {return name##(i,f);}
--#define _FM_B_F(name)	static BOOL ir_##name(FLT f) {return ir_##name##(f);}
--#define _FM_I_F(name)	static INT ir_##name(FLT f) {return ir_##name##(f);}
-+#define _FM_F(name)	static FLT r_##name() {return name();}
-+#define _FM_F_I(name)	static FLT r_##name(INT i) {return name(i);}
-+#define _FM_F_F(name)	static FLT r_##name(FLT f) {return name(f);}
-+#define _FM_F_FF(name)	static FLT r_##name(FLT f,FLT g) {return name(f,g);}
-+#define _FM_F_FI(name)	static FLT r_##name(FLT f,INT i) {return name(f,i);}
-+#define _FM_F_IF(name)	static FLT r_##name(INT i,FLT f) {return name(i,f);}
-+#define _FM_B_F(name)	static BOOL ir_##name(FLT f) {return ir_##name(f);}
-+#define _FM_I_F(name)	static INT ir_##name(FLT f) {return ir_##name(f);}
- #define _FM_V_FP(name)	static void r_##name(FLT f, FLT g[])\
- 			{double a,b; sincos(f,&a,&b); g[0]=a; g[1]=b;}
- 
diff --git a/lang/sather/patches/patch-ax b/lang/sather/patches/patch-ax
deleted file mode 100644
index 86d8c05b15f..00000000000
--- a/lang/sather/patches/patch-ax
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ax,v 1.1 2004/01/13 20:56:31 kristerw Exp $
-
---- Library/Ext/fortran.config.orig	Tue Jan 13 20:40:28 2004
-+++ Library/Ext/fortran.config	Tue Jan 13 20:40:39 2004
-@@ -139,7 +139,7 @@
- F_ARRAY3_CREATE_ARRAY3:   PP, exec "(@0)$1->arr_part";
- 
- F_ARRAY2_CREATE_MAT:	PP, exec "(@0)$1->arr_part";
--#endif FORTRAN_CONFIG
-+#endif
- 
- 
- 
diff --git a/lang/sather/patches/patch-ay b/lang/sather/patches/patch-ay
deleted file mode 100644
index f6f161697c6..00000000000
--- a/lang/sather/patches/patch-ay
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ay,v 1.1 2004/01/13 20:56:31 kristerw Exp $
-
---- Library/Ext/c.config.orig	Tue Jan 13 20:41:30 2004
-+++ Library/Ext/c.config	Tue Jan 13 20:41:40 2004
-@@ -187,7 +187,7 @@
- C_LONG_DOUBLE_PTR_IS_EQ:	PP,VSTD,exec	"$$=C_LONG_DOUBLE_PTR_IS_EQ($0,$1);" "$$";
- 
- 
--#endif C_CONFIG
-+#endif
- 
- 
-