3 files changed, 53 insertions, 23 deletions

diff --git a/irc/epic4/Makefile b/irc/epic4/Makefile
index e8339ab874c5..1488c8f59eb2 100644
--- a/irc/epic4/Makefile
+++ b/irc/epic4/Makefile
@@ -6,33 +6,60 @@
 #
 
 PORTNAME=	epic4
-PORTVERSION=	2.0
+PORTVERSION=	2.2
 CATEGORIES=	irc ipv6
-MASTER_SITES=	ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/ \
-		ftp://ftp.irc.org/irc/clients/unix/epic/ \
+MASTER_SITES=	ftp://ftp.prbh.org/pub/epic/EPIC4-PRODUCTION/ \
+		ftp://ftp.irc.org/irc/clients/unix/epic/EPIC4-PRODUCTION/ \
 		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/
+		http://ftp.freenet.de/pub/ftp.prbh.org/pub/epic/EPIC4-PRODUCTION/ \
+		ftp://ftp.eu.uu.net/pub/unix/irc/epic/EPIC4-PRODUCTION/ \
+		ftp://totem.fix.no/pub/mirrors/epic/EPIC4-PRODUCTION/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${DISTFILE_HELP}
+		${PORTNAME}-help-20040801.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The (E)nhanced (P)rogrammable (I)RC-II (C)lient
 
-USE_OPENSSL=	yes
-USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--without-tcl
+MAN1=		epic.1
+USE_OPENSSL=	yes
+
+.include <bsd.port.pre.mk>
 
+##  WITHOUT_IPV6:   disable IPv6 support
+#
+.if defined(WITHOUT_IPV6)
+CONFIGURE_ARGS+=	--without-ipv6
+.endif
+
+##  WITH_TCL:       enable Tcl support
+#
 .if defined(WITH_TCL)
-LIB_DEPENDS=		tcl84:${PORTSDIR}/lang/tcl84
+LIB_DEPENDS+=		tcl84:${PORTSDIR}/lang/tcl84
 CONFIGURE_ARGS+=	--with-tcl
 .endif
 
-MAN1=		epic.1
-DISTFILE_HELP=	${PORTNAME}-help-20040308.tar.gz
+##  WITH_SOCKS5:    enable SOCKS5 support
+#
+.if defined(WITH_SOCKS5)
+LIB_DEPENDS+=		socks5:${PORTSDIR}/net/socks5
+CONFIGURE_ARGS+=	--with-socks5
+.endif
+
+##  WITH_PERL:      enable perl5 support (requires perl 5.6.1 or newer)
+#
+# The path provided to --with-perl is needed, since the configure script
+# looks for libperl.so in places very specific to Linux.  Possibly a
+# patch to configure would be a better idea, but we need to rely on
+# SITE_PERL and PERL_VER to create the path.
+#
+.if defined(WITH_PERL)
+.if ${PERL_LEVEL} < 500601
+IGNORE=		"Perl 5.6.1 or newer is required; we recommend perl 5.8.5"
+.endif
+USE_PERL5=	yes
+CONFIGURE_ARGS+=	--with-perl=${SITE_PERL}/../../${PERL_VER}/mach/CORE
+.endif
 
 post-extract:
 	@${FIND} ${WRKDIR} -type d -name CVS | ${XARGS} ${RM} -rf
@@ -44,9 +71,9 @@ post-install:
 	@${CP} -R ${WRKDIR}/help/* ${PREFIX}/share/epic/help
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for i in README BUG_FORM UPDATES
+.for i in BUG_FORM COPYRIGHT KNOWNBUGS README UPDATES VOTES
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/irc/epic4/distinfo b/irc/epic4/distinfo
index 7fd27578fd14..94381d5a0b28 100644
--- a/irc/epic4/distinfo
+++ b/irc/epic4/distinfo
@@ -1,4 +1,4 @@
-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
+MD5 (epic4-2.2.tar.gz) = 28aa312a6f864baa70c013e8ea10d082
+SIZE (epic4-2.2.tar.gz) = 770141
+MD5 (epic4-help-20040801.tar.gz) = c283d1c17826708bc265e3f91b860f54
+SIZE (epic4-help-20040801.tar.gz) = 302562
diff --git a/irc/epic4/pkg-plist b/irc/epic4/pkg-plist
index 059eafc00454..210d47ff76c3 100644
--- a/irc/epic4/pkg-plist
+++ b/irc/epic4/pkg-plist
@@ -1,5 +1,5 @@
 bin/epic
-bin/epic-EPIC4-2.0
+bin/epic-EPIC4-2.2
 libexec/wserv4
 share/epic/help/1_General/1_General
 share/epic/help/1_General/away
@@ -963,9 +963,12 @@ share/epic/script/utime
 share/epic/script/vi-binds
 share/epic/script/webster
 share/epic/script/window
-%%PORTDOCS%%%%DOCSDIR%%/BUG_FORM
-%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/VOTES
 %%PORTDOCS%%%%DOCSDIR%%/UPDATES
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/KNOWNBUGS
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/BUG_FORM
 @dirrm share/epic/script
 @dirrm share/epic/help/8_Scripts
 @dirrm share/epic/help/7_Docs