3 files changed, 39 insertions, 40 deletions

diff --git a/irc/zircon/Makefile b/irc/zircon/Makefile
index 2affee6a8b7d..e4bce4f008e3 100644
--- a/irc/zircon/Makefile
+++ b/irc/zircon/Makefile
@@ -1,14 +1,16 @@
 # New ports collection makefile for:	zircon
-# Version required:	1.17p3
+# Version required:	1.18.31
 # Date created:		19 Aug 1995
 # Whom:			jkh / pst
 #
-# $Id: Makefile,v 1.12 1996/12/03 10:42:26 obrien Exp $
+# $Id: Makefile,v 1.13 1997/04/20 13:19:39 wosch Exp $
 #
 
-DISTNAME=	zircon-1.18b8
+DISTNAME=	zircon-1.18.31
 CATEGORIES=	net tk41
 MASTER_SITES=	ftp://catless.ncl.ac.uk/pub/
+IS_INTERACTIVE=	yes
+NO_BUILD=	yes
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -19,24 +21,12 @@ MAINTAINER=	ports@FreeBSD.org
 .if defined(USE_DPWISH) && ${USE_DPWISH} == YES
 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
 
-# In case the port is built not on FreeBSD-2.2+ (which has tcl standard)
-.if exists(/usr/bin/tclsh)
-MAKE_ENV+=	TCLSH=tclsh
-.else
-BUILD_DEPENDS+=	tclsh7.5:${PORTSDIR}/lang/tcl75
-MAKE_ENV+=	TCLSH=tclsh7.5
-.endif
-
-MAKEFILE=	Makefile.FreeBSD
-
-pre-patch:
-	${CP} ${WRKSRC}/Makefile.Linux ${WRKSRC}/Makefile.FreeBSD
+install:
+	(cd ${WRKSRC} && ./installZircon)
 
 .include <bsd.port.mk>
diff --git a/irc/zircon/distinfo b/irc/zircon/distinfo
index 0599b2cfd0af..a0ac2e43331d 100644
--- a/irc/zircon/distinfo
+++ b/irc/zircon/distinfo
@@ -1 +1 @@
-MD5 (zircon-1.18b8.tar.gz) = 34066481183d6f6e3ccaa7d90303125b
+MD5 (zircon-1.18.31.tar.gz) = eac6b8e03085b197775b0ba507ffd82c
diff --git a/irc/zircon/pkg-plist b/irc/zircon/pkg-plist
index e2a9718bf86c..317476c2952b 100644
--- a/irc/zircon/pkg-plist
+++ b/irc/zircon/pkg-plist
@@ -1,12 +1,10 @@
 bin/zircon
-lib/zircon/crypt
-lib/zircon/dccget
-lib/zircon/dccsend
 lib/zircon/gifs/arc.gif
 lib/zircon/gifs/button.gif
 lib/zircon/gifs/key.gif
 lib/zircon/gifs/line.gif
 lib/zircon/gifs/none.gif
+lib/zircon/gifs/nospeak.gif
 lib/zircon/gifs/off.gif
 lib/zircon/gifs/off1.gif
 lib/zircon/gifs/on.gif
@@ -31,81 +29,92 @@ lib/zircon/lang/english.tcl
 lib/zircon/lang/espanol.tcl
 lib/zircon/lang/esperanto.tcl
 lib/zircon/lang/francais.tcl
+lib/zircon/lang/italiano.tcl
 lib/zircon/lang/magyar.tcl
 lib/zircon/lang/nihongo.tcl
 lib/zircon/lang/norsk.tcl
+lib/zircon/lang/suomi.tcl
 lib/zircon/lib/Away.tcl
 lib/zircon/lib/Button.tcl
 lib/zircon/lib/Channel.tcl
 lib/zircon/lib/Chat.tcl
 lib/zircon/lib/Classes.tcl
 lib/zircon/lib/Control.tcl
+lib/zircon/lib/DALnet.tcl
 lib/zircon/lib/Entry.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/Log.tcl
 lib/zircon/lib/Look.tcl
+lib/zircon/lib/Mac.tcl
 lib/zircon/lib/Message.tcl
+lib/zircon/lib/Monitor.tcl
 lib/zircon/lib/Net.tcl
 lib/zircon/lib/Netspace.tcl
 lib/zircon/lib/Notice.tcl
+lib/zircon/lib/Notrace.tcl
 lib/zircon/lib/Object.tcl
 lib/zircon/lib/On.tcl
 lib/zircon/lib/Server.tcl
 lib/zircon/lib/Service.tcl
 lib/zircon/lib/Sound.tcl
 lib/zircon/lib/Topic.tcl
+lib/zircon/lib/Tracing.tcl
 lib/zircon/lib/Undernet.tcl
+lib/zircon/lib/Unix.tcl
 lib/zircon/lib/User.tcl
 lib/zircon/lib/Util.tcl
 lib/zircon/lib/Window.tcl
+lib/zircon/lib/Windows.tcl
 lib/zircon/lib/bindings.tcl
 lib/zircon/lib/confChan.tcl
 lib/zircon/lib/confInfo.tcl
 lib/zircon/lib/config.tcl
 lib/zircon/lib/ctcp.tcl
 lib/zircon/lib/dbgsrv.tcl
-lib/zircon/lib/dcc.tcl
 lib/zircon/lib/debug.tcl
-lib/zircon/lib/decrypt.tcl
 lib/zircon/lib/dialog.tcl
 lib/zircon/lib/errors.tcl
 lib/zircon/lib/frivol.tcl
 lib/zircon/lib/initial.tcl
-lib/zircon/lib/interp/tcl75.tcl
-lib/zircon/lib/interp/tcl76.tcl
 lib/zircon/lib/main.tcl
 lib/zircon/lib/misc.tcl
 lib/zircon/lib/misc2.tcl
-lib/zircon/lib/platform/Mac.tcl
-lib/zircon/lib/platform/Unix.tcl
-lib/zircon/lib/platform/Windows.tcl
+lib/zircon/lib/plugin.tcl
 lib/zircon/lib/saverc.tcl
 lib/zircon/lib/servers.tcl
-lib/zircon/lib/tclIndex
+lib/zircon/lib/tcl75.tcl
+lib/zircon/lib/tcl76.tcl
+lib/zircon/lib/tcl80.tcl
 lib/zircon/lib/upgrade.tcl
 lib/zircon/lib/userCmds.tcl
 lib/zircon/lib/zdraw.tcl
+lib/zircon/lib/zircon.tcl
+lib/zircon/lib/pkgIndex.tcl
 lib/zircon/look/standard.tcl
-@exec mkdir %D/lib/zircon/plugins
-lib/zircon/rc
+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/send.tcl
+lib/zircon/plugins/Dcc/pkgIndex.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/installed
 @exec mkdir %D/lib/zircon/scripts
 @exec mkdir %D/lib/zircon/sounds
-lib/zircon/zircon.ad
 @dirrm lib/zircon/gifs
-@dirrm lib/zircon/help/Channels
-@dirrm lib/zircon/help/Servers
-@dirrm lib/zircon/help/Services
-@dirrm lib/zircon/help/Users
-@dirrm lib/zircon/help/Zircon/Windows
-@dirrm lib/zircon/help/Zircon
 @dirrm lib/zircon/help
 @dirrm lib/zircon/lang
-@dirrm lib/zircon/lib/interp
-@dirrm lib/zircon/lib/platform
 @dirrm lib/zircon/lib
 @dirrm lib/zircon/look
 @dirrm lib/zircon/plugins