Update eggdrop to 1.8.2

chat/eggdrop/Makefile

@@ -1,12 +1,9 @@
 # $NetBSD: Makefile,v 1.36 2014/01/11 14:42:01 adam Exp $
 
-DISTNAME=	eggdrop1.6.21
-PKGNAME=	eggdrop-1.6.21
-#KGREVISION=	1
-PKGREVISION=	2
+DISTNAME=	eggdrop-1.8.2
 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/
+EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.eggheads.org/
@@ -18,57 +15,47 @@ PLIST_VARS=		dynamic
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ENV+=		TCLLIB="${PREFIX}/lib" TCLINC="${PREFIX}/include"
+CFLAGS+=		-DLANGDIR=\"${PREFIX}/share/eggdrop/language\"
 
 .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+=	lib/eggdrop
+INSTALLATION_DIRS+=	share/doc
+INSTALLATION_DIRS+=	share/eggdrop
+INSTALLATION_DIRS+=	share/examples/eggdrop
 
 post-patch:
 	cd ${WRKSRC} && ${SED} -e 's,modules/,${PREFIX}/lib/eggdrop/,' \
+		-e 's,source scripts/,source ${PREFIX}/share/eggdrop/scripts/,' \
+		-e 's,set help-path .*,set help-path "${PREFIX}/share/eggdrop/help/",' \
+		-e 's,set text-path .*,set text-path "${PREFIX}/share/eggdrop/text/",' \
+		-e 's,set motd .*,set motd "${PREFIX}/share/eggdrop/text/motd",' \
+		-e 's,set telnet-banner .*,set telnet-banner "${PREFIX}/share/eggdrop/text/banner",' \
 		< eggdrop.conf > eggdrop.conf.dist.new
 
 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/
+	cd "${WRKSRC}" && ${SETENV} ${MAKE_ENV} ${MAKE} DEST=${WRKDIR}/eggdrop install
+	# Makefile has already used bsdinstall so permissions are set correctly
+	cp -fr ${WRKDIR}/eggdrop/scripts ${DESTDIR}${PREFIX}/share/eggdrop/
+	cp -fr ${WRKDIR}/eggdrop/help ${DESTDIR}${PREFIX}/share/eggdrop/
+	cp -fr ${WRKDIR}/eggdrop/language ${DESTDIR}${PREFIX}/share/eggdrop/
+	cp -fr ${WRKDIR}/eggdrop/text ${DESTDIR}${PREFIX}/share/eggdrop/
+	cp -fr ${WRKDIR}/eggdrop/eggdrop ${DESTDIR}${PREFIX}/bin/
+	cp -fr ${WRKDIR}/eggdrop/doc ${DESTDIR}${PREFIX}/share/doc/eggdrop
+	mv -f ${DESTDIR}${PREFIX}/share/doc/eggdrop/man1/* ${DESTDIR}/${PREFIX}/${PKGMANDIR}/man1/
+	${INSTALL_DATA} ${WRKSRC}/eggdrop.conf.dist.new ${DESTDIR}${EGDIR}/eggdrop.conf
 
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
 
 .if defined(NOPIC)
@@ -78,11 +65,6 @@ 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 \
+	${INSTALL_LIB} ${WRKDIR}/eggdrop/modules/* \
 		${DESTDIR}${PREFIX}/lib/eggdrop
-	cd ${WRKSRC}/src/mod && ${FIND} . -name "*.lang" -exec ${INSTALL_DATA} "{}" \
-		${DESTDIR}${PREFIX}/share/eggdrop/language ";"
 .endif

chat/eggdrop/PLIST

@@ -15,58 +15,151 @@ ${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
 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/tcl-commands.doc
-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
@@ -82,6 +175,7 @@ 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
@@ -97,11 +191,6 @@ 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/scripts/CONTENTS
 share/eggdrop/scripts/action.fix.tcl
 share/eggdrop/scripts/alltools.tcl
@@ -119,5 +208,6 @@ share/eggdrop/scripts/quotepong.tcl
 share/eggdrop/scripts/sentinel.tcl
 share/eggdrop/scripts/userinfo.tcl
 share/eggdrop/scripts/weed
+share/eggdrop/text/motd
+share/eggdrop/text/banner
 share/examples/eggdrop/eggdrop.conf
-@pkgdir share/eggdrop/help/msg

chat/eggdrop/distinfo

@@ -1,22 +1,7 @@
 $NetBSD: distinfo,v 1.17 2015/11/03 01:20:18 agc 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.2.tar.gz) = 33992817156a1fdae9e6baf8a213640f052e7549
+RMD160 (eggdrop-1.8.2.tar.gz) = 25382b2c09413b4ed2da1dbca1ecb3e695e63820
+SHA512 (eggdrop-1.8.2.tar.gz) = 72436e2e56f92ec33ab2ff6b11607aac94e41216098f6141bc00b643c60a8b320ce5dfbf7cd870399479a3c328c08b9f0d1d628e7a8f618b446afb010a773b9b
+Size (eggdrop-1.8.2.tar.gz) = 1756687 bytes
+SHA1 (patch-langdir) = 938c0ea4f13268b1fe099f3f5891d2e17a6d1d2a