git: 05a83aacaabf - main - irc/eggdrop: Update to 1.10.1 and update maintainer

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Bernhard Froehlich <decke_at_FreeBSD.org>
Date: Sun, 28 Sep 2025 07:40:13 UTC
The branch main has been updated by decke:

URL: https://cgit.FreeBSD.org/ports/commit/?id=05a83aacaabfcfe1d3e65bc6d6c4975a514aa97b

commit 05a83aacaabfcfe1d3e65bc6d6c4975a514aa97b
Author:     ek <ek@purplehat.org>
AuthorDate: 2025-09-28 07:37:37 +0000
Commit:     Bernhard Froehlich <decke@FreeBSD.org>
CommitDate: 2025-09-28 07:39:35 +0000

    irc/eggdrop: Update to 1.10.1 and update maintainer
    
    PR:             289280
    Approved by:    Chris Petrik <cpetrik@proton.me> (maintainer)
    Event:          EuroBSDCon 2025
---
 irc/eggdrop/Makefile                                | 11 +++++------
 irc/eggdrop/distinfo                                |  6 +++---
 irc/eggdrop/files/patch-eggdrop.conf                | 19 +++++++++++--------
 irc/eggdrop/files/patch-src_mod_python.mod_pycmds.c | 10 ----------
 irc/eggdrop/pkg-plist                               | 18 ++++++++++--------
 5 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/irc/eggdrop/Makefile b/irc/eggdrop/Makefile
index 2569c3eaecda..54959f159a93 100644
--- a/irc/eggdrop/Makefile
+++ b/irc/eggdrop/Makefile
@@ -1,10 +1,9 @@
 PORTNAME=	eggdrop
-DISTVERSION=	1.10.0
-PORTREVISION=	1
+DISTVERSION=	1.10.1
 CATEGORIES=	irc
 MASTER_SITES=	https://github.com/eggheads/${PORTNAME}/releases/download/v${DISTVERSION}/
 
-MAINTAINER=	cpetrik@proton.me
+MAINTAINER=	ek@purplehat.org
 COMMENT=	Popular Internet Relay Chat (IRC) bot
 WWW=		https://www.eggheads.org/
 
@@ -24,8 +23,7 @@ SUB_FILES=	pkg-message
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKSRC}/eggdrop.conf \
-		> ${WRKSRC}/eggdrop.conf.sample
+	${REINPLACE_CMD} "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/eggdrop.conf
 
 post-configure:
 	@(cd ${WRKSRC}; ${MAKE} config)
@@ -33,7 +31,8 @@ post-configure:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/eggdrop ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/man1/eggdrop.1 ${STAGEDIR}${PREFIX}/share/man/man1
-	${INSTALL_DATA} ${WRKSRC}/eggdrop.conf.sample ${STAGEDIR}${PREFIX}/etc
+	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/eggdrop.conf ${STAGEDIR}${ETCDIR}/eggdrop.conf.sample
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/eggdrop
 .for f in 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 \
diff --git a/irc/eggdrop/distinfo b/irc/eggdrop/distinfo
index bf8ccf6a5af9..f38833b6497e 100644
--- a/irc/eggdrop/distinfo
+++ b/irc/eggdrop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1734666962
-SHA256 (eggdrop-1.10.0.tar.gz) = 1f1707eb5023df8e0bcaa53c937e7ce5282fa1f85dc37e11d6ce4aa9d438d752
-SIZE (eggdrop-1.10.0.tar.gz) = 2215632
+TIMESTAMP = 1756875018
+SHA256 (eggdrop-1.10.1.tar.gz) = a5cdf7444d781c2ff4f5d0be14202f5d0971e00387181a49b725057fe95312d5
+SIZE (eggdrop-1.10.1.tar.gz) = 2204296
diff --git a/irc/eggdrop/files/patch-eggdrop.conf b/irc/eggdrop/files/patch-eggdrop.conf
index b2e3a00a6837..41fa5142da57 100644
--- a/irc/eggdrop/files/patch-eggdrop.conf
+++ b/irc/eggdrop/files/patch-eggdrop.conf
@@ -1,28 +1,31 @@
---- eggdrop.conf.bak	2024-12-19 22:03:18.314826000 -0600
-+++ eggdrop.conf	2024-12-19 22:11:55.124362000 -0600
+--- eggdrop.conf.orig	2025-09-03 05:57:58 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.
  #
  # This is a sample Eggdrop configuration file which includes all possible
-@@ -607,7 +607,7 @@
+@@ -607,9 +607,8 @@ die "Please make sure you edit your config file comple
  # This path specifies the path were Eggdrop should look for its modules.
  # If you use 'make install' (like all good kiddies do ;), this is a fine
  # default. Otherwise, use your head :)
 -set mod-path "modules/"
-+set mod-path "%%PREFIX%%/lib/modules/"
- 
++set mod-path "%%PREFIX%%/lib/eggdrop/"
  
+-
  #### PBKDF2 MODULE ####
-@@ -1082,6 +1082,10 @@
+ 
+ # IF YOU DON'T READ THIS YOU MAY RENDER YOUR USERFILE USELESS LATER
+@@ -1081,6 +1080,11 @@ server add ssl.example.net +7000
+ server add another.example.com 6669 password
  server add 2001:db8:618:5c0:263:: 6669 password
  server add 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
+ 
  #### CAP Features ####
  # This section controls IRCv3 capabilities supported natively by Eggdrop. You
- # can enable individual settings here to be requested as part of the
diff --git a/irc/eggdrop/files/patch-src_mod_python.mod_pycmds.c b/irc/eggdrop/files/patch-src_mod_python.mod_pycmds.c
deleted file mode 100644
index c0534cbd452e..000000000000
--- a/irc/eggdrop/files/patch-src_mod_python.mod_pycmds.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/mod/python.mod/pycmds.c.orig	2025-02-04 15:24:41 UTC
-+++ src/mod/python.mod/pycmds.c
-@@ -22,7 +22,6 @@
- #define PY_SSIZE_T_CLEAN
- #include <Python.h>
- #include <datetime.h>
--#include <tcl.h>
- #include "src/mod/module.h"
- 
- typedef struct {
diff --git a/irc/eggdrop/pkg-plist b/irc/eggdrop/pkg-plist
index 923ae93ee118..396e499575df 100644
--- a/irc/eggdrop/pkg-plist
+++ b/irc/eggdrop/pkg-plist
@@ -1,5 +1,7 @@
 bin/eggdrop
-etc/eggdrop.conf.sample
+@mode 0640
+@sample %%ETCDIR%%/eggdrop.conf.sample
+@mode
 lib/eggdrop/assoc.so
 lib/eggdrop/blowfish.so
 lib/eggdrop/channels.so
@@ -15,7 +17,6 @@ lib/eggdrop/server.so
 lib/eggdrop/share.so
 lib/eggdrop/transfer.so
 lib/eggdrop/uptime.so
-share/man/man1/eggdrop.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/ABOUT
 %%PORTDOCS%%%%DOCSDIR%%/ACCOUNTS
 %%PORTDOCS%%%%DOCSDIR%%/AUTOSCRIPTS
@@ -26,18 +27,17 @@ share/man/man1/eggdrop.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/CONTENTS
 %%PORTDOCS%%%%DOCSDIR%%/Changes1.9
 %%PORTDOCS%%%%DOCSDIR%%/FIRST-SCRIPT
-%%PORTDOCS%%%%DOCSDIR%%/MODULES
-%%PORTDOCS%%%%DOCSDIR%%/PARTYLINE
-%%PORTDOCS%%%%DOCSDIR%%/PATCH-HOWTO
-%%PORTDOCS%%%%DOCSDIR%%/TRICKS
-%%PORTDOCS%%%%DOCSDIR%%/USERS
 %%PORTDOCS%%%%DOCSDIR%%/IPV6
 %%PORTDOCS%%%%DOCSDIR%%/IRCv3
 %%PORTDOCS%%%%DOCSDIR%%/LEGAL
+%%PORTDOCS%%%%DOCSDIR%%/MODULES
+%%PORTDOCS%%%%DOCSDIR%%/PARTYLINE
+%%PORTDOCS%%%%DOCSDIR%%/PATCH-HOWTO
 %%PORTDOCS%%%%DOCSDIR%%/PBKDF2
 %%PORTDOCS%%%%DOCSDIR%%/TLS
+%%PORTDOCS%%%%DOCSDIR%%/TRICKS
 %%PORTDOCS%%%%DOCSDIR%%/TWITCH
-%%PORTDOCS%%%%DOCSDIR%%/twitch-tcl-commands.doc
+%%PORTDOCS%%%%DOCSDIR%%/USERS
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/search.html
 %%PORTDOCS%%%%DOCSDIR%%/settings/CONTENTS
@@ -60,6 +60,7 @@ share/man/man1/eggdrop.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/settings/mod.uptime
 %%PORTDOCS%%%%DOCSDIR%%/settings/mod.woobie
 %%PORTDOCS%%%%DOCSDIR%%/tcl-commands.doc
+%%PORTDOCS%%%%DOCSDIR%%/twitch-tcl-commands.doc
 %%DATADIR%%/help/assoc.help
 %%DATADIR%%/help/chaninfo.help
 %%DATADIR%%/help/channels.help
@@ -153,3 +154,4 @@ share/man/man1/eggdrop.1.gz
 %%DATADIR%%/scripts/weed
 %%DATADIR%%/text/banner
 %%DATADIR%%/text/motd
+share/man/man1/eggdrop.1.gz