Attachment 255971 Details for Bug 283431 – the patch file

[patch] the patch file

patch-eggdrop.diff (text/plain), 5.15 KB, created by Chris Petrik on 2024-12-20 05:11:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Petrik

Created: 2024-12-20 05:11:25 UTC

Size: 5.15 KB

patch

obsolete

>diff --git a/irc/eggdrop/Makefile b/irc/eggdrop/Makefile
>index e3c87d00436b..8da4f838e351 100644
>--- a/irc/eggdrop/Makefile
>+++ b/irc/eggdrop/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	eggdrop
>-DISTVERSION=	1.9.3
>+DISTVERSION=	1.10.0
> PORTREVISION=	1
> CATEGORIES=	irc
> MASTER_SITES=	https://github.com/eggheads/${PORTNAME}/releases/download/v${DISTVERSION}/
>@@ -11,7 +11,8 @@ WWW=		https://www.eggheads.org/
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		tcl ssl
>+USES=		tcl ssl compiler:c11 cpe
>+USE_GCC=	yes
> 
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-tcllib=${LOCALBASE}/lib/libtcl${TCL_SHLIB_VER}.so \
>@@ -24,6 +25,7 @@ SUB_FILES=	pkg-message
> OPTIONS_DEFINE=	DOCS
> 
> post-patch:
>+	@${REINPLACE_CMD} -e 's|tcl.h|tcl${TCL_VER}/tcl.h|g' ${WRKSRC}/src/mod/python.mod/pycmds.c
> 	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKSRC}/eggdrop.conf \
> 		> ${WRKSRC}/eggdrop.conf.sample
> 
>@@ -97,10 +99,11 @@ do-install:
> 
> do-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-.for f in ABOUT BANS BOTNET BUG-REPORT COMPILE-GUIDE CONTENTS \
>-	FIRST-SCRIPT MODULES PARTYLINE PATCH-HOWTO \
>-	TRICKS Changes1.6 USERS \
>-	tcl-commands.doc
>+.for f in ABOUT ACCOUNTS AUTOSCRIPTS BANS BOTNET BUG-REPORT	\
>+	COMPILE-GUIDE CONTENTS FIRST-SCRIPT IPV6 IRCv3 LEGAL \
>+	modules/MODULES PARTYLINE PATCH-HOWTO PBKDF2 TLS \
>+	TRICKS TWITCH Changes1.9 USERS \
>+	tcl-commands.doc twitch-tcl-commands.doc
> 	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}
> .endfor
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
>diff --git a/irc/eggdrop/distinfo b/irc/eggdrop/distinfo
>index 8a3603b08200..bf8ccf6a5af9 100644
>--- a/irc/eggdrop/distinfo
>+++ b/irc/eggdrop/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1661601129
>-SHA256 (eggdrop-1.9.3.tar.gz) = 658542e8cba4705aeb096b08d8a42d1a994a808c204a4d7050c8a37bd24bc79f
>-SIZE (eggdrop-1.9.3.tar.gz) = 2046726
>+TIMESTAMP = 1734666962
>+SHA256 (eggdrop-1.10.0.tar.gz) = 1f1707eb5023df8e0bcaa53c937e7ce5282fa1f85dc37e11d6ce4aa9d438d752
>+SIZE (eggdrop-1.10.0.tar.gz) = 2215632
>diff --git a/irc/eggdrop/files/patch-eggdrop.conf b/irc/eggdrop/files/patch-eggdrop.conf
>index a8c1635b29dc..b2e3a00a6837 100644
>--- a/irc/eggdrop/files/patch-eggdrop.conf
>+++ b/irc/eggdrop/files/patch-eggdrop.conf
>@@ -1,29 +1,28 @@
>---- eggdrop.conf.orig	2018-12-27 18:51:16 UTC
>-+++ eggdrop.conf
>+--- eggdrop.conf.bak	2024-12-19 22:03:18.314826000 -0600
>++++ eggdrop.conf	2024-12-19 22:11:55.124362000 -0600
> @@ -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
>-@@ -604,7 +604,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 :)
>+@@ -607,7 +607,7 @@
>+ # 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/eggdrop/"
>++set mod-path "%%PREFIX%%/lib/modules/"
>  
>  
>- #### BLOWFISH MODULE ####
>-@@ -1047,6 +1047,11 @@ set servers {
>-   [2001:db8:618:5c0:263::]:6669:password
>-   ssl.example.net:+6697
>- }
>-+
>+ #### PBKDF2 MODULE ####
>+@@ -1082,6 +1082,10 @@
>+ 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
>- 
>- # 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
>+ #### 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/pkg-plist b/irc/eggdrop/pkg-plist
>index 336985511232..923ae93ee118 100644
>--- a/irc/eggdrop/pkg-plist
>+++ b/irc/eggdrop/pkg-plist
>@@ -17,18 +17,27 @@ lib/eggdrop/transfer.so
> lib/eggdrop/uptime.so
> share/man/man1/eggdrop.1.gz
> %%PORTDOCS%%%%DOCSDIR%%/ABOUT
>+%%PORTDOCS%%%%DOCSDIR%%/ACCOUNTS
>+%%PORTDOCS%%%%DOCSDIR%%/AUTOSCRIPTS
> %%PORTDOCS%%%%DOCSDIR%%/BANS
> %%PORTDOCS%%%%DOCSDIR%%/BOTNET
> %%PORTDOCS%%%%DOCSDIR%%/BUG-REPORT
> %%PORTDOCS%%%%DOCSDIR%%/COMPILE-GUIDE
> %%PORTDOCS%%%%DOCSDIR%%/CONTENTS
>-%%PORTDOCS%%%%DOCSDIR%%/Changes1.6
>+%%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%%/PBKDF2
>+%%PORTDOCS%%%%DOCSDIR%%/TLS
>+%%PORTDOCS%%%%DOCSDIR%%/TWITCH
>+%%PORTDOCS%%%%DOCSDIR%%/twitch-tcl-commands.doc
> %%PORTDOCS%%%%DOCSDIR%%/html/index.html
> %%PORTDOCS%%%%DOCSDIR%%/html/search.html
> %%PORTDOCS%%%%DOCSDIR%%/settings/CONTENTS

Actions: View | Diff

Attachments on bug 283431: 255971