4 files changed, 96 insertions, 22 deletions

diff --git a/irc/zircon/Makefile b/irc/zircon/Makefile
index f7c7a19d6cd2..af7de60f8114 100644
--- a/irc/zircon/Makefile
+++ b/irc/zircon/Makefile
@@ -1,17 +1,33 @@
 # New ports collection makefile for:	zircon
-# Version required:	1.15p11
+# Version required:	1.17p3
 # Date created:		19 Aug 1995
 # Whom:			jkh / pst
 #
-# $Id: Makefile,v 1.5 1995/10/04 01:56:37 asami Exp $
+# $Id: Makefile,v 1.6 1995/11/27 04:06:03 asami Exp $
 #
 
-DISTNAME=	zircon-1.15p11
-PKGNAME=	zircon-1.15.11
+DISTNAME=	zircon-1.17p3
 CATEGORIES+=	net
 MASTER_SITES=	ftp://catless.ncl.ac.uk/pub/
 
+#
+# You can define USE_DPWISH if you want to run under the older
+# tcl7.3/tk3.6/tclDP code.  The author strongly reccomends using
+# tcl7.5/tk4.1 instead, and the tclDP wont be supported for long.
+#
+.if defined(USE_DPWISH) && ${USE_DPWISH} == YES && exists(${PREFIX}/bin/dpwish)
 BUILD_DEPENDS=	dpwish:${PORTSDIR}/net/tclDP
 RUN_DEPENDS=	dpwish:${PORTSDIR}/net/tclDP
+MAKE_ENV=	WISH=${PREFIX}/bin/dpwish
+.else
+BUILD_DEPENDS=	wish4.1:${PORTSDIR}/x11/tk41
+RUN_DEPENDS=	wish4.1:${PORTSDIR}/x11/tk41
+MAKE_ENV=	WISH=${PREFIX}/bin/wish4.1
+.endif
+
+MAKEFILE=	Makefile.FreeBSD
+
+pre-patch:
+	cp ${WRKSRC}/Makefile.Linux ${WRKSRC}/Makefile.FreeBSD
 
 .include <bsd.port.mk>
diff --git a/irc/zircon/distinfo b/irc/zircon/distinfo
index 93a0830485f3..1eee23dc32a5 100644
--- a/irc/zircon/distinfo
+++ b/irc/zircon/distinfo
@@ -1 +1 @@
-MD5 (zircon-1.15p11.tar.gz) = c789b1b36d7134341046169235210466
+MD5 (zircon-1.17p3.tar.gz) = fdf182e5a576dd99a772a66ff3146abe
diff --git a/irc/zircon/pkg-descr b/irc/zircon/pkg-descr
index 9dd152f3f3a4..7f18565ed354 100644
--- a/irc/zircon/pkg-descr
+++ b/irc/zircon/pkg-descr
@@ -1,9 +1,9 @@
-This is a release of Zircon, an X11 interface to Internet Relay Chat.
-The software is written in tcl/tk and uses the tcl-dp TCP extensions
-to provide network communications. Suggestions for improvements to
-Zircon are welcome. I am particularly interested in making the
-system useful for those users in groups where JIPS and other national
-character sets are used.
+This is a release of Zircon, an X11 interface to Internet Relay Chat. The
+software is written in tcl/tk and uses its native features to provide
+network communications. Suggestions for improvements to Zircon are
+welcome. I am particularly interested in making the system useful for
+those users in groups where JIPS and other national character sets are
+used.
 
 Zircon has more features than you could possibly imagine and
 implements nearly everything that the irc II clients support as well
@@ -14,4 +14,23 @@ on your machine *NOW*.
 
 Please send all reports, comments and suggestions to: 
 
-        zircon@catless.newcastle.ac.uk
+	zircon@catless.newcastle.ac.uk
+
+N.B. the user whose nick is zircon has nothing to do with this progam.
+You can sometimes find me in the #zircon channel.
+
+Mail
+----
+	zircon-request@newcastle.ac.uk
+
+to be added to the Zircon users mailing list. Messages to the mailing
+list should be sent to
+
+	zircon@newcastle.ac.uk
+
+but please send bug reports and questions directly to me rather than the
+list. 
+
+Enjoy!
+
+Lindsay
diff --git a/irc/zircon/pkg-plist b/irc/zircon/pkg-plist
index 05a114594663..88e7a8cb721b 100644
--- a/irc/zircon/pkg-plist
+++ b/irc/zircon/pkg-plist
@@ -1,11 +1,27 @@
 bin/zircon
-lib/zircon/sounds
-lib/zircon/dccget
-lib/zircon/zping
-lib/zircon/crypt
-lib/zircon/dccsend
-lib/zircon/rc
-lib/zircon/zircon.ad
+lib/zircon/lang/deutsch.tcl
+lib/zircon/lang/norsk.tcl
+lib/zircon/lang/francais.tcl
+lib/zircon/lang/english.tcl
+lib/zircon/lang/esperanto.tcl
+lib/zircon/lang/nihongo.tcl
+lib/zircon/lang/magyar.tcl
+lib/zircon/gifs/mode3.gif
+lib/zircon/gifs/clear.gif
+lib/zircon/gifs/leave.gif
+lib/zircon/gifs/action.gif
+lib/zircon/gifs/mode.gif
+lib/zircon/gifs/retin.gif
+lib/zircon/gifs/mode2.gif
+lib/zircon/gifs/leave2.gif
+lib/zircon/gifs/action2.gif
+lib/zircon/gifs/clear2.gif
+lib/zircon/gifs/leave3.gif
+lib/zircon/gifs/channel2.gif
+lib/zircon/gifs/names.gif
+lib/zircon/gifs/names2.gif
+lib/zircon/gifs/channel.gif
+lib/zircon/gifs/zircon.gif
 lib/zircon/bitmaps/oval.xbm
 lib/zircon/bitmaps/arc.xbm
 lib/zircon/bitmaps/rectangle.xbm
@@ -13,7 +29,20 @@ lib/zircon/bitmaps/line.xbm
 lib/zircon/bitmaps/polygon.xbm
 lib/zircon/bitmaps/text.xbm
 lib/zircon/bitmaps/none.xbm
-lib/zircon/lib/tclIndex
+lib/zircon/look/standard.tcl
+lib/zircon/help/Zircon/Windows/Info
+lib/zircon/help/Zircon/Windows/Control
+lib/zircon/help/Zircon/Windows/Channel
+lib/zircon/help/Zircon/Windows/Message
+lib/zircon/help/Zircon/Ons
+lib/zircon/help/Zircon/CommandLine
+lib/zircon/help/Zircon/Environment
+lib/zircon/help/Zircon/Bindings
+lib/zircon/lib/interp/irc.tcl
+lib/zircon/lib/interp/tcldp.tcl
+lib/zircon/lib/interp/tclx.tcl
+lib/zircon/lib/interp/tcl7.5.tcl
+lib/zircon/lib/Channel.tcl
 lib/zircon/lib/Chat.tcl
 lib/zircon/lib/Control.tcl
 lib/zircon/lib/Entry.tcl
@@ -31,7 +60,6 @@ lib/zircon/lib/Service.tcl
 lib/zircon/lib/Sound.tcl
 lib/zircon/lib/Topic.tcl
 lib/zircon/lib/User.tcl
-lib/zircon/lib/UserProcs.tcl
 lib/zircon/lib/Utilities.tcl
 lib/zircon/lib/Window.tcl
 lib/zircon/lib/bindings.tcl
@@ -52,4 +80,15 @@ lib/zircon/lib/upgrade.tcl
 lib/zircon/lib/userCmds.tcl
 lib/zircon/lib/zdraw.tcl
 lib/zircon/lib/frivolity.tcl
-lib/zircon/lib/Channel.tcl
+lib/zircon/lib/debug.tcl
+lib/zircon/lib/Help.tcl
+lib/zircon/lib/Button.tcl
+lib/zircon/lib/Object.tcl
+lib/zircon/lib/initial.tcl
+lib/zircon/lib/tclIndex
+lib/zircon/zping
+lib/zircon/crypt
+lib/zircon/dccsend
+lib/zircon/dccget
+lib/zircon/rc
+lib/zircon/zircon.ad