6 files changed, 58 insertions, 34 deletions

diff --git a/irc/epic4/Makefile b/irc/epic4/Makefile
index ad158cc5a87a..6614aa49db36 100644
--- a/irc/epic4/Makefile
+++ b/irc/epic4/Makefile
@@ -6,28 +6,38 @@
 #
 
 PORTNAME=	epic4
-PORTVERSION=	0.9.9
-CATEGORIES=	irc
-MASTER_SITES=	ftp://ftp.epicsol.org/pub/epic/EPIC4-BETA/ \
-		ftp://ftp.sanyusan.se/pub/epic/EPIC4-BETA/ \
-		ftp://totem.fix.no/pub/mirrors/epic/EPIC4-BETA/
-DISTFILES=	epic4-0.9.9.tar.gz epic4pre2-help.tar.gz
+PORTVERSION=	0.9.13
+# Make CATEGORIES overridable for slave ports
+CATEGORIES?=	irc
+MASTER_SITES=	ftp://ftp.magenet.com/pub/epic/%SUBDIR%/ \
+		ftp://ftp.icm.edu.pl/vol/rzm0/irc/EPIC/%SUBDIR%/ \
+		ftp://ftp.archive.de.uu.net/pub/unix/irc/epic/%SUBDIR%/ \
+		ftp://ftp.nl.uu.net/pub/unix/irc/epic/%SUBDIR%/ \
+		${MASTER_SITE_LOCAL:S,%SUBDIR%,knu,}
+#		ftp://ftp.epicsol.org/pub/epic/%SUBDIR%/ \
+#		ftp://ftp.neato.org/pub/epic/%SUBDIR%/ \
+#		ftp://ftp.sanyusan.se/pub/epic/%SUBDIR%/ \
+#		ftp://totem.fix.no/pub/mirrors/epic/%SUBDIR%/ \
+#		ftp://broken.com/pub/ircii/%SUBDIR%/
+MASTER_SITE_SUBDIR=	EPIC4-BETA
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTFILE_HELP}
+DIST_SUBDIR=	epic4
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	anders@codefactory.se
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	${DISTNAME}-patch1
+PATCH_DIST_STRIP=	-d ${WRKSRC}/source
 
-DIST_SUBDIR=	epic4
+MAINTAINER=	anders@codefactory.se
 
-EXTRACT_ONLY=	epic4-0.9.9.tar.gz
-WRKSRC=         ${WRKDIR}/epic4-0.9.9
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 
-MAN1=		epic.1
+DISTFILE_HELP=	${PORTNAME}pre2-help.tar.gz
 
-do-install:
-	cd ${WRKSRC} && make INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-	INSTALL_DATA="${INSTALL_DATA}" install
+MAN1=		epic.1
 
 post-install:
-	cd ${PREFIX}/share/epic && tar zxf ${DISTDIR}/${DIST_SUBDIR}/epic4pre2-help.tar.gz
+	cd ${PREFIX}/share/epic && ${TAR} zxf ${_DISTDIR}/${DISTFILE_HELP}
 
 .include <bsd.port.mk>
diff --git a/irc/epic4/distinfo b/irc/epic4/distinfo
index 28fd1f5f78ab..08622e5be1f0 100644
--- a/irc/epic4/distinfo
+++ b/irc/epic4/distinfo
@@ -1,2 +1,3 @@
-MD5 (epic4/epic4-0.9.9.tar.gz) = 68cdbb25a98c2f8b84a14ee20e083284
+MD5 (epic4/epic4-0.9.13.tar.bz2) = 228bd5f730a01cc7172330e96110330c
 MD5 (epic4/epic4pre2-help.tar.gz) = 176f77c1e372fc3ca184eca951cb86f5
+MD5 (epic4/epic4-0.9.13-patch1) = f72e7b651808a84abc1f0e7756e32f85
diff --git a/irc/epic4/pkg-plist b/irc/epic4/pkg-plist
index c981b4a1e2e0..ef722b14f2dd 100644
--- a/irc/epic4/pkg-plist
+++ b/irc/epic4/pkg-plist
@@ -1,5 +1,5 @@
 bin/epic
-bin/epic-EPIC4-0.9.9
+bin/epic-EPIC4-0.9.13
 libexec/wserv
 share/epic/help/1_General/away
 share/epic/help/1_General/describe
@@ -878,6 +878,7 @@ share/epic/script/global
 share/epic/script/guh
 share/epic/script/hybrid6
 share/epic/script/imap
+share/epic/script/ip-to-int
 share/epic/script/ircprimer
 share/epic/script/keybinds
 share/epic/script/killpath
diff --git a/irc/epic5/Makefile b/irc/epic5/Makefile
index ad158cc5a87a..6614aa49db36 100644
--- a/irc/epic5/Makefile
+++ b/irc/epic5/Makefile
@@ -6,28 +6,38 @@
 #
 
 PORTNAME=	epic4
-PORTVERSION=	0.9.9
-CATEGORIES=	irc
-MASTER_SITES=	ftp://ftp.epicsol.org/pub/epic/EPIC4-BETA/ \
-		ftp://ftp.sanyusan.se/pub/epic/EPIC4-BETA/ \
-		ftp://totem.fix.no/pub/mirrors/epic/EPIC4-BETA/
-DISTFILES=	epic4-0.9.9.tar.gz epic4pre2-help.tar.gz
+PORTVERSION=	0.9.13
+# Make CATEGORIES overridable for slave ports
+CATEGORIES?=	irc
+MASTER_SITES=	ftp://ftp.magenet.com/pub/epic/%SUBDIR%/ \
+		ftp://ftp.icm.edu.pl/vol/rzm0/irc/EPIC/%SUBDIR%/ \
+		ftp://ftp.archive.de.uu.net/pub/unix/irc/epic/%SUBDIR%/ \
+		ftp://ftp.nl.uu.net/pub/unix/irc/epic/%SUBDIR%/ \
+		${MASTER_SITE_LOCAL:S,%SUBDIR%,knu,}
+#		ftp://ftp.epicsol.org/pub/epic/%SUBDIR%/ \
+#		ftp://ftp.neato.org/pub/epic/%SUBDIR%/ \
+#		ftp://ftp.sanyusan.se/pub/epic/%SUBDIR%/ \
+#		ftp://totem.fix.no/pub/mirrors/epic/%SUBDIR%/ \
+#		ftp://broken.com/pub/ircii/%SUBDIR%/
+MASTER_SITE_SUBDIR=	EPIC4-BETA
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTFILE_HELP}
+DIST_SUBDIR=	epic4
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	anders@codefactory.se
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	${DISTNAME}-patch1
+PATCH_DIST_STRIP=	-d ${WRKSRC}/source
 
-DIST_SUBDIR=	epic4
+MAINTAINER=	anders@codefactory.se
 
-EXTRACT_ONLY=	epic4-0.9.9.tar.gz
-WRKSRC=         ${WRKDIR}/epic4-0.9.9
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 
-MAN1=		epic.1
+DISTFILE_HELP=	${PORTNAME}pre2-help.tar.gz
 
-do-install:
-	cd ${WRKSRC} && make INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-	INSTALL_DATA="${INSTALL_DATA}" install
+MAN1=		epic.1
 
 post-install:
-	cd ${PREFIX}/share/epic && tar zxf ${DISTDIR}/${DIST_SUBDIR}/epic4pre2-help.tar.gz
+	cd ${PREFIX}/share/epic && ${TAR} zxf ${_DISTDIR}/${DISTFILE_HELP}
 
 .include <bsd.port.mk>
diff --git a/irc/epic5/distinfo b/irc/epic5/distinfo
index 28fd1f5f78ab..08622e5be1f0 100644
--- a/irc/epic5/distinfo
+++ b/irc/epic5/distinfo
@@ -1,2 +1,3 @@
-MD5 (epic4/epic4-0.9.9.tar.gz) = 68cdbb25a98c2f8b84a14ee20e083284
+MD5 (epic4/epic4-0.9.13.tar.bz2) = 228bd5f730a01cc7172330e96110330c
 MD5 (epic4/epic4pre2-help.tar.gz) = 176f77c1e372fc3ca184eca951cb86f5
+MD5 (epic4/epic4-0.9.13-patch1) = f72e7b651808a84abc1f0e7756e32f85
diff --git a/irc/epic5/pkg-plist b/irc/epic5/pkg-plist
index c981b4a1e2e0..ef722b14f2dd 100644
--- a/irc/epic5/pkg-plist
+++ b/irc/epic5/pkg-plist
@@ -1,5 +1,5 @@
 bin/epic
-bin/epic-EPIC4-0.9.9
+bin/epic-EPIC4-0.9.13
 libexec/wserv
 share/epic/help/1_General/away
 share/epic/help/1_General/describe
@@ -878,6 +878,7 @@ share/epic/script/global
 share/epic/script/guh
 share/epic/script/hybrid6
 share/epic/script/imap
+share/epic/script/ip-to-int
 share/epic/script/ircprimer
 share/epic/script/keybinds
 share/epic/script/killpath