From 6aceea71d3e95aa947ba50282e8f0e60adb2b238 Mon Sep 17 00:00:00 2001 From: Raul E Rangel Date: Mon, 6 Nov 2017 03:31:31 +0000 Subject: [PATCH] Update eggdrop to 1.8.2 --- chat/eggdrop/Makefile | 68 +++---- chat/eggdrop/PLIST | 178 +++++++++++++----- chat/eggdrop/distinfo | 25 +-- chat/eggdrop/patches/patch-aa | 41 ---- chat/eggdrop/patches/patch-ab | 41 ---- chat/eggdrop/patches/patch-ac | 30 --- chat/eggdrop/patches/patch-ad | 13 -- chat/eggdrop/patches/patch-ae | 15 -- chat/eggdrop/patches/patch-af | 14 -- chat/eggdrop/patches/patch-ag | 58 ------ chat/eggdrop/patches/patch-ah | 13 -- chat/eggdrop/patches/patch-ai | 25 --- chat/eggdrop/patches/patch-al | 16 -- .../patches/{patch-ak => patch-langdir} | 11 +- chat/eggdrop/patches/patch-src_match.c | 13 -- chat/eggdrop/patches/patch-src_net.c | 13 -- chat/eggdrop/patches/patch-src_proto.h | 13 -- chat/eggdrop/patches/patch-src_tclhash.c | 13 -- chat/eggdrop/patches/patch-src_tclhash.h | 13 -- 19 files changed, 168 insertions(+), 445 deletions(-) delete mode 100644 chat/eggdrop/patches/patch-aa delete mode 100644 chat/eggdrop/patches/patch-ab delete mode 100644 chat/eggdrop/patches/patch-ac delete mode 100644 chat/eggdrop/patches/patch-ad delete mode 100644 chat/eggdrop/patches/patch-ae delete mode 100644 chat/eggdrop/patches/patch-af delete mode 100644 chat/eggdrop/patches/patch-ag delete mode 100644 chat/eggdrop/patches/patch-ah delete mode 100644 chat/eggdrop/patches/patch-ai delete mode 100644 chat/eggdrop/patches/patch-al rename chat/eggdrop/patches/{patch-ak => patch-langdir} (56%) delete mode 100644 chat/eggdrop/patches/patch-src_match.c delete mode 100644 chat/eggdrop/patches/patch-src_net.c delete mode 100644 chat/eggdrop/patches/patch-src_proto.h delete mode 100644 chat/eggdrop/patches/patch-src_tclhash.c delete mode 100644 chat/eggdrop/patches/patch-src_tclhash.h diff --git a/chat/eggdrop/Makefile b/chat/eggdrop/Makefile index 41ad5b037d635..a8024a0294a72 100644 --- a/chat/eggdrop/Makefile +++ b/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,20 +15,26 @@ 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: @@ -39,36 +42,20 @@ post-configure: 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 diff --git a/chat/eggdrop/PLIST b/chat/eggdrop/PLIST index 5a1d58d591762..a262370796f70 100644 --- a/chat/eggdrop/PLIST +++ b/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 diff --git a/chat/eggdrop/distinfo b/chat/eggdrop/distinfo index a6e11e4b8eeb5..b0eb704a09ba5 100644 --- a/chat/eggdrop/distinfo +++ b/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 diff --git a/chat/eggdrop/patches/patch-aa b/chat/eggdrop/patches/patch-aa deleted file mode 100644 index 5632bd066726e..0000000000000 --- a/chat/eggdrop/patches/patch-aa +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-aa,v 1.7 2014/02/21 20:18:13 joerg Exp $ - ---- configure.orig 2011-10-26 02:00:10.000000000 +0000 -+++ configure -@@ -5248,7 +5248,7 @@ $as_echo "#define DLOPEN_1 1" >>confdefs - - fi - ;; -- *BSD) -+ *BSD | DragonFly) - # FreeBSD/OpenBSD/NetBSD all support dlopen() and have had plenty of - # testing with Eggdrop. - WEIRD_OS="no" -@@ -5525,10 +5525,16 @@ $as_echo "#define STOP_UAC 1" >>confdefs - SHLIB_CC="$CC -PIC" - fi - ;; -- *BSD) -+ *BSD | DragonFly) - # FreeBSD/OpenBSD/NetBSD - SHLIB_CC="$CC -fPIC" -- SHLIB_LD="ld -Bshareable -x" -+ if [ `echo __ELF__ | $CC -E - | grep -v '#'` = 1 ]; then -+ SHLIB_LD="ld -shared -x" -+ BEL_MOD_LD="$CC -Wl,-E $LDFLAGS" -+ else -+ SHLIB_LD="ld -Bshareable -x" -+ BEL_MOD_LD="$CC $LDFLAGS" -+ fi - ;; - Darwin) - # Mac OS X -@@ -6872,7 +6878,7 @@ tclrecommendver="8.5.X" - tclrecommendsite="ftp://tcl.activestate.com/pub/tcl/tcl8_5/" - - # Tcl library filename prefixes, suffixes, and search paths. --tcllibnames="tcl8.5 tcl85 tcl8.4 tcl84 tcl8.3 tcl83 tcl8.2 tcl82 \ -+tcllibnames="tcl86 tcl8.5 tcl85 tcl8.4 tcl84 tcl8.3 tcl83 tcl8.2 tcl82 \ - tcl8.1 tcl81 tcl8.0 tcl80 tcl tcl7.6 tcl76 tcl7.5 tcl75 \ - tcl7.4 tcl74 tcl7.3 tcl73 tcl7.2 tcl72 tcl7.1 tcl71 \ - tcl7.0 tcl70" diff --git a/chat/eggdrop/patches/patch-ab b/chat/eggdrop/patches/patch-ab deleted file mode 100644 index 57de0791bb2db..0000000000000 --- a/chat/eggdrop/patches/patch-ab +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-ab,v 1.6 2012/03/31 21:52:57 shattered Exp $ - ---- src/main.c.orig 2011-09-23 20:31:32.000000000 +0000 -+++ src/main.c -@@ -72,7 +72,7 @@ - # define _POSIX_SOURCE 1 /* Solaris needs this */ - #endif - --extern char origbotname[], userfile[], botnetnick[]; -+extern char origbotname[], userfile[], botnetnick[], tempdir[]; - extern int dcc_total, conmask, cache_hit, cache_miss, max_logs, quick_logs, - quiet_save; - extern struct dcc_t *dcc; -@@ -108,7 +108,7 @@ int con_chan = 0; /* Foreground: c - int term_z = 0; /* Foreground: use the terminal as a partyline? */ - int use_stderr = 1; /* Send stuff to stderr instead of logfiles? */ - --char configfile[121] = "eggdrop.conf"; /* Default config file name */ -+char configfile[121] = __PKG_SYSCONFDIR__ "/eggdrop.conf"; /* Default config file name */ - char pid_file[120]; /* Name of the pid file */ - char helpdir[121] = "help/"; /* Directory of help files */ - char textdir[121] = "text/"; /* Directory for text files */ -@@ -963,6 +963,8 @@ int main(int arg_c, char **arg_v) - setrlimit(RLIMIT_CORE, &cdlim); - #endif - -+ chdir(__PREFIX__ "/share/eggdrop"); -+ - #ifdef DEBUG_CONTEXT - /* Initialise context list */ - for (i = 0; i < 16; i++) -@@ -1075,7 +1077,8 @@ int main(int arg_c, char **arg_v) - cache_miss = 0; - cache_hit = 0; - if (!pid_file[0]) -- egg_snprintf(pid_file, sizeof pid_file, "pid.%s", botnetnick); -+ egg_snprintf(pid_file, sizeof pid_file, "%.100s/pid.%.32s", -+ tempdir, botnetnick); - - /* Check for pre-existing eggdrop! */ - f = fopen(pid_file, "r"); diff --git a/chat/eggdrop/patches/patch-ac b/chat/eggdrop/patches/patch-ac deleted file mode 100644 index 60e2f74cc2add..0000000000000 --- a/chat/eggdrop/patches/patch-ac +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2004/12/03 12:15:54 adam Exp $ - ---- src/Makefile.in.orig 2004-07-25 11:17:34.000000000 +0000 -+++ src/Makefile.in -@@ -4,6 +4,7 @@ - SHELL = @SHELL@ - top_srcdir = @top_srcdir@ - srcdir = @srcdir@ -+prefix = @prefix@ - VPATH = @srcdir@ - - @SET_MAKE@ -@@ -16,7 +17,7 @@ CC = @CC@ - LD = @CC@ - STRIP = @STRIP@ - CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) @DEFS@ $(CFLGS) --CPPFLAGS = @CPPFLAGS@ -+CPPFLAGS = @CPPFLAGS@ '-D__PREFIX__="@prefix@"' '-D__PKG_SYSCONFDIR__="@sysconfdir@"' - - eggdrop_objs = bg.o botcmd.o botmsg.o botnet.o chanprog.o cmds.o dcc.o \ - dccutil.o dns.o flags.o language.o match.o main.o mem.o misc.o misc_file.o \ -@@ -37,7 +38,7 @@ doofus: - @echo "Linking eggdrop $(EGGBUILD)." - @echo "" - @touch mod/mod.xlibs -- $(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs` -+ $(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLDFLAGS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs` - $(STRIP) ../$(EGGEXEC) - @echo "" - @echo "Successful compile: $(EGGEXEC)" diff --git a/chat/eggdrop/patches/patch-ad b/chat/eggdrop/patches/patch-ad deleted file mode 100644 index 01dfdbce13ca8..0000000000000 --- a/chat/eggdrop/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.4 2012/03/31 21:52:57 shattered Exp $ - ---- src/mod/filesys.mod/filesys.c.orig 2011-02-13 14:19:33.000000000 +0000 -+++ src/mod/filesys.mod/filesys.c -@@ -464,7 +464,7 @@ static int do_dcc_send(int idx, char *di - if (at_limit(nick)) { - char xxx[1024]; - -- sprintf(xxx, "%d*%s%s", (int) strlen(dccdir), dccdir, dir); -+ sprintf(xxx, "%lu*%s%s", strlen(dccdir), dccdir, dir); - queue_file(xxx, fn, dcc[idx].nick, nick); - dprintf(idx, "Queued: %s to %s\n", fn, nick); - my_free(s); diff --git a/chat/eggdrop/patches/patch-ae b/chat/eggdrop/patches/patch-ae deleted file mode 100644 index 294a07464da16..0000000000000 --- a/chat/eggdrop/patches/patch-ae +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2004/12/03 12:15:54 adam Exp $ - ---- src/mod/ctcp.mod/ctcp.c.orig 2004-06-14 01:14:07.000000000 +0000 -+++ src/mod/ctcp.mod/ctcp.c -@@ -161,8 +161,8 @@ static int ctcp_CHAT(char *nick, char *u - /* Do me a favour and don't change this back to a CTCP reply, - * CTCP replies are NOTICE's this has to be a PRIVMSG - * -poptix 5/1/1997 */ -- dprintf(DP_SERVER, "PRIVMSG %s :\001DCC CHAT chat %lu %u\001\n", -- nick, iptolong(natip[0] ? (IP) inet_addr(natip) : getmyip()), -+ dprintf(DP_SERVER, "PRIVMSG %s :\001DCC CHAT chat %u %u\001\n", -+ nick, (unsigned)iptolong(natip[0] ? (IP) inet_addr(natip) : getmyip()), - dcc[i].port); - return 1; - } diff --git a/chat/eggdrop/patches/patch-af b/chat/eggdrop/patches/patch-af deleted file mode 100644 index 3330fdf37df4b..0000000000000 --- a/chat/eggdrop/patches/patch-af +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-af,v 1.2 2004/12/03 12:15:54 adam Exp $ - ---- src/mod/uptime.mod/uptime.c.orig 2004-06-14 01:14:07.000000000 +0000 -+++ src/mod/uptime.mod/uptime.c -@@ -35,8 +35,8 @@ - - #include "uptime.h" - #include "../module.h" --#include "../server.mod/server.h" - #include -+#include "../server.mod/server.h" - #include - #include - #include diff --git a/chat/eggdrop/patches/patch-ag b/chat/eggdrop/patches/patch-ag deleted file mode 100644 index 980c7fd0e7dac..0000000000000 --- a/chat/eggdrop/patches/patch-ag +++ /dev/null @@ -1,58 +0,0 @@ -$NetBSD: patch-ag,v 1.8 2012/03/31 21:52:57 shattered Exp $ - ---- Makefile.in.orig 2010-03-14 18:21:59.000000000 +0000 -+++ Makefile.in -@@ -51,7 +51,7 @@ MOD_STRIP = @MOD_STRIP@ - - # make 'modules' - SHLIB_CC = @SHLIB_CC@ --SHLIB_LD = @SHLIB_LD@ -+SHLIB_LD = @SHLIB_LD@ $(LINKER_RPATH_FLAG) @TCLLIB@ - SHLIB_STRIP = @SHLIB_STRIP@ - MOD_EXT = @MOD_EXT@ - -@@ -71,6 +71,7 @@ XREQS = @TCL_REQS@ - # XLIBS will be linked with everything - # MODULE_XLIBS will only be linked with the module objects - XLIBS = @TCL_LIBS@ @LIBS@ -+XLDFLAGS = $(COMPILER_RPATH_FLAG)@TCLLIB@ - MODULE_XLIBS = @MODULE_XLIBS@ - - # You shouldn't need to edit anything below this line. -@@ -95,30 +96,30 @@ egg_install_msg = echo "" && \ - MAKE_MODEGG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(MOD_CC)' 'LD=$(MOD_LD)' \ - 'STRIP=$(MOD_STRIP)' 'RANLIB=$(RANLIB)' 'CFLGS=$(CFLGS)' \ - 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \ --'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(standard build)' 'MODOBJS=' -+'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(standard build)' 'MODOBJS=' - - MAKE_MODULES = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(SHLIB_CC)' 'LD=$(SHLIB_LD)' \ --'STRIP=$(SHLIB_STRIP)' 'CFLGS=$(CFLGS)' 'XLIBS=$(XLIBS)' \ -+'STRIP=$(SHLIB_STRIP)' 'CFLGS=$(CFLGS)' 'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' \ - 'MOD_EXT=$(MOD_EXT)' 'MODULE_XLIBS=$(MODULE_XLIBS)' - - MAKE_STATIC = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \ - 'STRIP=$(STRIP)' 'RANLIB=$(RANLIB)' 'CFLGS=$(CFLGS) -DSTATIC' \ - 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \ --'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(static version)' \ -+'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(static version)' \ - 'MODOBJS=mod/*.o' - - MAKE_DEBEGG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(MOD_CC)' 'LD=$(MOD_LD)' \ - 'STRIP=touch' 'RANLIB=$(RANLIB)' 'CFLGS=$(DEBCFLGS) $(CFLGS)' \ - 'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' \ --'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(debug version)' 'MODOBJS=' -+'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(debug version)' 'MODOBJS=' - - MAKE_DEBMODULES = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(SHLIB_CC)' 'LD=$(SHLIB_LD)' \ --'XLIBS=$(XLIBS)' 'STRIP=touch' 'CFLGS=$(DEBCFLGS) $(CFLGS)' \ -+'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' 'STRIP=touch' 'CFLGS=$(DEBCFLGS) $(CFLGS)' \ - 'MOD_EXT=$(MOD_EXT)' 'MODULE_XLIBS=$(MODULE_XLIBS)' - - MAKE_SDEBUG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \ - 'STRIP=touch' 'RANLIB=$(RANLIB)' 'CFLGS=$(DEBCFLGS) $(CFLGS) -DSTATIC' \ --'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)' \ -+'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' \ - 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(static debug version)' 'MODOBJS=mod/*.o' - - MAKE_DEPEND = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' diff --git a/chat/eggdrop/patches/patch-ah b/chat/eggdrop/patches/patch-ah deleted file mode 100644 index 288a7991a43b4..0000000000000 --- a/chat/eggdrop/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2004/12/03 12:15:54 adam Exp $ - ---- src/modules.c.orig 2004-07-25 11:17:34.000000000 +0000 -+++ src/modules.c -@@ -106,7 +106,7 @@ int xtra_unpack(); - static int module_rename(char *name, char *newname); - - #ifndef STATIC --char moddir[121] = "modules/"; -+char moddir[121] = __PREFIX__ "/lib/eggdrop/"; - #endif - - #ifdef STATIC diff --git a/chat/eggdrop/patches/patch-ai b/chat/eggdrop/patches/patch-ai deleted file mode 100644 index 8d52dac671049..0000000000000 --- a/chat/eggdrop/patches/patch-ai +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ai,v 1.4 2007/10/18 09:15:34 obache Exp $ - ---- src/mod/share.mod/share.c.orig 2006-03-28 02:35:51.000000000 +0000 -+++ src/mod/share.mod/share.c -@@ -1122,7 +1122,8 @@ static void share_ufsend(int idx, char * - int i, sock; - FILE *f; - -- egg_snprintf(s, sizeof s, ".share.%s.%li.users", botnetnick, now); -+ egg_snprintf(s, sizeof s, "%.100s/.share.%.32s.%lu.users", -+ tempdir, botnetnick, now); - if (!(b_status(idx) & STAT_SHARE)) { - dprintf(idx, "s e You didn't ask; you just started sending.\n"); - dprintf(idx, "s e Ask before sending the userfile.\n"); -@@ -1891,8 +1892,8 @@ static void start_sending_users(int idx) - struct chanuserrec *ch; - struct chanset_t *cst; - -- egg_snprintf(share_file, sizeof share_file, ".share.%s.%lu", dcc[idx].nick, -- now); -+ egg_snprintf(share_file, sizeof share_file, "%.100s/.share.%.32s.%lu", -+ tempdir, dcc[idx].nick, now); - if (dcc[idx].u.bot->uff_flags & UFF_OVERRIDE) { - debug1("NOTE: Sharing aggressively with %s, overriding its local bots.", - dcc[idx].nick); diff --git a/chat/eggdrop/patches/patch-al b/chat/eggdrop/patches/patch-al deleted file mode 100644 index 96294f9e80762..0000000000000 --- a/chat/eggdrop/patches/patch-al +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-al,v 1.2 2007/10/18 09:15:34 obache Exp $ - -Fix for http://www.eggheads.org/bugzilla/show_bug.cgi?id=462 - ---- src/mod/irc.mod/chan.c.orig 2006-03-28 02:35:51.000000000 +0000 -+++ src/mod/irc.mod/chan.c -@@ -2211,7 +2211,8 @@ static int gotmsg(char *from, char *msg) - return 0; /* Unknown channel; don't process. */ - - fixcolon(msg); -- strcpy(uhost, from); -+ strncpy(uhost, from, UHOSTMAX); -+ uhost[UHOSTMAX] = '\0'; - nick = splitnick(&uhost); - ignoring = match_ignore(from); - /* Only check if flood-ctcp is active */ diff --git a/chat/eggdrop/patches/patch-ak b/chat/eggdrop/patches/patch-langdir similarity index 56% rename from chat/eggdrop/patches/patch-ak rename to chat/eggdrop/patches/patch-langdir index 629080766ee74..a547243a1f20a 100644 --- a/chat/eggdrop/patches/patch-ak +++ b/chat/eggdrop/patches/patch-langdir @@ -1,13 +1,10 @@ -$NetBSD: patch-ak,v 1.3 2004/12/03 12:15:54 adam Exp $ +--- src/eggdrop.h.orig 2017-08-13 21:07:00.000000000 +0000 ++++ src/eggdrop.h 2017-11-05 23:48:54.794491497 +0000 +@@ -62,7 +62,6 @@ + ---- src/eggdrop.h.orig 2004-07-25 11:17:34.000000000 +0000 -+++ src/eggdrop.h -@@ -75,7 +75,7 @@ - - /* Language stuff */ -#define LANGDIR "./language" /* language file directory */ -+#define LANGDIR __PREFIX__ "/share/eggdrop/language" /* language file directory */ #define BASELANG "english" /* language which always gets loaded before all other languages. You do not want to change this. */ diff --git a/chat/eggdrop/patches/patch-src_match.c b/chat/eggdrop/patches/patch-src_match.c deleted file mode 100644 index 56e71ea8e09fc..0000000000000 --- a/chat/eggdrop/patches/patch-src_match.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_match.c,v 1.1 2012/11/16 00:35:28 joerg Exp $ - ---- src/match.c.orig 2012-11-15 10:29:42.000000000 +0000 -+++ src/match.c -@@ -367,7 +367,7 @@ int cidr_match(char *m, char *n, int cou - /* Inline for cron_match (obviously). - * Matches a single field of a crontab expression. - */ --inline int cron_matchfld(char *mask, int match) -+static inline int cron_matchfld(char *mask, int match) - { - int skip = 0, f, t; - char *p, *q; diff --git a/chat/eggdrop/patches/patch-src_net.c b/chat/eggdrop/patches/patch-src_net.c deleted file mode 100644 index d46308e86e17b..0000000000000 --- a/chat/eggdrop/patches/patch-src_net.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_net.c,v 1.1 2012/11/16 00:35:28 joerg Exp $ - ---- src/net.c.orig 2012-11-15 10:30:07.000000000 +0000 -+++ src/net.c -@@ -564,7 +564,7 @@ int open_address_listen(IP addr, int *po - /* 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) - { - return open_address_listen(myip[0] ? getmyip() : INADDR_ANY, port); - } diff --git a/chat/eggdrop/patches/patch-src_proto.h b/chat/eggdrop/patches/patch-src_proto.h deleted file mode 100644 index 893d532a7d8b0..0000000000000 --- a/chat/eggdrop/patches/patch-src_proto.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_proto.h,v 1.1 2012/11/16 00:35:28 joerg Exp $ - ---- src/proto.h.orig 2012-11-15 10:30:20.000000000 +0000 -+++ src/proto.h -@@ -271,7 +271,7 @@ int getsock(int); - void killsock(int); - void killtclsock(int); - int answer(int, char *, unsigned long *, unsigned short *, int); --inline int open_listen(int *); -+int open_listen(int *); - int open_address_listen(IP addr, int *); - int open_telnet(char *, int); - int open_telnet_dcc(int, char *, char *); diff --git a/chat/eggdrop/patches/patch-src_tclhash.c b/chat/eggdrop/patches/patch-src_tclhash.c deleted file mode 100644 index 69fc2eea7a3d3..0000000000000 --- a/chat/eggdrop/patches/patch-src_tclhash.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_tclhash.c,v 1.1 2012/11/16 00:35:28 joerg Exp $ - ---- src/tclhash.c.orig 2012-11-15 10:32:40.000000000 +0000 -+++ src/tclhash.c -@@ -109,7 +109,7 @@ static inline void tcl_bind_list_delete( - 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/chat/eggdrop/patches/patch-src_tclhash.h b/chat/eggdrop/patches/patch-src_tclhash.h deleted file mode 100644 index d03481152d33b..0000000000000 --- a/chat/eggdrop/patches/patch-src_tclhash.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_tclhash.h,v 1.1 2012/11/16 00:35:28 joerg Exp $ - ---- src/tclhash.h.orig 2012-11-15 10:32:27.000000000 +0000 -+++ src/tclhash.h -@@ -75,7 +75,7 @@ typedef struct tcl_bind_list_b { - - #ifndef MAKING_MODS - --inline void garbage_collect_tclhash(void); -+void garbage_collect_tclhash(void); - - void init_bind(void); - void kill_bind(void);