irc/eggdrop-devel: Update to latest commit

7 files changed, 29 insertions, 91 deletions

diff --git a/irc/eggdrop-devel/Makefile b/irc/eggdrop-devel/Makefile
index f0122ad7c00c..2159ea5204ea 100644
--- a/irc/eggdrop-devel/Makefile
+++ b/irc/eggdrop-devel/Makefile
@@ -2,34 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	eggdrop
-PORTVERSION=	1.8.0.20141008
-PORTREVISION=	2
+DISTVERSION=	1.9.0.a.20191117
 CATEGORIES=	irc
-MASTER_SITES=	GH \
-		http://mirror.shatow.net/freebsd/${PORTNAME}/
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	dbaio@FreeBSD.org
-COMMENT=	The most popular open source Internet Relay Chat bot
+COMMENT=	Eggdrop is the most popular Internet Relay Chat (IRC) bot
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		tcl ssl
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-tcllib=${LOCALBASE}/lib/libtcl${TCL_SHLIB_VER}.so \
-		--with-tclinc=${LOCALBASE}/include/tcl${TCL_VER}/tcl.h
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	eggheads
-GH_PROJECT=	${PORTNAME}-1.8
-GH_TAGNAME=	2bf3950
+GH_TAGNAME=	842ef44
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--with-tcllib=${LOCALBASE}/lib/libtcl${TCL_SHLIB_VER}.so \
+		--with-tclinc=${LOCALBASE}/include/tcl${TCL_VER}/tcl.h
 
 MAKE_JOBS_UNSAFE=	yes
 LLD_UNSAFE=	yes
 
 SUB_FILES=	pkg-message
 
-CONFLICTS=	eggdrop-[0-9]*
+CONFLICTS=	eggdrop
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/irc/eggdrop-devel/distinfo b/irc/eggdrop-devel/distinfo
index 7c814d1a6d4f..266d2b0fa471 100644
--- a/irc/eggdrop-devel/distinfo
+++ b/irc/eggdrop-devel/distinfo
@@ -1,2 +1,3 @@
-SHA256 (eggheads-eggdrop-1.8-1.8.0.20141008-2bf3950_GH0.tar.gz) = 6ebe4df85d71c44f4254e556fc84d2e4b14feabd564486c1762c864bafb0eacf
-SIZE (eggheads-eggdrop-1.8-1.8.0.20141008-2bf3950_GH0.tar.gz) = 1275796
+TIMESTAMP = 1574296173
+SHA256 (eggheads-eggdrop-1.9.0.a.20191117-842ef44_GH0.tar.gz) = fb92c20c1d7ecc4078870d109c91c00d9bc03ac4ce33784db4f4736cd2e17c41
+SIZE (eggheads-eggdrop-1.9.0.a.20191117-842ef44_GH0.tar.gz) = 2058916
diff --git a/irc/eggdrop-devel/files/patch-eggdrop.conf b/irc/eggdrop-devel/files/patch-eggdrop.conf
index 8490199bc5d0..fc797dedadeb 100644
--- a/irc/eggdrop-devel/files/patch-eggdrop.conf
+++ b/irc/eggdrop-devel/files/patch-eggdrop.conf
@@ -1,12 +1,12 @@
---- eggdrop.conf	2010-07-05 14:07:05.000000000 +0200
-+++ eggdrop.conf	2011-01-07 06:13:49.000000000 +0100
+--- eggdrop.conf.orig	2019-10-22 14:15:19 UTC
++++ eggdrop.conf
 @@ -1,4 +1,4 @@
 -#! /path/to/executable/eggdrop
 +#!%%PREFIX%%/bin/eggdrop
  # ^- This should contain a fully qualified path to your Eggdrop executable.
  #
- # $Id: eggdrop.conf,v 1.66 2010/07/05 12:07:05 pseudo Exp $
-@@ -444,7 +444,7 @@
+ # This is a sample Eggdrop configuration file which includes all possible
+@@ -658,7 +658,7 @@ die "Please make sure you edit your config file comple
  # If you run the bot from the compilation directory, you will want to set
  # this to "". If you use 'make install' (like all good kiddies do ;), this
  # is a fine default. Otherwise, use your head :)
@@ -15,15 +15,15 @@
  
  
  #### BLOWFISH MODULE ####
-@@ -842,6 +842,11 @@
-   another.example.com:7000:password
- }
- 
+@@ -1095,6 +1095,11 @@ addserver you.need.to.change.this 6667
+ addserver another.example.com 6669 password
+ addserver 2001:db8:618:5c0:263:: 6669 password
+ addserver ssl.example.net +7000
++
 +# Set this option, if you want a SSL connection to the IRC Server(s) specified
 +# above. This setting applies to all servers, so make sure they all support SSL
 +# connections. Eggdrop has to be compiled with SSL support for this to work!
 +set use-ssl 0
-+
+ 
  # Number of seconds to wait between transmitting queued lines to the server.
  # Lower this value at your own risk.  ircd is known to start flood control
- # at 512 bytes/2 seconds.
diff --git a/irc/eggdrop-devel/files/patch-src-match.c b/irc/eggdrop-devel/files/patch-src-match.c
deleted file mode 100644
index dfaf8d9e5af0..000000000000
--- a/irc/eggdrop-devel/files/patch-src-match.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/match.c.orig	2013-05-13 15:17:47.000000000 +0200
-+++ src/match.c	2013-05-13 15:17:24.000000000 +0200
-@@ -367,7 +367,7 @@
- /* Inline for cron_match (obviously).
-  * Matches a single field of a crontab expression.
-  */
--inline int cron_matchfld(char *mask, int match)
-+int cron_matchfld(char *mask, int match)
- {
-   int skip = 0, f, t;
-   char *p, *q;
diff --git a/irc/eggdrop-devel/files/patch-src-net.c b/irc/eggdrop-devel/files/patch-src-net.c
deleted file mode 100644
index bf4424fad930..000000000000
--- a/irc/eggdrop-devel/files/patch-src-net.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/net.c.orig	2013-05-13 15:18:26.000000000 +0200
-+++ src/net.c	2013-05-13 15:18:34.000000000 +0200
-@@ -560,7 +560,7 @@
- /* Returns a socket number for a listening socket that will accept any
-  * connection -- port # is returned in port
-  */
--inline int open_listen(int *port)
-+int open_listen(int *port)
- {
-   int sock;
-   sockname_t name;
diff --git a/irc/eggdrop-devel/files/patch-src-tclhash.c b/irc/eggdrop-devel/files/patch-src-tclhash.c
deleted file mode 100644
index 7207b5099f22..000000000000
--- a/irc/eggdrop-devel/files/patch-src-tclhash.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/tclhash.c.orig	2013-05-13 15:18:05.000000000 +0200
-+++ src/tclhash.c	2013-05-13 15:18:12.000000000 +0200
-@@ -113,7 +113,7 @@
-   nfree(tl);
- }
- 
--inline void garbage_collect_tclhash(void)
-+void garbage_collect_tclhash(void)
- {
-   tcl_bind_list_t *tl, *tl_next, *tl_prev;
-   tcl_bind_mask_t *tm, *tm_next, *tm_prev;
diff --git a/irc/eggdrop-devel/pkg-plist b/irc/eggdrop-devel/pkg-plist
index 7d1f9b8bc799..691c6fa23f91 100644
--- a/irc/eggdrop-devel/pkg-plist
+++ b/irc/eggdrop-devel/pkg-plist
@@ -32,42 +32,8 @@ man/man1/eggdrop.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/TRICKS
 %%PORTDOCS%%%%DOCSDIR%%/USERS
 %%PORTDOCS%%%%DOCSDIR%%/WEIRD-MESSAGES
-%%PORTDOCS%%%%DOCSDIR%%/html/about.html
-%%PORTDOCS%%%%DOCSDIR%%/html/app-problems.html
-%%PORTDOCS%%%%DOCSDIR%%/html/app-textsub.html
-%%PORTDOCS%%%%DOCSDIR%%/html/app-tricks.html
-%%PORTDOCS%%%%DOCSDIR%%/html/app-weird.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bans.html
-%%PORTDOCS%%%%DOCSDIR%%/html/botnet.html
-%%PORTDOCS%%%%DOCSDIR%%/html/compiling.html
-%%PORTDOCS%%%%DOCSDIR%%/html/egg-core.html
-%%PORTDOCS%%%%DOCSDIR%%/html/faqs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/features.html
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/install.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-assoc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-blowfish.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-channels.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-compress.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-console.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-ctcp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-dns.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-filesys.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-irc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-notes.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-seen.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-server.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-share.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-transfer.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-uptime.html
-%%PORTDOCS%%%%DOCSDIR%%/html/mod-woobie.html
-%%PORTDOCS%%%%DOCSDIR%%/html/news.html
-%%PORTDOCS%%%%DOCSDIR%%/html/party.html
-%%PORTDOCS%%%%DOCSDIR%%/html/patch-howto.html
-%%PORTDOCS%%%%DOCSDIR%%/html/readme.html
-%%PORTDOCS%%%%DOCSDIR%%/html/starting.html
-%%PORTDOCS%%%%DOCSDIR%%/html/tcl-commands.html
-%%PORTDOCS%%%%DOCSDIR%%/html/users.html
+%%PORTDOCS%%%%DOCSDIR%%/html/search.html
 %%PORTDOCS%%%%DOCSDIR%%/settings/CONTENTS
 %%PORTDOCS%%%%DOCSDIR%%/settings/core.settings
 %%PORTDOCS%%%%DOCSDIR%%/settings/mod.assoc
@@ -78,6 +44,7 @@ man/man1/eggdrop.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/settings/mod.ctcp
 %%PORTDOCS%%%%DOCSDIR%%/settings/mod.dns
 %%PORTDOCS%%%%DOCSDIR%%/settings/mod.filesys
+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.ident
 %%PORTDOCS%%%%DOCSDIR%%/settings/mod.irc
 %%PORTDOCS%%%%DOCSDIR%%/settings/mod.notes
 %%PORTDOCS%%%%DOCSDIR%%/settings/mod.seen
@@ -123,16 +90,19 @@ man/man1/eggdrop.1.gz
 %%DATADIR%%/language/assoc.finnish.lang
 %%DATADIR%%/language/assoc.french.lang
 %%DATADIR%%/language/assoc.german.lang
+%%DATADIR%%/language/assoc.portuguese.lang
 %%DATADIR%%/language/console.danish.lang
 %%DATADIR%%/language/console.english.lang
 %%DATADIR%%/language/console.finnish.lang
 %%DATADIR%%/language/console.french.lang
 %%DATADIR%%/language/console.german.lang
+%%DATADIR%%/language/console.portuguese.lang
 %%DATADIR%%/language/core.danish.lang
 %%DATADIR%%/language/core.english.lang
 %%DATADIR%%/language/core.finnish.lang
 %%DATADIR%%/language/core.french.lang
 %%DATADIR%%/language/core.german.lang
+%%DATADIR%%/language/core.portuguese.lang
 %%DATADIR%%/language/filesys.danish.lang
 %%DATADIR%%/language/filesys.english.lang
 %%DATADIR%%/language/filesys.finnish.lang
@@ -143,11 +113,13 @@ man/man1/eggdrop.1.gz
 %%DATADIR%%/language/notes.finnish.lang
 %%DATADIR%%/language/notes.french.lang
 %%DATADIR%%/language/notes.german.lang
+%%DATADIR%%/language/notes.portuguese.lang
 %%DATADIR%%/language/transfer.danish.lang
 %%DATADIR%%/language/transfer.english.lang
 %%DATADIR%%/language/transfer.finnish.lang
 %%DATADIR%%/language/transfer.french.lang
 %%DATADIR%%/language/transfer.german.lang
+%%DATADIR%%/language/transfer.portuguese.lang
 %%DATADIR%%/scripts/CONTENTS
 %%DATADIR%%/scripts/action.fix.tcl
 %%DATADIR%%/scripts/alltools.tcl