- Update to 1.6.21

- Note: The ssl patch has been removed and no longer supported upstream.
  The new eggdrop-devel is experimental, but has ssl support.

PR:		ports/169054
Submitted by:	James Wade <james.wade@phurix.co.uk>

4 files changed, 6 insertions, 60 deletions

diff --git a/irc/eggdrop/Makefile b/irc/eggdrop/Makefile
index 7607bb011564..6fb850e4507b 100644
--- a/irc/eggdrop/Makefile
+++ b/irc/eggdrop/Makefile
@@ -1,22 +1,16 @@
 # New ports collection makefile for:	eggdrop
 # Date created:				18.01.2003
-# Whom:					Ulrich Spoerlein <q@uni.de>
-#
-# Last updated by:      Kristian Krĉmmer Nielsen <freebsd.ports@com.jkkn.dk>
-# Date: January 7th, 2011
+# Whom:						Ulrich Spoerlein <q@uni.de>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	eggdrop
-PORTVERSION=	1.6.20
-PORTREVISION=	1
+PORTVERSION=	1.6.21
 CATEGORIES=	irc
-MASTER_SITES=	ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/ \
-	http://www.egghelp.org/files/patches/:ssl
+MASTER_SITES=	ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/
 DISTNAME=	${PORTNAME}${PORTVERSION}
-DISTFILES=	${PORTNAME}${PORTVERSION}.tar.bz2 \
-	${PORTNAME}-${PORTVERSION}-ssl.zip:ssl
+DISTFILES=	${PORTNAME}${PORTVERSION}.tar.bz2
 
 MAINTAINER=	beech@FreeBSD.org
 COMMENT=	The most popular open source Internet Relay Chat bot
@@ -25,28 +19,14 @@ LICENSE=        GPLv2
 
 USE_TCL=	85+
 GNU_CONFIGURE=	yes
-#CONFIGURE_ARGS=	--with-tcllib=${LOCALBASE}/lib/libtcl${TCL_VER:S/.//}.so \
-#		--with-tclinc=${TCL_INCLUDEDIR}/tcl.h
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS=	SSL "Use SSL" on
-
 MAN1=		eggdrop.1
 
 SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_SSL)
-. if ${ARCH} == "amd64"
-BROKEN=		ssl support is broken on amd64
-. endif
-EXTRA_PATCHES=	${WRKDIR}/eggdrop-1.6.20-ssl.patch
-
-CFLAGS+=	-DHAVE_OPENSSL
-#CONFIGURE_ARGS+=	--with-ssl
-.endif
-
 post-patch:
 	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKSRC}/eggdrop.conf \
 		> ${WRKSRC}/eggdrop.conf.sample
diff --git a/irc/eggdrop/distinfo b/irc/eggdrop/distinfo
index e69a1d58fd76..a780638a3803 100644
--- a/irc/eggdrop/distinfo
+++ b/irc/eggdrop/distinfo
@@ -1,4 +1,2 @@
-SHA256 (eggdrop1.6.20.tar.bz2) = 5d3b3f3c8988d054d6ba97b84b43e9620c062d57d2606eaa9f652c598aa44c6f
-SIZE (eggdrop1.6.20.tar.bz2) = 993262
-SHA256 (eggdrop-1.6.20-ssl.zip) = 2fab9c498e5e1f0cb3b3d07e74ae146e38de2bcd6b851c228a0a2e4ff84b4805
-SIZE (eggdrop-1.6.20-ssl.zip) = 9186
+SHA256 (eggdrop1.6.21.tar.bz2) = 75bd5573a609eac3940c0b6ca8251c3f38ea5d54b520e1cad93c650b4bc21754
+SIZE (eggdrop1.6.21.tar.bz2) = 999211
diff --git a/irc/eggdrop/files/patch-src__mod__Makefile.in b/irc/eggdrop/files/patch-src__mod__Makefile.in
deleted file mode 100644
index daa14cf0703e..000000000000
--- a/irc/eggdrop/files/patch-src__mod__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mod/Makefile.in.orig	Mon Jun  2 11:36:50 2003
-+++ src/mod/Makefile.in	Mon Jun  2 11:39:02 2003
-@@ -86,7 +86,7 @@
- 			echo ""; \
- 			echo "Configuring module '$${modname}'."; \
- 			if test ! -d $$i; then mkdir $$i; fi; \
--			(cd $$i && $(MOD_UPDIR)$(srcdir)/$$i/configure $(egg_ac_parameters) --cache-file=../../../config.cache --srcdir=$(MOD_UPDIR)$(top_srcdir)/src/mod/$$i); \
-+			(cd $$i && $(MOD_UPDIR)$(srcdir)/$$i/configure $(egg_ac_parameters) --cache-file=../../../config.cache --srcdir=$(MOD_UPDIR)$(top_srcdir)/src/mod/$$i); \
- 		fi; \
- 	done; \
- 	echo ""
diff --git a/irc/eggdrop/files/patch-src_tclhash.c b/irc/eggdrop/files/patch-src_tclhash.c
deleted file mode 100644
index 7ed875ed59de..000000000000
--- a/irc/eggdrop/files/patch-src_tclhash.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/tclhash.c.orig  2011-10-06 09:19:05.000000000 -0800
-+++ src/tclhash.c       2011-10-06 09:25:14.000000000 -0800
-@@ -1264,7 +1264,7 @@
-   for (i = 0; cc[i].name; i++) {
-     egg_snprintf(p, sizeof p, "*%s:%s", tl->name,
-                  cc[i].funcname ? cc[i].funcname : cc[i].name);
--    l = nmalloc(Tcl_ScanElement(p, &k));
-+    l = nmalloc(Tcl_ScanElement(p, &k) + 1);
-     Tcl_ConvertElement(p, l, k | TCL_DONT_USE_BRACES);
-     table[0].cdata = (void *) cc[i].func;
-     add_cd_tcl_cmds(table);
-@@ -1282,7 +1282,7 @@
-   for (i = 0; cc[i].name; i++) {
-     egg_snprintf(p, sizeof p, "*%s:%s", table->name,
-                  cc[i].funcname ? cc[i].funcname : cc[i].name);
--    l = nmalloc(Tcl_ScanElement(p, &k));
-+    l = nmalloc(Tcl_ScanElement(p, &k) + 1);
-     Tcl_ConvertElement(p, l, k | TCL_DONT_USE_BRACES);
-     Tcl_DeleteCommand(interp, p);
-     unbind_bind_entry(table, cc[i].flags, cc[i].name, l);
-