pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/chat/eggdrop/patches eggdrop: remove patches that are ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/9d80c7a7080a
branches: trunk
changeset: 377354:9d80c7a7080a
user: wiz <wiz%pkgsrc.org@localhost>
date: Thu Mar 15 06:07:56 2018 +0000
description:
eggdrop: remove patches that are not in distinfo
diffstat:
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-ak | 13 -------
chat/eggdrop/patches/patch-al | 16 --------
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 -------
16 files changed, 0 insertions(+), 344 deletions(-)
diffs (truncated from 408 to 300 lines):
diff -r 519a61360149 -r 9d80c7a7080a chat/eggdrop/patches/patch-aa
--- a/chat/eggdrop/patches/patch-aa Thu Mar 15 05:08:07 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 519a61360149 -r 9d80c7a7080a chat/eggdrop/patches/patch-ab
--- a/chat/eggdrop/patches/patch-ab Thu Mar 15 05:08:07 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 519a61360149 -r 9d80c7a7080a chat/eggdrop/patches/patch-ac
--- a/chat/eggdrop/patches/patch-ac Thu Mar 15 05:08:07 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 519a61360149 -r 9d80c7a7080a chat/eggdrop/patches/patch-ad
--- a/chat/eggdrop/patches/patch-ad Thu Mar 15 05:08:07 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 519a61360149 -r 9d80c7a7080a chat/eggdrop/patches/patch-ae
--- a/chat/eggdrop/patches/patch-ae Thu Mar 15 05:08:07 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 519a61360149 -r 9d80c7a7080a chat/eggdrop/patches/patch-af
--- a/chat/eggdrop/patches/patch-af Thu Mar 15 05:08:07 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 <netdb.h>
-+#include "../server.mod/server.h"
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <unistd.h>
diff -r 519a61360149 -r 9d80c7a7080a chat/eggdrop/patches/patch-ag
--- a/chat/eggdrop/patches/patch-ag Thu Mar 15 05:08:07 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 519a61360149 -r 9d80c7a7080a chat/eggdrop/patches/patch-ah
--- a/chat/eggdrop/patches/patch-ah Thu Mar 15 05:08:07 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 519a61360149 -r 9d80c7a7080a chat/eggdrop/patches/patch-ai
--- a/chat/eggdrop/patches/patch-ai Thu Mar 15 05:08:07 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 519a61360149 -r 9d80c7a7080a chat/eggdrop/patches/patch-ak
--- a/chat/eggdrop/patches/patch-ak Thu Mar 15 05:08:07 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2004/12/03 12:15:54 adam Exp $
-
---- 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 */
Home |
Main Index |
Thread Index |
Old Index