Upgrade to zircon-1.18.109. Revert to tk-8.0.

4 files changed, 16 insertions, 21 deletions

diff --git a/irc/zircon/Makefile b/irc/zircon/Makefile
index 44e48ed5cf6a..69a0834e4cce 100644
--- a/irc/zircon/Makefile
+++ b/irc/zircon/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	zircon
-# Version required:	1.18.91
+# Version required:	1.18.109
 # Date created:		19 Aug 1995
 # Whom:			jkh / pst
 #
-# $Id: Makefile,v 1.24 1998/02/12 14:28:01 jseger Exp $
+# $Id: Makefile,v 1.25 1998/02/24 21:43:48 jseger Exp $
 #
 
-DISTNAME=	zircon-1.18.91
-CATEGORIES=	net tk81
+DISTNAME=	zircon-1.18.109
+CATEGORIES=	net tk80
 MASTER_SITES=	ftp://catless.ncl.ac.uk/pub/
 
 MAINTAINER=	jseger@FreeBSD.org
 
-BUILD_DEPENDS=	wish8.1:${PORTSDIR}/x11/tk81
-RUN_DEPENDS=	wish8.1:${PORTSDIR}/x11/tk81
+BUILD_DEPENDS=	wish8.0:${PORTSDIR}/x11/tk80
+RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11/tk80
 
 IS_INTERACTIVE=	yes
 NO_BUILD=	yes
diff --git a/irc/zircon/distinfo b/irc/zircon/distinfo
index 160f9ac177bc..8c119864f64b 100644
--- a/irc/zircon/distinfo
+++ b/irc/zircon/distinfo
@@ -1 +1 @@
-MD5 (zircon-1.18.91.tar.gz) = cfb95400c22f768b67dbd831fb38e93c
+MD5 (zircon-1.18.109.tar.gz) = 443d2c2e85000aa38e9f17f63b1dee39
diff --git a/irc/zircon/files/patch-aa b/irc/zircon/files/patch-aa
index 37a59ffec0d5..66415b5d6352 100644
--- a/irc/zircon/files/patch-aa
+++ b/irc/zircon/files/patch-aa
@@ -5,7 +5,7 @@
      global CC GCC SCflag CFlags Type SLDflag share scflags
      switch {} $CC {} default return
 -    set CFlags -O
-+    set CFlags {-O -I/usr/local/include/tcl8.1}
++    set CFlags {-O -I/usr/local/include/tcl8.0}
      catch {set CFlags $cflags($Type)}
      switch BSDI $Type {
  	set CC gcc2
diff --git a/irc/zircon/pkg-plist b/irc/zircon/pkg-plist
index 5ad7544aca60..a9b22f9cdfcd 100644
--- a/irc/zircon/pkg-plist
+++ b/irc/zircon/pkg-plist
@@ -30,6 +30,7 @@ lib/zircon/help/Zircon/Windows/Info
 lib/zircon/help/Zircon/Windows/Message
 lib/zircon/installed
 lib/zircon/lang/bulgar.tcl
+lib/zircon/lang/catala.tcl
 lib/zircon/lang/deutsch.tcl
 lib/zircon/lang/english.tcl
 lib/zircon/lang/espanol.tcl
@@ -48,12 +49,14 @@ lib/zircon/lib/Classes.tcl
 lib/zircon/lib/Control.tcl
 lib/zircon/lib/DALnet.tcl
 lib/zircon/lib/Entry.tcl
+lib/zircon/lib/Friend.tcl
 lib/zircon/lib/Friends.tcl
 lib/zircon/lib/Help.tcl
 lib/zircon/lib/IRC.tcl
 lib/zircon/lib/Ignore.tcl
 lib/zircon/lib/Info.tcl
 lib/zircon/lib/Interface.tcl
+lib/zircon/lib/List.tcl
 lib/zircon/lib/Log.tcl
 lib/zircon/lib/Look.tcl
 lib/zircon/lib/Mac.tcl
@@ -74,6 +77,7 @@ lib/zircon/lib/Undernet.tcl
 lib/zircon/lib/Unix.tcl
 lib/zircon/lib/User.tcl
 lib/zircon/lib/Util.tcl
+lib/zircon/lib/WBoard.tcl
 lib/zircon/lib/Window.tcl
 lib/zircon/lib/Windows.tcl
 lib/zircon/lib/bindings.tcl
@@ -101,30 +105,20 @@ lib/zircon/lib/tcl80.tcl
 lib/zircon/lib/tcl81.tcl
 lib/zircon/lib/upgrade.tcl
 lib/zircon/lib/userCmds.tcl
-lib/zircon/lib/zdraw.tcl
 lib/zircon/lib/zircon.tcl
 lib/zircon/look/standard.tcl
 lib/zircon/plugins/Dcc/auto.tcl
 lib/zircon/plugins/Dcc/chat.tcl
 lib/zircon/plugins/Dcc/dcc.tcl
-lib/zircon/plugins/Dcc/dccget
-lib/zircon/plugins/Dcc/dccsend
+lib/zircon/plugins/Dcc/dccget.tcl
+lib/zircon/plugins/Dcc/dccsend.tcl
 lib/zircon/plugins/Dcc/pkgIndex.tcl
 lib/zircon/plugins/Dcc/send.tcl
 lib/zircon/plugins/MsgOps/setup.tcl
 lib/zircon/plugins/NoticeOps/setup.tcl
-lib/zircon/plugins/Sed/crypt
 lib/zircon/plugins/Sed/decrypt.tcl
-lib/zircon/plugins/Sed/libSed.so
 lib/zircon/plugins/Sed/pkgIndex.tcl
-lib/zircon/rc
-lib/zircon/zircon.ad
-@exec mkdir %D/lib/zircon/help/Channels
-@exec mkdir %D/lib/zircon/help/Servers
-@exec mkdir %D/lib/zircon/help/Services
-@exec mkdir %D/lib/zircon/help/Users
-@exec mkdir %D/lib/zircon/scripts
-@exec mkdir %D/lib/zircon/sounds
+lib/zircon/samples/zircon.ad
 @dirrm lib/zircon/help/Zircon/Windows
 @dirrm lib/zircon/help/Channels
 @dirrm lib/zircon/help/Servers
@@ -141,6 +135,7 @@ lib/zircon/zircon.ad
 @dirrm lib/zircon/plugins/NoticeOps
 @dirrm lib/zircon/plugins/Sed
 @dirrm lib/zircon/plugins
+@dirrm lib/zircon/samples
 @dirrm lib/zircon/scripts
 @dirrm lib/zircon/sounds
 @dirrm lib/zircon