- Update to version 2.0

PR:		ports/64034
Submitted by:	Jeremy Chadwick <freebsd@jdc.parodius.com>
Approved by:	maintainer timeout

8 files changed, 64 insertions, 34 deletions

diff --git a/irc/epic4/Makefile b/irc/epic4/Makefile
index 2bfb396f916a..5b392a7cfd53 100644
--- a/irc/epic4/Makefile
+++ b/irc/epic4/Makefile
@@ -6,32 +6,38 @@
 #
 
 PORTNAME=	epic4
-PORTVERSION=	1.1.16
-PORTREVISION=	1
+PORTVERSION=	2.0
 CATEGORIES=	irc ipv6
-MASTER_SITES=	ftp://ftp.epicsol.org/pub/epic/EPIC4-ALPHA/ \
-		ftp://ftp.archive.de.uu.net/pub/unix/irc/epic/EPIC4-ALPHA/
+MASTER_SITES=	ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/ \
+		ftp://ftp.irc.org/irc/clients/unix/epic/ \
+		ftp://ftp.parodius.com/pub/epic/EPIC4-PRODUCTION/ \
+		ftp://planetmirror.com/pub/irc/epic/ \
+		ftp://ftp.eu.uu.net/pub/unix/irc/epic/ \
+		ftp://totem.fix.no/pub/mirrors/epic/ \
+		ftp://ftp.freenet.de/pub/ftp.prbh.org/pub/epic/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTFILE_HELP}
 
 MAINTAINER=	anders@andersa.net
 COMMENT=	The (E)nhanced (P)rogrammable (I)RC-II (C)lient
 
-LIB_DEPENDS=	tcl84.1:${PORTSDIR}/lang/tcl84
-
-USE_REINPLACE=	yes
-USE_PERL5=	yes
 USE_OPENSSL=	yes
+USE_PERL5=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--without-tcl
+
+.if defined(WITH_TCL)
+LIB_DEPENDS=		tcl84:${PORTSDIR}/lang/tcl84
+CONFIGURE_ARGS+=	--with-tcl
+.endif
 
 MAN1=		epic.1
-DISTFILE_HELP=	${PORTNAME}-help-20031106.tar.gz
+DISTFILE_HELP=	${PORTNAME}-help-20040308.tar.gz
 
 post-extract:
-	@${FIND} ${WRKSRC} -type d -name CVS | ${XARGS} ${RM} -rf
+	@${FIND} ${WRKDIR} -type d -name CVS | ${XARGS} ${RM} -rf
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|8.3|8.4|g' ${WRKSRC}/configure
 	@${RM} ${WRKDIR}/help/Makefile
 
 post-install:
diff --git a/irc/epic4/distinfo b/irc/epic4/distinfo
index cba5491905ef..7fd27578fd14 100644
--- a/irc/epic4/distinfo
+++ b/irc/epic4/distinfo
@@ -1,4 +1,4 @@
-MD5 (epic4-1.1.16.tar.gz) = 15bf478f826505a72a8e3b88e079c842
-SIZE (epic4-1.1.16.tar.gz) = 754314
-MD5 (epic4-help-20031106.tar.gz) = 246a2185ef88bbb0fe0da365be70706b
-SIZE (epic4-help-20031106.tar.gz) = 298990
+MD5 (epic4-2.0.tar.gz) = 94ee2f69335a0306bbcfcf3ec9d863e7
+SIZE (epic4-2.0.tar.gz) = 773957
+MD5 (epic4-help-20040308.tar.gz) = 5492fba9d0794f8ceb2fa0837ad847fa
+SIZE (epic4-help-20040308.tar.gz) = 300509
diff --git a/irc/epic4/pkg-descr b/irc/epic4/pkg-descr
index bb7295632170..47176316a88a 100644
--- a/irc/epic4/pkg-descr
+++ b/irc/epic4/pkg-descr
@@ -7,4 +7,4 @@ make EPIC the best ircII client available.
 EPIC no longer shares any file names with ircII, so they should happily
 co-exist.
 
-WWW: http://www.epicsol.org/
+WWW: http://prbh.org/
diff --git a/irc/epic4/pkg-plist b/irc/epic4/pkg-plist
index 2a14b43ddd9d..059eafc00454 100644
--- a/irc/epic4/pkg-plist
+++ b/irc/epic4/pkg-plist
@@ -1,5 +1,5 @@
 bin/epic
-bin/epic-EPIC4-1.1.16
+bin/epic-EPIC4-2.0
 libexec/wserv4
 share/epic/help/1_General/1_General
 share/epic/help/1_General/away
@@ -509,6 +509,7 @@ share/epic/help/5_Programming/wait
 share/epic/help/5_Programming/while
 share/epic/help/5_Programming/xecho
 share/epic/help/5_Programming/xeval
+share/epic/help/5_Programming/xquote
 share/epic/help/5_Programming/xtype
 share/epic/help/6_Functions/6_Functions
 share/epic/help/6_Functions/abs
@@ -653,6 +654,7 @@ share/epic/help/6_Functions/notifywindows
 share/epic/help/6_Functions/notw
 share/epic/help/6_Functions/numarrays
 share/epic/help/6_Functions/numitems
+share/epic/help/6_Functions/numlines
 share/epic/help/6_Functions/numonchannel
 share/epic/help/6_Functions/numsort
 share/epic/help/6_Functions/numwords
@@ -844,6 +846,7 @@ share/epic/help/8_Scripts/netsplit.env
 share/epic/help/8_Scripts/newaway
 share/epic/help/8_Scripts/newformat
 share/epic/help/8_Scripts/nicks
+share/epic/help/8_Scripts/notify
 share/epic/help/8_Scripts/old-dcc
 share/epic/help/8_Scripts/pipe
 share/epic/help/8_Scripts/prefix
@@ -864,6 +867,7 @@ share/epic/help/README_FIRST
 share/epic/script/2.8script
 share/epic/script/alias
 share/epic/script/altchan
+share/epic/script/altchan.bj
 share/epic/script/autoget
 share/epic/script/autokick
 share/epic/script/autoop
@@ -897,6 +901,7 @@ share/epic/script/genalias
 share/epic/script/global
 share/epic/script/grep
 share/epic/script/guh
+share/epic/script/help
 share/epic/script/hold_mode
 share/epic/script/hybrid6
 share/epic/script/imap
@@ -915,6 +920,7 @@ share/epic/script/mail
 share/epic/script/man
 share/epic/script/map
 share/epic/script/meta
+share/epic/script/meta-compat
 share/epic/script/mkpdir
 share/epic/script/more
 share/epic/script/motd
@@ -925,6 +931,7 @@ share/epic/script/newaway
 share/epic/script/newformat
 share/epic/script/nicks
 share/epic/script/nopaste
+share/epic/script/notify
 share/epic/script/old-dcc
 share/epic/script/paste
 share/epic/script/pipe
@@ -939,6 +946,7 @@ share/epic/script/sdiff
 share/epic/script/setmail
 share/epic/script/silent
 share/epic/script/sound
+share/epic/script/sping
 share/epic/script/starutils
 share/epic/script/stat
 share/epic/script/status_lag
@@ -950,6 +958,7 @@ share/epic/script/tabkey.th
 share/epic/script/tc
 share/epic/script/time
 share/epic/script/tls
+share/epic/script/urlgrab
 share/epic/script/utime
 share/epic/script/vi-binds
 share/epic/script/webster
diff --git a/irc/epic5/Makefile b/irc/epic5/Makefile
index 2bfb396f916a..5b392a7cfd53 100644
--- a/irc/epic5/Makefile
+++ b/irc/epic5/Makefile
@@ -6,32 +6,38 @@
 #
 
 PORTNAME=	epic4
-PORTVERSION=	1.1.16
-PORTREVISION=	1
+PORTVERSION=	2.0
 CATEGORIES=	irc ipv6
-MASTER_SITES=	ftp://ftp.epicsol.org/pub/epic/EPIC4-ALPHA/ \
-		ftp://ftp.archive.de.uu.net/pub/unix/irc/epic/EPIC4-ALPHA/
+MASTER_SITES=	ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/ \
+		ftp://ftp.irc.org/irc/clients/unix/epic/ \
+		ftp://ftp.parodius.com/pub/epic/EPIC4-PRODUCTION/ \
+		ftp://planetmirror.com/pub/irc/epic/ \
+		ftp://ftp.eu.uu.net/pub/unix/irc/epic/ \
+		ftp://totem.fix.no/pub/mirrors/epic/ \
+		ftp://ftp.freenet.de/pub/ftp.prbh.org/pub/epic/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTFILE_HELP}
 
 MAINTAINER=	anders@andersa.net
 COMMENT=	The (E)nhanced (P)rogrammable (I)RC-II (C)lient
 
-LIB_DEPENDS=	tcl84.1:${PORTSDIR}/lang/tcl84
-
-USE_REINPLACE=	yes
-USE_PERL5=	yes
 USE_OPENSSL=	yes
+USE_PERL5=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--without-tcl
+
+.if defined(WITH_TCL)
+LIB_DEPENDS=		tcl84:${PORTSDIR}/lang/tcl84
+CONFIGURE_ARGS+=	--with-tcl
+.endif
 
 MAN1=		epic.1
-DISTFILE_HELP=	${PORTNAME}-help-20031106.tar.gz
+DISTFILE_HELP=	${PORTNAME}-help-20040308.tar.gz
 
 post-extract:
-	@${FIND} ${WRKSRC} -type d -name CVS | ${XARGS} ${RM} -rf
+	@${FIND} ${WRKDIR} -type d -name CVS | ${XARGS} ${RM} -rf
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|8.3|8.4|g' ${WRKSRC}/configure
 	@${RM} ${WRKDIR}/help/Makefile
 
 post-install:
diff --git a/irc/epic5/distinfo b/irc/epic5/distinfo
index cba5491905ef..7fd27578fd14 100644
--- a/irc/epic5/distinfo
+++ b/irc/epic5/distinfo
@@ -1,4 +1,4 @@
-MD5 (epic4-1.1.16.tar.gz) = 15bf478f826505a72a8e3b88e079c842
-SIZE (epic4-1.1.16.tar.gz) = 754314
-MD5 (epic4-help-20031106.tar.gz) = 246a2185ef88bbb0fe0da365be70706b
-SIZE (epic4-help-20031106.tar.gz) = 298990
+MD5 (epic4-2.0.tar.gz) = 94ee2f69335a0306bbcfcf3ec9d863e7
+SIZE (epic4-2.0.tar.gz) = 773957
+MD5 (epic4-help-20040308.tar.gz) = 5492fba9d0794f8ceb2fa0837ad847fa
+SIZE (epic4-help-20040308.tar.gz) = 300509
diff --git a/irc/epic5/pkg-descr b/irc/epic5/pkg-descr
index bb7295632170..47176316a88a 100644
--- a/irc/epic5/pkg-descr
+++ b/irc/epic5/pkg-descr
@@ -7,4 +7,4 @@ make EPIC the best ircII client available.
 EPIC no longer shares any file names with ircII, so they should happily
 co-exist.
 
-WWW: http://www.epicsol.org/
+WWW: http://prbh.org/
diff --git a/irc/epic5/pkg-plist b/irc/epic5/pkg-plist
index 2a14b43ddd9d..059eafc00454 100644
--- a/irc/epic5/pkg-plist
+++ b/irc/epic5/pkg-plist
@@ -1,5 +1,5 @@
 bin/epic
-bin/epic-EPIC4-1.1.16
+bin/epic-EPIC4-2.0
 libexec/wserv4
 share/epic/help/1_General/1_General
 share/epic/help/1_General/away
@@ -509,6 +509,7 @@ share/epic/help/5_Programming/wait
 share/epic/help/5_Programming/while
 share/epic/help/5_Programming/xecho
 share/epic/help/5_Programming/xeval
+share/epic/help/5_Programming/xquote
 share/epic/help/5_Programming/xtype
 share/epic/help/6_Functions/6_Functions
 share/epic/help/6_Functions/abs
@@ -653,6 +654,7 @@ share/epic/help/6_Functions/notifywindows
 share/epic/help/6_Functions/notw
 share/epic/help/6_Functions/numarrays
 share/epic/help/6_Functions/numitems
+share/epic/help/6_Functions/numlines
 share/epic/help/6_Functions/numonchannel
 share/epic/help/6_Functions/numsort
 share/epic/help/6_Functions/numwords
@@ -844,6 +846,7 @@ share/epic/help/8_Scripts/netsplit.env
 share/epic/help/8_Scripts/newaway
 share/epic/help/8_Scripts/newformat
 share/epic/help/8_Scripts/nicks
+share/epic/help/8_Scripts/notify
 share/epic/help/8_Scripts/old-dcc
 share/epic/help/8_Scripts/pipe
 share/epic/help/8_Scripts/prefix
@@ -864,6 +867,7 @@ share/epic/help/README_FIRST
 share/epic/script/2.8script
 share/epic/script/alias
 share/epic/script/altchan
+share/epic/script/altchan.bj
 share/epic/script/autoget
 share/epic/script/autokick
 share/epic/script/autoop
@@ -897,6 +901,7 @@ share/epic/script/genalias
 share/epic/script/global
 share/epic/script/grep
 share/epic/script/guh
+share/epic/script/help
 share/epic/script/hold_mode
 share/epic/script/hybrid6
 share/epic/script/imap
@@ -915,6 +920,7 @@ share/epic/script/mail
 share/epic/script/man
 share/epic/script/map
 share/epic/script/meta
+share/epic/script/meta-compat
 share/epic/script/mkpdir
 share/epic/script/more
 share/epic/script/motd
@@ -925,6 +931,7 @@ share/epic/script/newaway
 share/epic/script/newformat
 share/epic/script/nicks
 share/epic/script/nopaste
+share/epic/script/notify
 share/epic/script/old-dcc
 share/epic/script/paste
 share/epic/script/pipe
@@ -939,6 +946,7 @@ share/epic/script/sdiff
 share/epic/script/setmail
 share/epic/script/silent
 share/epic/script/sound
+share/epic/script/sping
 share/epic/script/starutils
 share/epic/script/stat
 share/epic/script/status_lag
@@ -950,6 +958,7 @@ share/epic/script/tabkey.th
 share/epic/script/tc
 share/epic/script/time
 share/epic/script/tls
+share/epic/script/urlgrab
 share/epic/script/utime
 share/epic/script/vi-binds
 share/epic/script/webster