chat/eggdrop: Update to 1.8.3.

- Loosely based on joyent/pkgsrc/pull/38 by ismell@.
- Removed the static build option as it didn't work at all.


Eggdrop v1.8.3

Tcl-API changes:
  - Added "handle ipaddress botport userport" syntax to the addbot Tcl
    command.
General changes:
  - Fixed a bug where ssl-enabled ports were not able to be reverted to
    non-SSL ports via the setuser Tcl command.
  - SSL certs: Fail earlier if SSL certs have issues. Also fatally error
    if only one of ssl-privatekey/certificate config settings is set.
  - Correctly check against invalid flags with the .match partyline
    command and matchattr Tcl command.
  - Prevent loop when writing to stdout in foreground mode that results
    in a segfault.
  - Lots of additional error checking against values for .+bot, .chaddr
    and the Tcl addbot command.
  - No longer trigger CHON binds when returning from a control script.
  - Added the '.resetconsole' command, allowing a user to reset console
    flags to those specified in the config file.
Botnet changes:
  - Added the 'l' console flag to handle messages sent from linked bots,
    reserving the 'b' console flag to handle messages related to botnet-
    linkings.
  - Split the "raw share traffic" flag into incoming (h) and outgoing (g).
  - Fixed a race condition in SSL userfile sharing, causing the transfer
    to stall with 511 bytes missing.
  - Fixed a bug introduced in v1.8.2 with copy-to-tmp, where the userfile
    being received is now properly being sent to a tmpfile first if
    copy-to-tmp is set.
  - Botnet sharing:  A slave will now use the address of the hub (to
    which it's succesfully connected) instead of an IP given by the hub
    which was wrong in certain cases (especially in NAT situations).
  - Bots request existing channel flags for users upon adding a new
    channel.
Deprecations:
  - Deprecated the "ipv4address:botport/userport" and
    "[ipv6address]:botport/userport" address formats for addbot.


Eggdrop v1.8.2

eggdrop.conf changes:
  - temp-path renamed to tmpfile and its purpose changed.
    It is now only used by filesys.mod/transfer.mod and optional.
  - blowfish-use-mode is a new setting for Tcl encrypt/decrypt.
    Allows using CBC instead of ECB mode for encryption.
    Tcl scripts not using the same mode are incompatible with each other.
    Does NOT affect password hashing for the userfile.
    CBC will be the NEW DEFAULT in a later version of eggdrop.
    Will be removed in a future Eggdrop version and forced to CBC.
  - global-* is renamed to default-*.
    This clarifies their purpose as default channel settings,
    not ones that override for existing channels.
    global-* still works for backwards compatibility.
Tcl-API changes:
  - encrypt/decrypt: These commands can now encrypt/decrypt in CBC
    mode instead of the current ECB mode. This does NOT affect password
    hashing for the userfile.
  - getuser: Can now be called without a second argument. Returns a flat
    key/value list (dict) of settings for that user.
  - configureargs: New global variable holding the ./configure arguments.
    This is a _string_, not a list. User needs to split it themselves.
  - maskhost: New types 30-39 set hostmask to * (to allow e.g. nick!*@*).
General changes:
  - Improved command line argument parsing.
  - Portuguese language file added.
  - Eggdrop no longer changes nick on every rehash if altnick uses '?'.
  - Terminal-mode (commandline -nt) always has full owner access now.
  - Allow spaces in server passwords in serverlist.


Eggdrop v1.8.1

- Autobotchk - Added functionality improvements to the tried-and-true
  autobotchk script, allowing characters such as {} and [] to be used in
  filenames
- .who linkedbot output - Truncates listings appropriately
- Minutely hook - The minutely hook was only called for missed minutes mod
  60, now it is still listed in minutes but it can be greater than 60.
- New OpenSSL version detection
- Moved previously hard-coded version strings to
  version.h and update them via misc/setpatch instead of misc/addpatch
- Compile cleanup - Fixed some compiler warnings
- General bugfixes


Eggdrop v1.8.0

- Support for utf-8 encoding with a fallback of iso8859-1
- Support for IPv6
- SSL support has been added for all kinds of connections, including
  certificate verification and authorization, and partyline SSL.
- The wire module has been removed from eggdrop
- Config file changes: e.g. my-ip and my-hostname settings are replaced
  by vhost4, vhost6 and the listen-addr.

6 files changed, 250 insertions, 157 deletions

diff --git a/chat/eggdrop/MESSAGE b/chat/eggdrop/MESSAGE
deleted file mode 100644
index e0dd5f67ae3..00000000000
--- a/chat/eggdrop/MESSAGE
+++ /dev/null
@@ -1,8 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/12 17:12:36 wiz Exp $
-
-If you run an IRC robot on most IRC nets, you will probably be banned from
-any server to which you connect.  Take care in how you use IRC robots, and
-make sure to get permission before running one on any server.
-
-===========================================================================
diff --git a/chat/eggdrop/Makefile b/chat/eggdrop/Makefile
index ea77740e64c..ce60cfd33d0 100644
--- a/chat/eggdrop/Makefile
+++ b/chat/eggdrop/Makefile
@@ -1,88 +1,59 @@
-# $NetBSD: Makefile,v 1.37 2018/01/13 23:18:25 rillig Exp $
+# $NetBSD: Makefile,v 1.38 2018/02/27 19:08:48 fhajny Exp $
 
-DISTNAME=	eggdrop1.6.21
-PKGNAME=	eggdrop-1.6.21
-#KGREVISION=	1
-PKGREVISION=	2
+DISTNAME=	eggdrop-1.8.3
 CATEGORIES=	chat
-MASTER_SITES=	ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	https://ftp.eggheads.org/pub/eggdrop/source/1.8/
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.eggheads.org/
+HOMEPAGE=	https://www.eggheads.org/
 COMMENT=	IRC robot with TCL scripting and multi-channel ability
+LICENSE=	gnu-gpl-v2
 
-MAKE_JOBS_SAFE=	no
-
-PLIST_VARS=		dynamic
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ENV+=		TCLLIB="${PREFIX}/lib" TCLINC="${PREFIX}/include"
+GNU_CONFIGURE=	yes
+USE_TOOLS+=	pax
 
 .include "../../mk/bsd.prefs.mk"
-.if !empty(PKGSRC_COMPILER:Msunpro)
-# fix for PR#44382
-CONFIGURE_ENV+=         ac_cv_c_inline=
-.endif
 
 EGDIR=		${PREFIX}/share/examples/eggdrop
 CONF_FILES=	${EGDIR}/eggdrop.conf ${PKG_SYSCONFDIR}/eggdrop.conf
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}
+INSTALLATION_DIRS+=	lib/eggdrop
+INSTALLATION_DIRS+=	share/doc
+INSTALLATION_DIRS+=	share/eggdrop
+INSTALLATION_DIRS+=	share/examples/eggdrop
+
+SUBST_CLASSES+=		dir
+SUBST_FILES.dir=	eggdrop.conf
+SUBST_STAGE.dir=	pre-configure
+SUBST_SED.dir+=		-e 's,modules/,${PREFIX}/lib/eggdrop/,'
+SUBST_SED.dir+=		-e 's,source scripts/,source ${PREFIX}/share/eggdrop/scripts/,'
+SUBST_SED.dir+=		-e 's,set help-path .*,set help-path "${PREFIX}/share/eggdrop/help/",'
+SUBST_SED.dir+=		-e 's,set text-path .*,set text-path "${PREFIX}/share/eggdrop/text/",'
+SUBST_SED.dir+=		-e 's,set motd .*,set motd "${PREFIX}/share/eggdrop/text/motd",'
+SUBST_SED.dir+=		-e 's,set telnet-banner .*,set telnet-banner "${PREFIX}/share/eggdrop/text/banner",'
+
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ENV+=		TCLLIB="${PREFIX}/lib" TCLINC="${PREFIX}/include"
+
+CFLAGS+=		-DLANGDIR=\"${PREFIX}/share/eggdrop/language\"
 
-post-patch:
-	cd ${WRKSRC} && ${SED} -e 's,modules/,${PREFIX}/lib/eggdrop/,' \
-		< eggdrop.conf > eggdrop.conf.dist.new
+BUILD_TARGET=	eggdrop
 
 post-configure:
 	cd ${WRKSRC} && ${MAKE} config
 
-do-install: do-install-program
-do-install-program:
-	${INSTALL_PROGRAM} ${WRKSRC}/eggdrop ${DESTDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/doc/man1/eggdrop.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
-	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/eggdrop.conf.dist.new \
-		${DESTDIR}${EGDIR}/eggdrop.conf
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/eggdrop/html
-	cd ${WRKSRC}/doc/html && ${INSTALL_DATA} *.html \
-		${DESTDIR}${PREFIX}/share/doc/eggdrop/html
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/eggdrop
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} BANS BOTNET FIRST-SCRIPT MODULES \
-		PARTYLINE USERS TRICKS TEXT-SUBSTITUTIONS tcl-commands.doc \
-		${DESTDIR}${PREFIX}/share/doc/eggdrop
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/eggdrop
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/eggdrop/help
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/eggdrop/language
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/eggdrop/scripts
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/eggdrop/help/msg
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/eggdrop/help/set
-	${INSTALL_DATA} ${WRKSRC}/language/core.*.lang \
-		${DESTDIR}${PREFIX}/share/eggdrop/language/
-	cd ${WRKSRC}/help && ${INSTALL_DATA} cmds1.help cmds2.help core.help \
-		${DESTDIR}${PREFIX}/share/eggdrop/help/
-	cd ${WRKSRC}/help/set && ${INSTALL_DATA} cmds1.help \
-		${DESTDIR}${PREFIX}/share/eggdrop/help/set/
-	cd ${WRKSRC}/scripts && ${INSTALL_DATA} CONTENTS *.tcl autobotchk \
-		 botchk weed ${DESTDIR}${PREFIX}/share/eggdrop/scripts/
+do-install:
+	cd "${WRKSRC}" && ${SETENV} ${MAKE_ENV} ${MAKE} DEST=${WRKDIR}/eggdrop install
+	${INSTALL_PROGRAM} ${WRKDIR}/eggdrop/${DISTNAME} ${DESTDIR}${PREFIX}/bin/eggdrop
+	cd ${WRKDIR}/eggdrop && ${PAX} -rw -pp help language scripts text \
+		${DESTDIR}${PREFIX}/share/eggdrop/
+	cd ${WRKDIR}/eggdrop/doc && ${PAX} -rw -pp * ${DESTDIR}${PREFIX}/share/doc/eggdrop/
+	mv -f ${DESTDIR}${PREFIX}/share/doc/eggdrop/man1 ${DESTDIR}/${PREFIX}/${PKGMANDIR}/
+	${INSTALL_DATA} ${WRKSRC}/eggdrop.conf ${DESTDIR}${EGDIR}/eggdrop.conf
+	${INSTALL_LIB} ${WRKDIR}/eggdrop/modules/* \
+		${DESTDIR}${PREFIX}/lib/eggdrop
 
-.include "../../lang/tcl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-
-.if defined(NOPIC)
-BUILD_TARGET=	static
-.else
-BUILD_TARGET=	eggdrop
-PLIST.dynamic=	yes
-do-install: do-install-modules
-do-install-modules:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/eggdrop
-	cd ${WRKSRC} && ${INSTALL_DATA} assoc.so blowfish.so channels.so \
-		compress.so console.so ctcp.so dns.so filesys.so irc.so notes.so \
-		seen.so server.so share.so transfer.so uptime.so wire.so \
-		${DESTDIR}${PREFIX}/lib/eggdrop
-	cd ${WRKSRC}/src/mod && ${FIND} . -name "*.lang" -exec ${INSTALL_DATA} "{}" \
-		${DESTDIR}${PREFIX}/share/eggdrop/language ";"
-.endif
diff --git a/chat/eggdrop/PLIST b/chat/eggdrop/PLIST
index cdb38549f8c..a9b4f2d7d31 100644
--- a/chat/eggdrop/PLIST
+++ b/chat/eggdrop/PLIST
@@ -1,87 +1,183 @@
-@comment $NetBSD: PLIST,v 1.15 2018/01/01 22:29:19 rillig Exp $
+@comment $NetBSD: PLIST,v 1.16 2018/02/27 19:08:48 fhajny Exp $
 bin/eggdrop
-${PLIST.dynamic}lib/eggdrop/assoc.so
-${PLIST.dynamic}lib/eggdrop/blowfish.so
-${PLIST.dynamic}lib/eggdrop/channels.so
-${PLIST.dynamic}lib/eggdrop/compress.so
-${PLIST.dynamic}lib/eggdrop/console.so
-${PLIST.dynamic}lib/eggdrop/ctcp.so
-${PLIST.dynamic}lib/eggdrop/dns.so
-${PLIST.dynamic}lib/eggdrop/filesys.so
-${PLIST.dynamic}lib/eggdrop/irc.so
-${PLIST.dynamic}lib/eggdrop/notes.so
-${PLIST.dynamic}lib/eggdrop/seen.so
-${PLIST.dynamic}lib/eggdrop/server.so
-${PLIST.dynamic}lib/eggdrop/share.so
-${PLIST.dynamic}lib/eggdrop/transfer.so
-${PLIST.dynamic}lib/eggdrop/uptime.so
-${PLIST.dynamic}lib/eggdrop/wire.so
+lib/eggdrop/assoc.so
+lib/eggdrop/blowfish.so
+lib/eggdrop/channels.so
+lib/eggdrop/compress.so
+lib/eggdrop/console.so
+lib/eggdrop/ctcp.so
+lib/eggdrop/dns.so
+lib/eggdrop/filesys.so
+lib/eggdrop/irc.so
+lib/eggdrop/notes.so
+lib/eggdrop/seen.so
+lib/eggdrop/server.so
+lib/eggdrop/share.so
+lib/eggdrop/transfer.so
+lib/eggdrop/uptime.so
 man/man1/eggdrop.1
+share/doc/eggdrop/ABOUT
 share/doc/eggdrop/BANS
 share/doc/eggdrop/BOTNET
+share/doc/eggdrop/BUG-REPORT
+share/doc/eggdrop/COMPILE-GUIDE
+share/doc/eggdrop/CONTENTS
+share/doc/eggdrop/Changes1.8
+share/doc/eggdrop/FAQ
 share/doc/eggdrop/FIRST-SCRIPT
+share/doc/eggdrop/IPV6
+share/doc/eggdrop/KNOWN-PROBLEMS
 share/doc/eggdrop/MODULES
 share/doc/eggdrop/PARTYLINE
+share/doc/eggdrop/PATCH-HOWTO
 share/doc/eggdrop/TEXT-SUBSTITUTIONS
+share/doc/eggdrop/TLS
 share/doc/eggdrop/TRICKS
 share/doc/eggdrop/USERS
-share/doc/eggdrop/html/about.html
-share/doc/eggdrop/html/app-problems.html
-share/doc/eggdrop/html/app-textsub.html
-share/doc/eggdrop/html/app-tricks.html
-share/doc/eggdrop/html/app-weird.html
-share/doc/eggdrop/html/bans.html
-share/doc/eggdrop/html/botnet.html
-share/doc/eggdrop/html/compiling.html
-share/doc/eggdrop/html/egg-core.html
-share/doc/eggdrop/html/faqs.html
-share/doc/eggdrop/html/features.html
+share/doc/eggdrop/Versions
+share/doc/eggdrop/WEIRD-MESSAGES
+share/doc/eggdrop/html/_static/agogo.css
+share/doc/eggdrop/html/_static/ajax-loader.gif
+share/doc/eggdrop/html/_static/basic.css
+share/doc/eggdrop/html/_static/bgfooter.png
+share/doc/eggdrop/html/_static/bgtop.png
+share/doc/eggdrop/html/_static/comment-bright.png
+share/doc/eggdrop/html/_static/comment-close.png
+share/doc/eggdrop/html/_static/comment.png
+share/doc/eggdrop/html/_static/doctools.js
+share/doc/eggdrop/html/_static/down-pressed.png
+share/doc/eggdrop/html/_static/down.png
+share/doc/eggdrop/html/_static/eggdrop.css
+share/doc/eggdrop/html/_static/eggman.png.gif
+share/doc/eggdrop/html/_static/file.png
+share/doc/eggdrop/html/_static/jquery.js
+share/doc/eggdrop/html/_static/minus.png
+share/doc/eggdrop/html/_static/plus.png
+share/doc/eggdrop/html/_static/pygments.css
+share/doc/eggdrop/html/_static/searchtools.js
+share/doc/eggdrop/html/_static/sidebar.js
+share/doc/eggdrop/html/_static/transparent.gif
+share/doc/eggdrop/html/_static/underscore.js
+share/doc/eggdrop/html/_static/up-pressed.png
+share/doc/eggdrop/html/_static/up.png
+share/doc/eggdrop/html/_static/websupport.js
+share/doc/eggdrop/html/appendices/first-script.html
+share/doc/eggdrop/html/appendices/index.html
+share/doc/eggdrop/html/appendices/known-probs.html
+share/doc/eggdrop/html/appendices/text-sub.html
+share/doc/eggdrop/html/appendices/tricks.html
+share/doc/eggdrop/html/appendices/weird-msgs.html
+share/doc/eggdrop/html/coreDocs/assoc.html
+share/doc/eggdrop/html/coreDocs/blowfish.html
+share/doc/eggdrop/html/coreDocs/channels.html
+share/doc/eggdrop/html/coreDocs/compress.html
+share/doc/eggdrop/html/coreDocs/console.html
+share/doc/eggdrop/html/coreDocs/core.html
+share/doc/eggdrop/html/coreDocs/ctcp.html
+share/doc/eggdrop/html/coreDocs/dns.html
+share/doc/eggdrop/html/coreDocs/filesys.html
+share/doc/eggdrop/html/coreDocs/index.html
+share/doc/eggdrop/html/coreDocs/irc.html
+share/doc/eggdrop/html/coreDocs/modules.html
+share/doc/eggdrop/html/coreDocs/notes.html
+share/doc/eggdrop/html/coreDocs/seen.html
+share/doc/eggdrop/html/coreDocs/server.html
+share/doc/eggdrop/html/coreDocs/share.html
+share/doc/eggdrop/html/coreDocs/transfer.html
+share/doc/eggdrop/html/coreDocs/uptime.html
+share/doc/eggdrop/html/coreDocs/woobie.html
 share/doc/eggdrop/html/index.html
-share/doc/eggdrop/html/install.html
-share/doc/eggdrop/html/mod-assoc.html
-share/doc/eggdrop/html/mod-blowfish.html
-share/doc/eggdrop/html/mod-channels.html
-share/doc/eggdrop/html/mod-compress.html
-share/doc/eggdrop/html/mod-console.html
-share/doc/eggdrop/html/mod-ctcp.html
-share/doc/eggdrop/html/mod-dns.html
-share/doc/eggdrop/html/mod-filesys.html
-share/doc/eggdrop/html/mod-irc.html
-share/doc/eggdrop/html/mod-notes.html
-share/doc/eggdrop/html/mod-seen.html
-share/doc/eggdrop/html/mod-server.html
-share/doc/eggdrop/html/mod-share.html
-share/doc/eggdrop/html/mod-transfer.html
-share/doc/eggdrop/html/mod-uptime.html
-share/doc/eggdrop/html/mod-wire.html
-share/doc/eggdrop/html/mod-woobie.html
-share/doc/eggdrop/html/news.html
-share/doc/eggdrop/html/party.html
-share/doc/eggdrop/html/patch-howto.html
-share/doc/eggdrop/html/readme.html
-share/doc/eggdrop/html/starting.html
-share/doc/eggdrop/html/tcl-commands.html
-share/doc/eggdrop/html/users.html
+share/doc/eggdrop/html/installAndSetup/faq.html
+share/doc/eggdrop/html/installAndSetup/index.html
+share/doc/eggdrop/html/installAndSetup/install.html
+share/doc/eggdrop/html/installAndSetup/readme.html
+share/doc/eggdrop/html/mainDocs/about.html
+share/doc/eggdrop/html/mainDocs/bans.html
+share/doc/eggdrop/html/mainDocs/botnet.html
+share/doc/eggdrop/html/mainDocs/features.html
+share/doc/eggdrop/html/mainDocs/index.html
+share/doc/eggdrop/html/mainDocs/ipv6.html
+share/doc/eggdrop/html/mainDocs/partyline.html
+share/doc/eggdrop/html/mainDocs/patch.html
+share/doc/eggdrop/html/mainDocs/tcl-commands.html
+share/doc/eggdrop/html/mainDocs/tls.html
+share/doc/eggdrop/html/mainDocs/users.html
+share/doc/eggdrop/html/search.html
+share/doc/eggdrop/settings/CONTENTS
+share/doc/eggdrop/settings/core.settings
+share/doc/eggdrop/settings/mod.assoc
+share/doc/eggdrop/settings/mod.blowfish
+share/doc/eggdrop/settings/mod.channels
+share/doc/eggdrop/settings/mod.compress
+share/doc/eggdrop/settings/mod.console
+share/doc/eggdrop/settings/mod.ctcp
+share/doc/eggdrop/settings/mod.dns
+share/doc/eggdrop/settings/mod.filesys
+share/doc/eggdrop/settings/mod.irc
+share/doc/eggdrop/settings/mod.notes
+share/doc/eggdrop/settings/mod.seen
+share/doc/eggdrop/settings/mod.server
+share/doc/eggdrop/settings/mod.share
+share/doc/eggdrop/settings/mod.transfer
+share/doc/eggdrop/settings/mod.uptime
+share/doc/eggdrop/settings/mod.woobie
 share/doc/eggdrop/tcl-commands.doc
+share/eggdrop/help/assoc.help
+share/eggdrop/help/blowfish.help
+share/eggdrop/help/chaninfo.help
+share/eggdrop/help/channels.help
+share/eggdrop/help/cmd_resolve.help
 share/eggdrop/help/cmds1.help
 share/eggdrop/help/cmds2.help
+share/eggdrop/help/compress.help
+share/eggdrop/help/console.help
 share/eggdrop/help/core.help
+share/eggdrop/help/ctcp.help
+share/eggdrop/help/dns.help
+share/eggdrop/help/filesys.help
+share/eggdrop/help/irc.help
+share/eggdrop/help/msg/irc.help
+share/eggdrop/help/msg/notes.help
+share/eggdrop/help/msg/seen.help
+share/eggdrop/help/msg/userinfo.help
+share/eggdrop/help/notes.help
+share/eggdrop/help/seen.help
+share/eggdrop/help/server.help
+share/eggdrop/help/set/blowfish.help
+share/eggdrop/help/set/channels.help
 share/eggdrop/help/set/cmds1.help
+share/eggdrop/help/set/compress.help
+share/eggdrop/help/set/console.help
+share/eggdrop/help/set/ctcp.help
+share/eggdrop/help/set/dns.help
+share/eggdrop/help/set/filesys.help
+share/eggdrop/help/set/irc.help
+share/eggdrop/help/set/notes.help
+share/eggdrop/help/set/server.help
+share/eggdrop/help/set/share.help
+share/eggdrop/help/set/transfer.help
+share/eggdrop/help/share.help
+share/eggdrop/help/transfer.help
+share/eggdrop/help/uptime.help
+share/eggdrop/help/userinfo.help
 share/eggdrop/language/assoc.danish.lang
 share/eggdrop/language/assoc.english.lang
 share/eggdrop/language/assoc.finnish.lang
 share/eggdrop/language/assoc.french.lang
 share/eggdrop/language/assoc.german.lang
+share/eggdrop/language/assoc.portuguese.lang
 share/eggdrop/language/console.danish.lang
 share/eggdrop/language/console.english.lang
 share/eggdrop/language/console.finnish.lang
 share/eggdrop/language/console.french.lang
 share/eggdrop/language/console.german.lang
+share/eggdrop/language/console.portuguese.lang
 share/eggdrop/language/core.danish.lang
 share/eggdrop/language/core.english.lang
 share/eggdrop/language/core.finnish.lang
 share/eggdrop/language/core.french.lang
 share/eggdrop/language/core.german.lang
+share/eggdrop/language/core.portuguese.lang
 share/eggdrop/language/filesys.danish.lang
 share/eggdrop/language/filesys.english.lang
 share/eggdrop/language/filesys.finnish.lang
@@ -92,16 +188,13 @@ share/eggdrop/language/notes.english.lang
 share/eggdrop/language/notes.finnish.lang
 share/eggdrop/language/notes.french.lang
 share/eggdrop/language/notes.german.lang
+share/eggdrop/language/notes.portuguese.lang
 share/eggdrop/language/transfer.danish.lang
 share/eggdrop/language/transfer.english.lang
 share/eggdrop/language/transfer.finnish.lang
 share/eggdrop/language/transfer.french.lang
 share/eggdrop/language/transfer.german.lang
-share/eggdrop/language/wire.danish.lang
-share/eggdrop/language/wire.english.lang
-share/eggdrop/language/wire.finnish.lang
-share/eggdrop/language/wire.french.lang
-share/eggdrop/language/wire.german.lang
+share/eggdrop/language/transfer.portuguese.lang
 share/eggdrop/scripts/CONTENTS
 share/eggdrop/scripts/action.fix.tcl
 share/eggdrop/scripts/alltools.tcl
@@ -119,5 +212,6 @@ share/eggdrop/scripts/quotepong.tcl
 share/eggdrop/scripts/sentinel.tcl
 share/eggdrop/scripts/userinfo.tcl
 share/eggdrop/scripts/weed
+share/eggdrop/text/banner
+share/eggdrop/text/motd
 share/examples/eggdrop/eggdrop.conf
-@pkgdir share/eggdrop/help/msg
diff --git a/chat/eggdrop/distinfo b/chat/eggdrop/distinfo
index a6e11e4b8ee..3ccf201fec0 100644
--- a/chat/eggdrop/distinfo
+++ b/chat/eggdrop/distinfo
@@ -1,22 +1,8 @@
-$NetBSD: distinfo,v 1.17 2015/11/03 01:20:18 agc Exp $
+$NetBSD: distinfo,v 1.18 2018/02/27 19:08:48 fhajny Exp $
 
-SHA1 (eggdrop1.6.21.tar.bz2) = 98ce7220c8aff19d2f8406fcc52aa1807aa0de01
-RMD160 (eggdrop1.6.21.tar.bz2) = 1006dfd6a6e735500c2b484eb3061f1d2dfd20f8
-SHA512 (eggdrop1.6.21.tar.bz2) = 9fd9a86c1c4b59a47a5eed4e2306e829a01bac2ad29e990ca9c0ec630d5814fd649a9216dae9ce49f734e3ac1728beb4f479ca10af583bd513f43bbbea23a653
-Size (eggdrop1.6.21.tar.bz2) = 999211 bytes
-SHA1 (patch-aa) = 555c7e7529643eb0e0fec0388e8767047ec8b984
-SHA1 (patch-ab) = c43cbe9586c6a05114a3ff21eb5fe5b806e8bb05
-SHA1 (patch-ac) = c71d67618a5b53a3de2f3041ed8fa098a89e4471
-SHA1 (patch-ad) = 9904f090a2a942a7442b1950489db0ae68a6e294
-SHA1 (patch-ae) = bdbb616282b7dc643182a35c606401850b33fdca
-SHA1 (patch-af) = 8f314d65d1a396b85e17400ee046f2ad4324a690
-SHA1 (patch-ag) = 0e69d8d867af7c1e3bb841e4fb06452f5cc1393d
-SHA1 (patch-ah) = a5360c748e16cbc3d6ae4f2968799e96007971f1
-SHA1 (patch-ai) = 77743bdf5fe790826159ffbb9246132f74a5fe38
-SHA1 (patch-ak) = 92f269a3f382a9f917d7e58c2cee5bb1d500ab6d
-SHA1 (patch-al) = 0b0438be382d9d9e0115235fd469bcded6679e3b
-SHA1 (patch-src_match.c) = ad5461aade0b66cb6a531f18a624c248855504fe
-SHA1 (patch-src_net.c) = caed97db5080c49a56ce0d223d7374a95435fb90
-SHA1 (patch-src_proto.h) = 8bc719154748225edd60182fd81ccc2c27c7eb64
-SHA1 (patch-src_tclhash.c) = eea9064b6fea10891feedc58741005c9879c21e2
-SHA1 (patch-src_tclhash.h) = 31c8aaec73855ed9b02173d52be4b96c6c387e70
+SHA1 (eggdrop-1.8.3.tar.gz) = fbdb187bc3989102bd3f5890ee27533c93132b1b
+RMD160 (eggdrop-1.8.3.tar.gz) = 3ebf6c6260dfb21f8684b7dfe26be03f167cab21
+SHA512 (eggdrop-1.8.3.tar.gz) = ad3b93d18aaa05d0eb00f1089b68d1f077f316042e64fff511ad1bbac06d35105adcb503490faaac4c9fe720dd45a9f350115b6c5d0f41fe198f228213a7a3a3
+Size (eggdrop-1.8.3.tar.gz) = 1756536 bytes
+SHA1 (patch-Makefile.in) = c2c51e1a57889feab043fad4c4d17850fe11449e
+SHA1 (patch-src_eggdrop.h) = de7a4ee2f51a325542e22ebdf69cc75295b0b8de
diff --git a/chat/eggdrop/patches/patch-Makefile.in b/chat/eggdrop/patches/patch-Makefile.in
new file mode 100644
index 00000000000..ba8cb33d166
--- /dev/null
+++ b/chat/eggdrop/patches/patch-Makefile.in
@@ -0,0 +1,36 @@
+$NetBSD: patch-Makefile.in,v 1.1 2018/02/27 19:08:48 fhajny Exp $
+
+Avoid dependency on coreutils.
+Enable parallel builds by removing vanity binary calls.
+
+--- Makefile.in.orig	2018-02-04 16:08:11.000000000 +0000
++++ Makefile.in
+@@ -9,16 +9,8 @@ VPATH = @srcdir@
+ 
+ @SET_MAKE@
+ prefix = @prefix@
+-DEST = @DEST@
+-# GNU Make < 3.82 ignores these != statements, they are for bsd make and gnu make >= 4.0.
+-# gnu make 3.82 interprets a!= b as setting the variable a!.
+-# it seems to interpret != otherwise and throws an error.
+-DEST_PARENT_DIR!= dirname $(DEST)
+-DEST_PARENT!= readlink -f $(DEST_PARENT_DIR)
+-DEST_DIR!= basename $(DEST)
+-ABSDEST!= echo $(DEST_PARENT)/$(DEST_DIR)
+-# GNU Make
+-ABSDEST ?= $(abspath $(DEST))
++DEST ?= @DEST@
++ABSDEST ?= $(DEST)
+ EGGEXEC = @EGGEXEC@
+ EGG_CROSS_COMPILING = @EGG_CROSS_COMPILING@
+ EGGVERSION = @EGGVERSION@
+@@ -241,8 +233,7 @@ eggdrop: modtest
+ 	rm -f src/mod/mod.xlibs && \
+ 	(cd src && $(MAKE) $(MAKE_MODEGG_ARGS) $(EGGEXEC)) && \
+ 	echo "" && echo "Making modules..." && echo "" && \
+-	(cd src/mod && $(MAKE) $(MAKE_MODULES_ARGS) modules) && \
+-	$(show_test_run) && $(ls_mods) && $(egg_install_msg)
++	(cd src/mod && $(MAKE) $(MAKE_MODULES_ARGS) modules)
+ 
+ debug: modtest
+ 	@echo "" && echo "Making core eggdrop files..." && echo "" && \
diff --git a/chat/eggdrop/patches/patch-src_eggdrop.h b/chat/eggdrop/patches/patch-src_eggdrop.h
new file mode 100644
index 00000000000..e7424fac27a
--- /dev/null
+++ b/chat/eggdrop/patches/patch-src_eggdrop.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_eggdrop.h,v 1.1 2018/02/27 19:08:48 fhajny Exp $
+
+Don't hardcode a relative LANGDIR.
+
+--- src/eggdrop.h.orig	2017-08-13 21:07:00.000000000 +0000
++++ src/eggdrop.h
+@@ -62,7 +62,6 @@
+ 
+ 
+ /* Language stuff */
+-#define LANGDIR  "./language" /* language file directory                   */
+ #define BASELANG "english"    /* language which always gets loaded before
+                                  all other languages. You do not want to
+                                  change this.                              */