diff options
Diffstat (limited to 'chat')
-rw-r--r-- | chat/eggdrop/DESCR | 21 | ||||
-rw-r--r-- | chat/eggdrop/Makefile | 70 | ||||
-rw-r--r-- | chat/eggdrop/PLIST | 147 | ||||
-rw-r--r-- | chat/eggdrop/distinfo | 20 | ||||
-rw-r--r-- | chat/eggdrop/patches/patch-ab | 52 | ||||
-rw-r--r-- | chat/eggdrop/patches/patch-ac | 12 | ||||
-rw-r--r-- | chat/eggdrop/patches/patch-ae | 19 | ||||
-rw-r--r-- | chat/eggdrop/patches/patch-ag | 6 | ||||
-rw-r--r-- | chat/eggdrop/patches/patch-ai | 22 | ||||
-rw-r--r-- | chat/eggdrop/patches/patch-aj | 12 | ||||
-rw-r--r-- | chat/eggdrop/patches/patch-ak | 20 |
11 files changed, 216 insertions, 185 deletions
diff --git a/chat/eggdrop/DESCR b/chat/eggdrop/DESCR index 095f115f26e..b91ca816fb6 100644 --- a/chat/eggdrop/DESCR +++ b/chat/eggdrop/DESCR @@ -1,12 +1,11 @@ -Eggdrop is an IRC bot, written in C. If you don't know what IRC is, this -is probably not whatever you're looking for! Eggdrop, being a bot, sits -on a channel and takes protective measures: to keep the channel from being -taken over (in the few ways that anything CAN), to recognize banished -users or sites and reject them, to recognize priveledged users and let -them gain ops, etc. +Eggdrop is an IRC bot, written in C. If you don't know what IRC is, this is +probably not whatever you're looking for! Eggdrop, being a bot, sits on a +channel and takes protective measures: to keep the channel from being taken +over (in the few ways that anything CAN), to recognize banished users or sites +and reject them, to recognize priveledged users and let them gain ops, etc. -One of the more unique features of eggdrop is its "party line", accessable -via DCC chat, which allows you to talk to other people lag-free. -Consider it a multi-way DCC chat, or a miniature IRC (complete with -channels). You can link up with other bots and expand the party line -until it actually becomes something very much like IRC, in fact. +One of the more unique features of eggdrop is its "party line", accessable via +DCC chat, which allows you to talk to other people lag-free. Consider it a +multi-way DCC chat, or a miniature IRC (complete with channels). You can link +up with other bots and expand the party line until it actually becomes +something very much like IRC, in fact. diff --git a/chat/eggdrop/Makefile b/chat/eggdrop/Makefile index 3fd51f92cc1..e06904f2ff9 100644 --- a/chat/eggdrop/Makefile +++ b/chat/eggdrop/Makefile @@ -1,23 +1,32 @@ -# $NetBSD: Makefile,v 1.5 2003/04/30 19:43:48 jmmv Exp $ +# $NetBSD: Makefile,v 1.6 2003/05/24 16:43:05 salo Exp $ # -DISTNAME= eggdrop1.6.13 +DISTNAME= eggdrop1.6.15 PKGNAME= ${DISTNAME:S/eggdrop/eggdrop-/} -PKGREVISION= 1 -CATEGORIES= net +CATEGORIES= chat MASTER_SITES= ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/ +EXTRACT_SUFX= .tar.bz2 MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.eggheads.org/ COMMENT= IRC robot with TCL scripting and multi-channel ability -USE_BUILDLINK2= yes -USE_PKGINSTALL= yes -GNU_CONFIGURE= yes +USE_BUILDLINK2= YES +USE_PKGINSTALL= YES +GNU_CONFIGURE= YES -CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ENV+= TCLLIB="${PREFIX}/lib" TCLINC="${PREFIX}/include" -MAKE_ENV+= _OPSYS_RPATH_NAME=${_OPSYS_RPATH_NAME} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ENV+= TCLLIB="${PREFIX}/lib" TCLINC="${PREFIX}/include" + +.include "../../mk/bsd.prefs.mk" + +.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss]) +BUILD_DEFS+= USE_INET6 +CONFIGURE_ARGS+= --enable-ipv6 +PLIST_SUBST+= NOIPV6="@comment " +.else +PLIST_SUBST+= NOIPV6= +.endif EGDIR= ${PREFIX}/share/examples/eggdrop CONF_FILES= ${EGDIR}/eggdrop.conf ${PKG_SYSCONFDIR}/eggdrop.conf @@ -35,37 +44,46 @@ do-install-program: ${INSTALL_MAN} ${WRKSRC}/doc/man1/eggdrop.1 ${PREFIX}/man/man1/ ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/eggdrop.conf.dist.new ${EGDIR}/eggdrop.conf - ${INSTALL_DATA_DIR} ${PREFIX}/share/eggdrop \ - ${PREFIX}/share/eggdrop/help ${PREFIX}/share/eggdrop/language \ - ${PREFIX}/share/eggdrop/scripts ${PREFIX}/share/eggdrop/html \ - ${PREFIX}/share/eggdrop/help/msg ${PREFIX}/share/eggdrop/help/set + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/eggdrop + cd ${WRKSRC}/doc/html && ${INSTALL_DATA} *.html \ + ${PREFIX}/share/doc/html/eggdrop + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/eggdrop + cd ${WRKSRC}/doc && ${INSTALL_DATA} BANS BOTNET MODULES PARTYLINE \ + USERS first_script.txt tcl-commands.doc text-substitutions.doc \ + tricks ${PREFIX}/share/doc/eggdrop + ${INSTALL_DATA_DIR} ${PREFIX}/share/eggdrop + ${INSTALL_DATA_DIR} ${PREFIX}/share/eggdrop/help + ${INSTALL_DATA_DIR} ${PREFIX}/share/eggdrop/language + ${INSTALL_DATA_DIR} ${PREFIX}/share/eggdrop/scripts + ${INSTALL_DATA_DIR} ${PREFIX}/share/eggdrop/help/msg + ${INSTALL_DATA_DIR} ${PREFIX}/share/eggdrop/help/set ${INSTALL_DATA} ${WRKSRC}/language/core.*.lang \ ${PREFIX}/share/eggdrop/language/ - cd ${WRKSRC}/doc && ${INSTALL_DATA} BOTNET tcl-commands.doc tricks \ - ${PREFIX}/share/eggdrop/ - cd ${WRKSRC}/doc/html && ${INSTALL_DATA} *.html ${PREFIX}/share/eggdrop/html cd ${WRKSRC}/help && ${INSTALL_DATA} cmds1.help cmds2.help core.help \ ${PREFIX}/share/eggdrop/help/ - cd ${WRKSRC}/help/set && ${INSTALL_DATA} cmds1.help cmds2.help \ + cd ${WRKSRC}/help/set && ${INSTALL_DATA} cmds1.help \ ${PREFIX}/share/eggdrop/help/set/ - cd ${WRKSRC}/scripts && ${INSTALL_DATA} CONTENTS action.fix.tcl \ - autobotchk alltools.tcl botchk cmd_resolve.tcl compat.tcl getops.tcl \ - klined.tcl notes2.tcl ques5.tcl sentinel.tcl userinfo.tcl weed \ - ${PREFIX}/share/eggdrop/scripts/ + cd ${WRKSRC}/scripts && ${INSTALL_DATA} CONTENTS *.tcl autobotchk \ + botchk weed ${PREFIX}/share/eggdrop/scripts/ .include "../../lang/tcl/buildlink2.mk" .include "../../mk/bsd.pkg.mk" .if defined(NOPIC) ALL_TARGET= static +PLIST_SUBST+= NOPIC="@comment " .else +PLIST_SUBST+= NOPIC= do-install: do-install-modules do-install-modules: ${INSTALL_DATA_DIR} ${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 \ - ${PREFIX}/lib/eggdrop/ + compress.so console.so ctcp.so filesys.so irc.so notes.so \ + seen.so server.so share.so transfer.so uptime.so wire.so \ + ${PREFIX}/lib/eggdrop +.if !defined(USE_INET6) || empty(USE_INET6:M[Yy][Ee][Ss]) + ${INSTALL_DATA} dns.so ${PREFIX}/lib/eggdrop +.endif cd ${WRKSRC}/src/mod && ${FIND} . -name "*.lang" -exec ${INSTALL_DATA} "{}" \ - ${PREFIX}/share/eggdrop/language/ ";" + ${PREFIX}/share/eggdrop/language ";" .endif diff --git a/chat/eggdrop/PLIST b/chat/eggdrop/PLIST index 7edcf773f9b..df18c0f80c8 100644 --- a/chat/eggdrop/PLIST +++ b/chat/eggdrop/PLIST @@ -1,82 +1,98 @@ -@comment $NetBSD: PLIST,v 1.5 2003/04/30 19:43:48 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.6 2003/05/24 16:43:05 salo Exp $ bin/eggdrop -lib/eggdrop/assoc.so -lib/eggdrop/blowfish.so -lib/eggdrop/channels.so -lib/eggdrop/compress.so -lib/eggdrop/console.so -lib/eggdrop/ctcp.so -lib/eggdrop/dns.so -lib/eggdrop/filesys.so -lib/eggdrop/irc.so -lib/eggdrop/notes.so -lib/eggdrop/seen.so -lib/eggdrop/server.so -lib/eggdrop/share.so -lib/eggdrop/transfer.so -lib/eggdrop/uptime.so -lib/eggdrop/wire.so +${NOPIC}lib/eggdrop/assoc.so +${NOPIC}lib/eggdrop/blowfish.so +${NOPIC}lib/eggdrop/channels.so +${NOPIC}lib/eggdrop/compress.so +${NOPIC}lib/eggdrop/console.so +${NOPIC}lib/eggdrop/ctcp.so +${NOIPV6}${NOPIC}lib/eggdrop/dns.so +${NOPIC}lib/eggdrop/filesys.so +${NOPIC}lib/eggdrop/irc.so +${NOPIC}lib/eggdrop/notes.so +${NOPIC}lib/eggdrop/seen.so +${NOPIC}lib/eggdrop/server.so +${NOPIC}lib/eggdrop/share.so +${NOPIC}lib/eggdrop/transfer.so +${NOPIC}lib/eggdrop/uptime.so +${NOPIC}lib/eggdrop/wire.so man/man1/eggdrop.1 -share/eggdrop/BOTNET +share/doc/eggdrop/BANS +share/doc/eggdrop/BOTNET +share/doc/eggdrop/MODULES +share/doc/eggdrop/PARTYLINE +share/doc/eggdrop/USERS +share/doc/eggdrop/first_script.txt +share/doc/eggdrop/tcl-commands.doc +share/doc/eggdrop/text-substitutions.doc +share/doc/eggdrop/tricks +share/doc/html/eggdrop/about.html +share/doc/html/eggdrop/app-problems.html +share/doc/html/eggdrop/app-textsub.html +share/doc/html/eggdrop/app-tricks.html +share/doc/html/eggdrop/app-weird.html +share/doc/html/eggdrop/authors.html +share/doc/html/eggdrop/bans.html +share/doc/html/eggdrop/botnet.html +share/doc/html/eggdrop/compiling.html +share/doc/html/eggdrop/egg-core.html +share/doc/html/eggdrop/faqs.html +share/doc/html/eggdrop/features.html +share/doc/html/eggdrop/index.html +share/doc/html/eggdrop/install.html +share/doc/html/eggdrop/ipv6.html +share/doc/html/eggdrop/mod-assoc.html +share/doc/html/eggdrop/mod-blowfish.html +share/doc/html/eggdrop/mod-channels.html +share/doc/html/eggdrop/mod-compress.html +share/doc/html/eggdrop/mod-console.html +share/doc/html/eggdrop/mod-ctcp.html +share/doc/html/eggdrop/mod-dns.html +share/doc/html/eggdrop/mod-filesys.html +share/doc/html/eggdrop/mod-irc.html +share/doc/html/eggdrop/mod-notes.html +share/doc/html/eggdrop/mod-seen.html +share/doc/html/eggdrop/mod-server.html +share/doc/html/eggdrop/mod-share.html +share/doc/html/eggdrop/mod-uptime.html +share/doc/html/eggdrop/mod-wire.html +share/doc/html/eggdrop/mod-woobie.html +share/doc/html/eggdrop/news.html +share/doc/html/eggdrop/party.html +share/doc/html/eggdrop/patch-howto.html +share/doc/html/eggdrop/readme.html +share/doc/html/eggdrop/starting.html +share/doc/html/eggdrop/tcl-commands.html +share/doc/html/eggdrop/users.html share/eggdrop/help/cmds1.help share/eggdrop/help/cmds2.help share/eggdrop/help/core.help share/eggdrop/help/set/cmds1.help -share/eggdrop/help/set/cmds2.help -share/eggdrop/html/about.html -share/eggdrop/html/app-problems.html -share/eggdrop/html/app-textsub.html -share/eggdrop/html/app-tricks.html -share/eggdrop/html/app-weird.html -share/eggdrop/html/authors.html -share/eggdrop/html/bans.html -share/eggdrop/html/botnet.html -share/eggdrop/html/compiling.html -share/eggdrop/html/egg-core.html -share/eggdrop/html/faqs.html -share/eggdrop/html/features.html -share/eggdrop/html/index.html -share/eggdrop/html/install.html -share/eggdrop/html/mod-assoc.html -share/eggdrop/html/mod-blowfish.html -share/eggdrop/html/mod-channels.html -share/eggdrop/html/mod-compress.html -share/eggdrop/html/mod-console.html -share/eggdrop/html/mod-ctcp.html -share/eggdrop/html/mod-dns.html -share/eggdrop/html/mod-filesys.html -share/eggdrop/html/mod-irc.html -share/eggdrop/html/mod-notes.html -share/eggdrop/html/mod-seen.html -share/eggdrop/html/mod-server.html -share/eggdrop/html/mod-share.html -share/eggdrop/html/mod-uptime.html -share/eggdrop/html/mod-wire.html -share/eggdrop/html/mod-woobie.html -share/eggdrop/html/news.html -share/eggdrop/html/party.html -share/eggdrop/html/patch-howto.html -share/eggdrop/html/readme.html -share/eggdrop/html/starting.html -share/eggdrop/html/tcl-commands.html -share/eggdrop/html/users.html -share/eggdrop/language/core.english.lang -share/eggdrop/language/core.french.lang -share/eggdrop/language/core.german.lang +share/eggdrop/language/assoc.danish.lang share/eggdrop/language/assoc.english.lang share/eggdrop/language/assoc.french.lang share/eggdrop/language/assoc.german.lang +share/eggdrop/language/console.danish.lang share/eggdrop/language/console.english.lang share/eggdrop/language/console.french.lang share/eggdrop/language/console.german.lang +share/eggdrop/language/core.danish.lang +share/eggdrop/language/core.english.lang +share/eggdrop/language/core.french.lang +share/eggdrop/language/core.german.lang +share/eggdrop/language/filesys.danish.lang share/eggdrop/language/filesys.english.lang share/eggdrop/language/filesys.french.lang share/eggdrop/language/filesys.german.lang +share/eggdrop/language/notes.danish.lang share/eggdrop/language/notes.english.lang share/eggdrop/language/notes.french.lang share/eggdrop/language/notes.german.lang +share/eggdrop/language/transfer.danish.lang share/eggdrop/language/transfer.english.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.french.lang share/eggdrop/language/wire.german.lang @@ -94,16 +110,15 @@ share/eggdrop/scripts/ques5.tcl share/eggdrop/scripts/sentinel.tcl share/eggdrop/scripts/userinfo.tcl share/eggdrop/scripts/weed -share/eggdrop/tcl-commands.doc -share/eggdrop/tricks share/examples/eggdrop/eggdrop.conf -@comment The directory does not exist for NOPIC, so don't issue an error. -@unexec rmdir %D/lib/eggdrop 2>/dev/null || ${TRUE} @dirrm share/examples/eggdrop +@dirrm share/eggdrop/scripts +@dirrm share/eggdrop/language @dirrm share/eggdrop/help/set +@exec ${MKDIR} %D/share/eggdrop/help/msg @dirrm share/eggdrop/help/msg @dirrm share/eggdrop/help -@dirrm share/eggdrop/html -@dirrm share/eggdrop/language -@dirrm share/eggdrop/scripts @dirrm share/eggdrop +@dirrm share/doc/html/eggdrop +@dirrm share/doc/eggdrop +${NOPIC}@dirrm lib/eggdrop diff --git a/chat/eggdrop/distinfo b/chat/eggdrop/distinfo index f62b36c4fb9..e43f306e24f 100644 --- a/chat/eggdrop/distinfo +++ b/chat/eggdrop/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.4 2003/04/30 19:43:48 jmmv Exp $ +$NetBSD: distinfo,v 1.5 2003/05/24 16:43:05 salo Exp $ -SHA1 (eggdrop1.6.13.tar.gz) = f20998dc46db0edcab9a28a20238a3dd0c390aa6 -Size (eggdrop1.6.13.tar.gz) = 935160 bytes +SHA1 (eggdrop1.6.15.tar.bz2) = 8740800b066b35c745c7e753e7f58daac9929f3a +Size (eggdrop1.6.15.tar.bz2) = 760615 bytes SHA1 (patch-aa) = 25f5b1202a8eee7cd04c5830256f280eec6fbb1e -SHA1 (patch-ab) = 64c28f71ceb364a572f22a78d2b3b6dedea4fb74 -SHA1 (patch-ac) = 7c93cbaed27ee26950005d04ea14eb2c1b19db7b +SHA1 (patch-ab) = 87c5697a2b33488b96c0f457414187e6caa5881b +SHA1 (patch-ac) = a1c5648e2748f5efbcb890b5ed8a3e8faac5f0a5 SHA1 (patch-ad) = 8b9f740e82d44df7daeede770fce7f5add751407 -SHA1 (patch-ae) = 8676f61d7cee954a4c5446ace528f1e3292a8cc0 -SHA1 (patch-ag) = b8401e66d1e268a7e353b9be29cd49c862cb2d32 +SHA1 (patch-ae) = 370fe00ada6b9432483ab3e0ef9c349f7c7dd00f +SHA1 (patch-ag) = ab193737668ff9c0bdfbfa1b21678356a505bb41 SHA1 (patch-ah) = b9f6e10f0a1a8f73f014ceae5015dc157f8fe124 -SHA1 (patch-ai) = fa86f94b90ba474fdefbdc98ec5a7bd4d3971b3d -SHA1 (patch-aj) = aa68629454ec74fdb7bd63f61bed133686ca794d -SHA1 (patch-ak) = cc4b4cc35fd7c5ede4964d97171d11aaa05225d5 +SHA1 (patch-ai) = 0bbf9e3be1368897e2a9399c9ea58f28c8f84e0c +SHA1 (patch-aj) = 7701eefed77228fe46360bea717403314386de03 +SHA1 (patch-ak) = c2239684483a78dd294055c4f14239cae531d056 diff --git a/chat/eggdrop/patches/patch-ab b/chat/eggdrop/patches/patch-ab index 1d4636a5551..2b1451b8d8c 100644 --- a/chat/eggdrop/patches/patch-ab +++ b/chat/eggdrop/patches/patch-ab @@ -1,41 +1,41 @@ -$NetBSD: patch-ab,v 1.2 2003/04/30 19:43:49 jmmv Exp $ +$NetBSD: patch-ab,v 1.3 2003/05/24 16:43:05 salo Exp $ ---- src/main.c.orig Sun Jul 15 09:15:14 2001 -+++ src/main.c Thu Nov 1 12:55:48 2001 -@@ -61,7 +61,7 @@ +--- src/main.c.orig 2003-05-04 22:15:53.000000000 +0200 ++++ src/main.c 2003-05-24 16:56:20.000000000 +0200 +@@ -70,7 +70,7 @@ #define _POSIX_SOURCE 1 #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; - extern struct dcc_t *dcc; -@@ -94,7 +94,7 @@ - stats? */ - int term_z = 0; /* Foreground: use the terminal as a party - line? */ --char configfile[121] = "eggdrop.conf"; /* Name of the config file */ -+char configfile[121] = __PKG_SYSCONFDIR__ "/eggdrop.conf"; - char helpdir[121]; /* Directory of help files (if used) */ - char textdir[121] = ""; /* Directory for text files that get dumped */ - int keep_all_logs = 0; /* Never erase logfiles, no matter how old -@@ -709,6 +709,8 @@ - setrlimit(RLIMIT_CORE, &cdlim); +-extern char origbotname[], userfile[], botnetnick[]; ++extern char origbotname[], userfile[], botnetnick[], tempdir[]; + extern int dcc_total, conmask, cache_hit, cache_miss, max_logs, quick_logs; + extern struct dcc_t *dcc; + extern struct userrec *userlist; +@@ -101,7 +101,7 @@ + * stats? */ + int term_z = 0; /* Foreground: use the terminal as a party + * line? */ +-char configfile[121] = "eggdrop.conf"; /* Name of the config file */ ++char configfile[121] = __PKG_SYSCONFDIR__ "eggdrop.conf"; /* Name of the config file */ + char helpdir[121] = "help/"; /* Directory of help files (if used) */ + char textdir[121] = "text/"; /* Directory for text files that get dumped */ + int keep_all_logs = 0; /* Never erase logfiles, no matter how old +@@ -735,6 +735,8 @@ } #endif -+ -+ chdir(__PREFIX__ "/share/eggdrop"); ++ chdir(__PREFIX__ "/share/eggdrop"); ++ /* Initialise context list */ for (i = 0; i < 16; i++) -@@ -809,7 +809,8 @@ + Context; +@@ -834,7 +836,8 @@ 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); +- 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 index c3cd5eb5ccb..1e34e3b6fdc 100644 --- a/chat/eggdrop/patches/patch-ac +++ b/chat/eggdrop/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.2 2003/04/30 19:43:49 jmmv Exp $ +$NetBSD: patch-ac,v 1.3 2003/05/24 16:43:05 salo Exp $ ---- src/Makefile.in.orig 2000-11-23 04:56:40.000000000 +0100 -+++ src/Makefile.in +--- src/Makefile.in.orig 2003-05-04 22:15:53.000000000 +0200 ++++ src/Makefile.in 2003-05-24 16:58:42.000000000 +0200 @@ -4,6 +4,7 @@ SHELL = @SHELL@ top_srcdir = @top_srcdir@ @@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.2 2003/04/30 19:43:49 jmmv Exp $ VPATH = @srcdir@ @SET_MAKE@ -@@ -16,7 +17,7 @@ CC = @CC@ +@@ -16,7 +17,7 @@ LD = @CC@ STRIP = @STRIP@ CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) @DEFS@ $(CFLGS) @@ -18,8 +18,8 @@ $NetBSD: patch-ac,v 1.2 2003/04/30 19:43:49 jmmv Exp $ +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 main.o mem.o misc.o misc_file.o \ -@@ -37,7 +38,7 @@ doofus: + dccutil.o dns.o flags.o language.o match.o main.o mem.o misc.o misc_file.o \ +@@ -37,7 +38,7 @@ @echo "Linking eggdrop... $(EGGBUILD)" @echo "" @touch mod/mod.xlibs diff --git a/chat/eggdrop/patches/patch-ae b/chat/eggdrop/patches/patch-ae index b19c1a3c137..88c8bdc6026 100644 --- a/chat/eggdrop/patches/patch-ae +++ b/chat/eggdrop/patches/patch-ae @@ -1,16 +1,15 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/06/26 03:48:14 kent Exp $ +$NetBSD: patch-ae,v 1.2 2003/05/24 16:43:05 salo Exp $ ---- src/mod/ctcp.mod/ctcp.c.orig Wed Dec 9 23:18:06 1998 -+++ src/mod/ctcp.mod/ctcp.c Wed Dec 9 23:18:55 1998 -@@ -155,9 +155,9 @@ +--- src/mod/ctcp.mod/ctcp.c.orig 2003-05-04 22:15:53.000000000 +0200 ++++ src/mod/ctcp.mod/ctcp.c 2003-05-24 17:01:36.000000000 +0200 +@@ -160,8 +160,8 @@ /* 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", -+ dprintf(DP_SERVER, "PRIVMSG %s :\001DCC CHAT chat %u %u\001\n", - nick, -- iptolong(natip[0] ? (IP) inet_addr(natip) : getmyip()), -+ (unsigned)iptolong(natip[0] ? (IP) inet_addr(natip) : getmyip()), - dcc[i].port); +- 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-ag b/chat/eggdrop/patches/patch-ag index db38040bf0d..7368af9184b 100644 --- a/chat/eggdrop/patches/patch-ag +++ b/chat/eggdrop/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.3 2003/01/16 08:23:47 salo Exp $ +$NetBSD: patch-ag,v 1.4 2003/05/24 16:43:06 salo Exp $ --- Makefile.in.orig Tue Feb 27 20:06:27 2001 +++ Makefile.in Fri Nov 2 11:40:10 2001 @@ -7,7 +7,7 @@ $NetBSD: patch-ag,v 1.3 2003/01/16 08:23:47 salo Exp $ # make modules SHLIB_CC = @SHLIB_CC@ -SHLIB_LD = @SHLIB_LD@ -+SHLIB_LD = @SHLIB_LD@ $(_OPSYS_RPATH_NAME)@TCLLIB@ ++SHLIB_LD = @SHLIB_LD@ $(RPATH_FLAG)@TCLLIB@ SHLIB_STRIP = @SHLIB_STRIP@ MOD_EXT = @MOD_EXT@ @@ -15,7 +15,7 @@ $NetBSD: patch-ag,v 1.3 2003/01/16 08:23:47 salo Exp $ # stuff for Tcl XREQS = @TCL_REQS@ XLIBS = @TCL_LIBS@ @LIBS@ -+XLDFLAGS = -Wl,$(_OPSYS_RPATH_NAME)@TCLLIB@ ++XLDFLAGS = -Wl,$(RPATH_FLAG)@TCLLIB@ TCLLIB = @TCLLIB@ TCLLIBFN = @TCLLIBFN@ diff --git a/chat/eggdrop/patches/patch-ai b/chat/eggdrop/patches/patch-ai index 38d2e5536cb..0b83eed669c 100644 --- a/chat/eggdrop/patches/patch-ai +++ b/chat/eggdrop/patches/patch-ai @@ -1,25 +1,25 @@ -$NetBSD: patch-ai,v 1.1.1.1 2002/06/26 03:48:14 kent Exp $ +$NetBSD: patch-ai,v 1.2 2003/05/24 16:43:06 salo Exp $ ---- src/mod/share.mod/share.c.orig Tue Jul 17 23:53:42 2001 -+++ src/mod/share.mod/share.c Fri Nov 2 18:37:15 2001 -@@ -1121,7 +1123,8 @@ +--- src/mod/share.mod/share.c.orig 2003-05-04 22:15:53.000000000 +0200 ++++ src/mod/share.mod/share.c 2003-05-24 17:05:28.000000000 +0200 +@@ -1113,7 +1113,8 @@ int i, sock; FILE *f; - egg_snprintf(s, sizeof s, ".share.%s.%lu.users", botnetnick, now); -+ egg_snprintf(s, sizeof s, "%.100s/.share.%.32s.%lu.users", -+ tempdir, 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"); -@@ -1890,8 +1893,8 @@ +@@ -1883,8 +1884,8 @@ 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); +- 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); + dcc[idx].nick); diff --git a/chat/eggdrop/patches/patch-aj b/chat/eggdrop/patches/patch-aj index 9d1c5dab9b0..14b000b7ee4 100644 --- a/chat/eggdrop/patches/patch-aj +++ b/chat/eggdrop/patches/patch-aj @@ -1,13 +1,13 @@ -$NetBSD: patch-aj,v 1.1.1.1 2002/06/26 03:48:14 kent Exp $ +$NetBSD: patch-aj,v 1.2 2003/05/24 16:43:06 salo Exp $ ---- src/mod/Makefile.in.orig Sat Feb 2 18:14:30 2002 -+++ src/mod/Makefile.in Sat Feb 2 21:03:57 2002 -@@ -86,7 +86,7 @@ +--- src/mod/Makefile.in.orig 2003-05-04 22:15:53.000000000 +0200 ++++ src/mod/Makefile.in 2003-05-24 17:07:41.000000000 +0200 +@@ -87,7 +87,7 @@ echo "Configuring module $${modname} ..."; \ echo ""; \ if test ! -d $$i; then mkdir $$i; fi; \ -- (cd $$i && $(MOD_UPDIR)$(srcdir)/$$i/configure $(egg_ac_parameters) --cache-file=../../../config.cache --srcdir=$(MOD_UPDIR)$(top_srcdir)/src/mod/$$i); \ -+ (cd $$i && $(MOD_UPDIR)$(srcdir)/$$i/configure "$(egg_ac_parameters)" --cache-file=../../../config.cache --srcdir=$(MOD_UPDIR)$(top_srcdir)/src/mod/$$i); \ +- (cd $$i && $(MOD_UPDIR)$(srcdir)/$$i/configure $(egg_ac_parameters) $(ENABLEIPV6) --cache-file=../../../config.cache --srcdir=$(MOD_UPDIR)$(top_srcdir)/src/mod/$$i); \ ++ (cd $$i && $(MOD_UPDIR)$(srcdir)/$$i/configure "$(egg_ac_parameters)" $(ENABLEIPV6) --cache-file=../../../config.cache --srcdir=$(MOD_UPDIR)$(top_srcdir)/src/mod/$$i); \ fi; \ done; \ echo "" diff --git a/chat/eggdrop/patches/patch-ak b/chat/eggdrop/patches/patch-ak index 5f66434f1eb..c8abc1a9feb 100644 --- a/chat/eggdrop/patches/patch-ak +++ b/chat/eggdrop/patches/patch-ak @@ -1,13 +1,13 @@ -$NetBSD: patch-ak,v 1.1 2002/09/25 18:32:10 wiz Exp $ +$NetBSD: patch-ak,v 1.2 2003/05/24 16:43:06 salo Exp $ ---- src/eggdrop.h.orig Fri Mar 29 22:40:24 2002 -+++ src/eggdrop.h Sun Aug 18 22:51:25 2002 -@@ -68,7 +68,7 @@ +--- src/eggdrop.h.orig 2003-05-04 22:15:53.000000000 +0200 ++++ src/eggdrop.h 2003-05-24 17:09:54.000000000 +0200 +@@ -85,7 +85,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. */ + /* 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. */ |