From 95ce06903427ddcba813e7470b684b27f4958302 Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Sat, 5 Aug 2006 13:42:18 +0000
Subject: - Update to 1.6.18
PR: ports/101194
Submitted by: KATO Tsuguru <tkato432(at)yahoo.com>
Approved by: krion (mentor)
---
irc/eggdrop/Makefile | 114 ++++++++++++---------
irc/eggdrop/distinfo | 12 +--
irc/eggdrop/files/patch-ab | 37 -------
irc/eggdrop/files/patch-ac | 10 --
irc/eggdrop/files/patch-ad | 11 --
irc/eggdrop/files/patch-ae | 13 ---
irc/eggdrop/files/patch-ah | 8 --
irc/eggdrop/files/patch-ai | 22 ----
irc/eggdrop/files/patch-aj | 11 --
irc/eggdrop/files/patch-ak | 9 --
irc/eggdrop/files/patch-eggdrop.conf | 4 +-
irc/eggdrop/files/patch-src::md5::md5c.c | 18 ----
irc/eggdrop/files/patch-src__Makefile.in | 11 ++
irc/eggdrop/files/patch-src__eggdrop.h | 9 ++
irc/eggdrop/files/patch-src__main.c | 37 +++++++
irc/eggdrop/files/patch-src__md5__md5c.c | 18 ++++
irc/eggdrop/files/patch-src__mod__Makefile.in | 11 ++
irc/eggdrop/files/patch-src__mod__ctcp.mod__ctcp.c | 13 +++
.../files/patch-src__mod__filesys.mod__filesys.c | 11 ++
.../files/patch-src__mod__share.mod__share.c | 22 ++++
irc/eggdrop/files/patch-src__modules.c | 8 ++
irc/eggdrop/files/pkg-message.in | 10 ++
irc/eggdrop/pkg-message | 10 --
irc/eggdrop/pkg-plist | 14 +--
24 files changed, 229 insertions(+), 214 deletions(-)
delete mode 100644 irc/eggdrop/files/patch-ab
delete mode 100644 irc/eggdrop/files/patch-ac
delete mode 100644 irc/eggdrop/files/patch-ad
delete mode 100644 irc/eggdrop/files/patch-ae
delete mode 100644 irc/eggdrop/files/patch-ah
delete mode 100644 irc/eggdrop/files/patch-ai
delete mode 100644 irc/eggdrop/files/patch-aj
delete mode 100644 irc/eggdrop/files/patch-ak
delete mode 100644 irc/eggdrop/files/patch-src::md5::md5c.c
create mode 100644 irc/eggdrop/files/patch-src__Makefile.in
create mode 100644 irc/eggdrop/files/patch-src__eggdrop.h
create mode 100644 irc/eggdrop/files/patch-src__main.c
create mode 100644 irc/eggdrop/files/patch-src__md5__md5c.c
create mode 100644 irc/eggdrop/files/patch-src__mod__Makefile.in
create mode 100644 irc/eggdrop/files/patch-src__mod__ctcp.mod__ctcp.c
create mode 100644 irc/eggdrop/files/patch-src__mod__filesys.mod__filesys.c
create mode 100644 irc/eggdrop/files/patch-src__mod__share.mod__share.c
create mode 100644 irc/eggdrop/files/patch-src__modules.c
create mode 100644 irc/eggdrop/files/pkg-message.in
delete mode 100644 irc/eggdrop/pkg-message
(limited to 'irc/eggdrop')
diff --git a/irc/eggdrop/Makefile b/irc/eggdrop/Makefile
index b6c266cc2569..74ef74b73a76 100644
--- a/irc/eggdrop/Makefile
+++ b/irc/eggdrop/Makefile
@@ -6,26 +6,28 @@
#
PORTNAME= eggdrop
-PORTVERSION= 1.6.17
+PORTVERSION= 1.6.18
CATEGORIES= irc tcl84
MASTER_SITES= ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/
DISTNAME= ${PORTNAME}${PORTVERSION}
-PATCHFILES= ${PORTNAME}${PORTVERSION}-ssl.diff.gz
+PATCHFILES= ${PORTNAME}-${PORTVERSION}-ssl.patch.gz
PATCH_SITES= http://www.egghelp.org/files/patches/
-PATCH_WRKSRC= ${WRKDIR}
MAINTAINER= ports@FreeBSD.org
COMMENT= The most popular open source Internet Relay Chat bot
+LIB_DEPENDS= tcl84.1:${PORTSDIR}/lang/tcl84
+
USE_BZIP2= yes
+GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS= --with-tcllib=${LOCALBASE}/lib/libtcl84.so \
+ --with-tclinc=${LOCALBASE}/include/tcl8.4/tcl.h
-.if !defined(WITHOUT_TCL)
-LIB_DEPENDS+= tcl84.1:${PORTSDIR}/lang/tcl84
-CONFIGURE_ARGS+= --with-tcllib=${LOCALBASE}/lib/libtcl84.so \
- --with-tclinc=${LOCALBASE}/include/tcl8.4/tcl.h
-.endif
+MAN1= eggdrop.1
+
+SUB_FILES= pkg-message
.if defined(WITH_SSL)
USE_OPENSSL= yes
@@ -36,34 +38,31 @@ CONFIGURE_ARGS+= --without-ssl
.include <bsd.port.pre.mk>
-GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
-
-MAN1= eggdrop.1
-
pre-everything::
.if !defined(WITH_SSL)
@${ECHO_MSG} 'Define WITH_SSL to enable SSL support'
.endif
-post-configure:
- @(cd ${WRKSRC}; ${MAKE} config)
+post-patch:
@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKSRC}/eggdrop.conf \
> ${WRKSRC}/eggdrop.conf.sample
+
+post-configure:
+ @(cd ${WRKSRC}; ${MAKE} config)
# Workaround broken relative path in SSL-patch
@(cd ${WRKSRC}/src && ${LN} -fs ../config.h)
do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/eggdrop ${PREFIX}/bin
- @${INSTALL_MAN} ${WRKSRC}/doc/man1/eggdrop.1 ${PREFIX}/man/man1
- @${INSTALL_DATA} ${WRKSRC}/eggdrop.conf.sample ${PREFIX}/etc
- @${MKDIR} ${DATADIR}/help/set ${DATADIR}/help/msg ${DATADIR}/scripts \
- ${DATADIR}/language ${DATADIR}/text ${PREFIX}/lib/eggdrop
- @${INSTALL_DATA} ${WRKSRC}/language/core.*.lang ${DATADIR}/language
- @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
+ ${INSTALL_PROGRAM} ${WRKSRC}/eggdrop ${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/doc/man1/eggdrop.1 ${MANPREFIX}/man/man1
+ ${INSTALL_DATA} ${WRKSRC}/eggdrop.conf.sample ${PREFIX}/etc
+ @${MKDIR} ${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 uptime.so wire.so
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/lib/eggdrop
+.endfor
+ @${MKDIR} ${DATADIR}/help
.for f in assoc.mod/help/assoc.help channels.mod/help/chaninfo.help \
channels.mod/help/channels.help console.mod/help/console.help \
compress.mod/help/compress.help ctcp.mod/help/ctcp.help \
@@ -72,41 +71,56 @@ do-install:
server.mod/help/server.help share.mod/help/share.help \
transfer.mod/help/transfer.help uptime.mod/help/uptime.help \
wire.mod/help/wire.help
- @${INSTALL_DATA} ${WRKSRC}/src/mod/$f ${DATADIR}/help
+ ${INSTALL_DATA} ${WRKSRC}/src/mod/${f} ${DATADIR}/help
.endfor
-.for f in channels.mod/help/set/channels.help compress.mod/help/set/compress.help \
+ @${MKDIR} ${DATADIR}/help/set
+.for f in channels.mod/help/set/channels.help \
+ compress.mod/help/set/compress.help \
console.mod/help/set/console.help ctcp.mod/help/set/ctcp.help \
filesys.mod/help/set/filesys.help irc.mod/help/set/irc.help \
notes.mod/help/set/notes.help server.mod/help/set/server.help \
share.mod/help/set/share.help transfer.mod/help/set/transfer.help
- @${INSTALL_DATA} ${WRKSRC}/src/mod/$f ${DATADIR}/help/set
+ ${INSTALL_DATA} ${WRKSRC}/src/mod/$f ${DATADIR}/help/set
.endfor
+ @${MKDIR} ${DATADIR}/help/msg
.for f in irc.mod/help/msg/irc.help notes.mod/help/msg/notes.help \
seen.mod/help/msg/seen.help
- @${INSTALL_DATA} ${WRKSRC}/src/mod/$f ${DATADIR}/help/msg
+ ${INSTALL_DATA} ${WRKSRC}/src/mod/$f ${DATADIR}/help/msg
+.endfor
+ @${MKDIR} ${DATADIR}/language
+ ${INSTALL_DATA} ${WRKSRC}/language/core.*.lang ${DATADIR}/language
+ @cd ${WRKSRC}/src/mod \
+ && ${FIND} . -name "*.lang" -exec ${INSTALL_DATA} "{}" \
+ ${DATADIR}/language ";"
+ @${MKDIR} ${DATADIR}/scripts
+.for f in 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
+ ${INSTALL_DATA} ${WRKSRC}/scripts/${f} ${DATADIR}/scripts
+.endfor
+.for f in cmds1.help cmds2.help core.help
+ ${INSTALL_DATA} ${WRKSRC}/help/${f} ${DATADIR}/help
+.endfor
+.for f in cmds1.help
+ ${INSTALL_DATA} ${WRKSRC}/help/set/${f} ${DATADIR}/help/set
+.endfor
+ @${MKDIR} ${DATADIR}/text
+.for f in banner motd
+ ${INSTALL_DATA} ${WRKSRC}/text/${f} ${DATADIR}/text
.endfor
- @cd ${WRKSRC}/src/mod && ${FIND} . -name "*.lang" -exec ${INSTALL_DATA} "{}" \
- ${DATADIR}/language ";"
- @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 \
- ${DATADIR}/scripts
- @cd ${WRKSRC}/help && ${INSTALL_DATA} cmds1.help cmds2.help core.help \
- ${DATADIR}/help
- @cd ${WRKSRC}/help/set && ${INSTALL_DATA} cmds1.help \
- ${DATADIR}/help/set
- @cd ${WRKSRC}/text && ${INSTALL_DATA} banner motd ${DATADIR}/text
.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}/settings ${DOCSDIR}/html
- @cd ${WRKSRC}/doc && ${INSTALL_DATA} ABOUT AUTHORS BANS BOTNET BUG-REPORT \
- COMPILE-GUIDE CONTENTS FIRST-SCRIPT KNOWN-PROBLEMS MODULES \
- PARTYLINE PATCH-HOWTO TEXT-SUBSTITUTIONS TRICKS UPDATES1.6 USERS \
- WEIRD-MESSAGES tcl-commands.doc ${DOCSDIR}
- @cd ${WRKSRC}/doc/html && ${INSTALL_DATA} *.html ${DOCSDIR}/html
- @cd ${WRKSRC}/doc/settings && ${INSTALL_DATA} * ${DOCSDIR}/settings
+ @${MKDIR} ${DOCSDIR}
+.for f in ABOUT AUTHORS BANS BOTNET BUG-REPORT COMPILE-GUIDE CONTENTS \
+ FIRST-SCRIPT KNOWN-PROBLEMS MODULES PARTYLINE PATCH-HOWTO \
+ TEXT-SUBSTITUTIONS TRICKS UPDATES1.6 USERS WEIRD-MESSAGES \
+ tcl-commands.doc
+ ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
+.endfor
+ @${MKDIR} ${DOCSDIR}/html
+ cd ${WRKSRC}/doc/html && ${INSTALL_DATA} *.html ${DOCSDIR}/html
+ @${MKDIR} ${DOCSDIR}/settings
+ cd ${WRKSRC}/doc/settings && ${INSTALL_DATA} * ${DOCSDIR}/settings
.endif
-
-post-install:
- @${SED} -e 's#%%PREFIX%%#${PREFIX}#g' ${PKGMESSAGE} | fmt
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
diff --git a/irc/eggdrop/distinfo b/irc/eggdrop/distinfo
index fc9af8bf01da..e059830d7c74 100644
--- a/irc/eggdrop/distinfo
+++ b/irc/eggdrop/distinfo
@@ -1,6 +1,6 @@
-MD5 (eggdrop1.6.17.tar.bz2) = 68e181201483dee398f9904e8652e6ca
-SHA256 (eggdrop1.6.17.tar.bz2) = dac830ea282494214e9bc8a0f345e7bf8725073f2e13141157b23c95ad60849d
-SIZE (eggdrop1.6.17.tar.bz2) = 805376
-MD5 (eggdrop1.6.17-ssl.diff.gz) = cb3520ca39cc1ef833993af5ac308d7b
-SHA256 (eggdrop1.6.17-ssl.diff.gz) = 67b50fcdf88f87b40a9402e93b2d059690f4235842d48283cd3611228d283796
-SIZE (eggdrop1.6.17-ssl.diff.gz) = 9839
+MD5 (eggdrop1.6.18.tar.bz2) = 0cfc13dcc84cd4e9d4a23d23d9429ee7
+SHA256 (eggdrop1.6.18.tar.bz2) = e5d0794ee7b819f8c12ff10f521e5cb453fc531ac990867c6bf228f018d38a9e
+SIZE (eggdrop1.6.18.tar.bz2) = 783676
+MD5 (eggdrop-1.6.18-ssl.patch.gz) = fe69490a40b19e35c80f4fa1ecac7610
+SHA256 (eggdrop-1.6.18-ssl.patch.gz) = 5b3934cc70e2aae939d75baa24c064b14f75954f53bac7f156d7a483b67c3b89
+SIZE (eggdrop-1.6.18-ssl.patch.gz) = 9251
diff --git a/irc/eggdrop/files/patch-ab b/irc/eggdrop/files/patch-ab
deleted file mode 100644
index 9f449f297e57..000000000000
--- a/irc/eggdrop/files/patch-ab
+++ /dev/null
@@ -1,37 +0,0 @@
---- eggdrop1.6.17/src/main.c.orig Mon May 5 06:05:32 2003
-+++ eggdrop1.6.17/src/main.c Mon Jun 2 11:16:57 2003
-@@ -73,6 +73,6 @@
- #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;
- extern struct userrec *userlist;
-@@ -102,7 +102,7 @@
- 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] = __PREFIX__ "/etc/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 */
-@@ -732,6 +732,8 @@
- }
- #endif
-
-+ chdir(__PREFIX__ "/share/eggdrop");
-+
- /* Initialise context list */
- for (i = 0; i < 16; i++)
- Context;
-@@ -831,7 +833,7 @@
- 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/irc/eggdrop/files/patch-ac b/irc/eggdrop/files/patch-ac
deleted file mode 100644
index b66a1b6ef1c7..000000000000
--- a/irc/eggdrop/files/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
---- eggdrop1.6.17/src/Makefile.in.orig Mon Feb 9 22:42:35 2004
-+++ eggdrop1.6.17/src/Makefile.in Mon Feb 9 22:43:23 2004
-@@ -19,6 +19,6 @@
- STRIP = @STRIP@
- CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) @DEFS@ $(CFLGS)
--CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS = @CPPFLAGS@ '-D__PREFIX__="@prefix@"'
-
- 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 \
diff --git a/irc/eggdrop/files/patch-ad b/irc/eggdrop/files/patch-ad
deleted file mode 100644
index cb0871338d4d..000000000000
--- a/irc/eggdrop/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- eggdrop1.6.17/src/mod/filesys.mod/filesys.c.orig Mon Jun 2 11:25:01 2003
-+++ eggdrop1.6.17/src/mod/filesys.mod/filesys.c Mon Jun 2 11:25:46 2003
-@@ -461,7 +461,7 @@
- if (at_limit(nick)) {
- char xxx[1024];
-
-- sprintf(xxx, "%d*%s%s", 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/irc/eggdrop/files/patch-ae b/irc/eggdrop/files/patch-ae
deleted file mode 100644
index 754f5adcc17d..000000000000
--- a/irc/eggdrop/files/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
---- eggdrop1.6.17/src/mod/ctcp.mod/ctcp.c.orig Mon Jun 2 11:27:58 2003
-+++ eggdrop1.6.17/src/mod/ctcp.mod/ctcp.c Mon Jun 2 11:29:29 2003
-@@ -161,8 +161,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",
-- 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/irc/eggdrop/files/patch-ah b/irc/eggdrop/files/patch-ah
deleted file mode 100644
index a5c9c33fc5c3..000000000000
--- a/irc/eggdrop/files/patch-ah
+++ /dev/null
@@ -1,8 +0,0 @@
---- eggdrop1.6.17/src/modules.c.orig Mon Jun 2 11:31:15 2003
-+++ eggdrop1.6.17/src/modules.c Mon Jun 2 11:31:44 2003
-@@ -120,4 +120,4 @@
- #ifndef STATIC
--char moddir[121] = "modules/";
-+char moddir[121] = __PREFIX__ "/lib/eggdrop/";
- #endif
-
diff --git a/irc/eggdrop/files/patch-ai b/irc/eggdrop/files/patch-ai
deleted file mode 100644
index f241da179281..000000000000
--- a/irc/eggdrop/files/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
---- eggdrop1.6.17/src/mod/share.mod/share.c.orig Mon May 5 00:05:33 2003
-+++ eggdrop1.6.17/src/mod/share.mod/share.c Tue Nov 18 16:51:41 2003
-@@ -1120,7 +1120,7 @@
- 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");
-@@ -1889,8 +1889,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.%s.%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/irc/eggdrop/files/patch-aj b/irc/eggdrop/files/patch-aj
deleted file mode 100644
index 9c9c648dfb93..000000000000
--- a/irc/eggdrop/files/patch-aj
+++ /dev/null
@@ -1,11 +0,0 @@
---- eggdrop1.6.17/src/mod/Makefile.in.orig Mon Jun 2 11:36:50 2003
-+++ eggdrop1.6.17/src/mod/Makefile.in Mon Jun 2 11:39:02 2003
-@@ -86,7 +86,7 @@
- echo ""; \
- echo "Configuring module '$${modname}'."; \
- 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); \
- fi; \
- done; \
- echo ""
diff --git a/irc/eggdrop/files/patch-ak b/irc/eggdrop/files/patch-ak
deleted file mode 100644
index ffbf474a63fe..000000000000
--- a/irc/eggdrop/files/patch-ak
+++ /dev/null
@@ -1,9 +0,0 @@
---- eggdrop1.6.17/src/eggdrop.h.orig Mon Jun 2 11:39:45 2003
-+++ eggdrop1.6.17/src/eggdrop.h Mon Jun 2 11:40:17 2003
-@@ -77,7 +77,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/irc/eggdrop/files/patch-eggdrop.conf b/irc/eggdrop/files/patch-eggdrop.conf
index a181a312b9ed..9ff824f8a0f0 100644
--- a/irc/eggdrop/files/patch-eggdrop.conf
+++ b/irc/eggdrop/files/patch-eggdrop.conf
@@ -1,5 +1,5 @@
---- eggdrop1.6.17/eggdrop.conf.orig Mon May 5 00:05:32 2003
-+++ eggdrop1.6.17/eggdrop.conf Wed Mar 3 21:17:14 2004
+--- eggdrop.conf.orig Mon May 5 00:05:32 2003
++++ eggdrop.conf Wed Mar 3 21:17:14 2004
@@ -1,2 +1,2 @@
-#! /path/to/executable/eggdrop
+#!%%PREFIX%%/bin/eggdrop
diff --git a/irc/eggdrop/files/patch-src::md5::md5c.c b/irc/eggdrop/files/patch-src::md5::md5c.c
deleted file mode 100644
index 0d152f49d743..000000000000
--- a/irc/eggdrop/files/patch-src::md5::md5c.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- eggdrop1.6.17/src/md5/md5c.c.orig Fri Sep 3 14:08:28 2004
-+++ eggdrop1.6.17/src/md5/md5c.c Fri Sep 3 14:04:51 2004
-@@ -25,6 +25,7 @@
-
- #include "compat/compat.h"
-
-+#ifdef EGG_SSL_EXT
- typedef unsigned long MD5_u32plus;
-
- typedef struct {
-@@ -33,6 +34,7 @@
- unsigned char buffer[64];
- MD5_u32plus block[16];
- } MD5_CTX;
-+#endif
-
- /*
- * The basic MD5 functions.
diff --git a/irc/eggdrop/files/patch-src__Makefile.in b/irc/eggdrop/files/patch-src__Makefile.in
new file mode 100644
index 000000000000..1b1bf646acd6
--- /dev/null
+++ b/irc/eggdrop/files/patch-src__Makefile.in
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig Mon Feb 9 22:42:35 2004
++++ src/Makefile.in Mon Feb 9 22:43:23 2004
+@@ -18,7 +18,7 @@
+ LD = @CC@
+ STRIP = @STRIP@
+ CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) @DEFS@ $(CFLGS)
+-CPPFLAGS = @CPPFLAGS@
++CPPFLAGS = @CPPFLAGS@ '-D__PREFIX__="@prefix@"'
+
+ 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 \
diff --git a/irc/eggdrop/files/patch-src__eggdrop.h b/irc/eggdrop/files/patch-src__eggdrop.h
new file mode 100644
index 000000000000..fd30aba9a92b
--- /dev/null
+++ b/irc/eggdrop/files/patch-src__eggdrop.h
@@ -0,0 +1,9 @@
+--- src/eggdrop.h.orig Mon Jun 2 11:39:45 2003
++++ src/eggdrop.h Mon Jun 2 11:40:17 2003
+@@ -77,7 +77,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/irc/eggdrop/files/patch-src__main.c b/irc/eggdrop/files/patch-src__main.c
new file mode 100644
index 000000000000..bd4cb93d0a9d
--- /dev/null
+++ b/irc/eggdrop/files/patch-src__main.c
@@ -0,0 +1,37 @@
+--- src/main.c.orig Mon May 5 06:05:32 2003
++++ src/main.c Mon Jun 2 11:16:57 2003
+@@ -73,6 +73,6 @@
+ #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;
+ extern struct userrec *userlist;
+@@ -102,7 +102,7 @@
+ 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] = __PREFIX__ "/etc/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 */
+@@ -732,6 +732,8 @@
+ }
+ #endif
+
++ chdir(__PREFIX__ "/share/eggdrop");
++
+ /* Initialise context list */
+ for (i = 0; i < 16; i++)
+ Context;
+@@ -831,7 +833,7 @@
+ 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/irc/eggdrop/files/patch-src__md5__md5c.c b/irc/eggdrop/files/patch-src__md5__md5c.c
new file mode 100644
index 000000000000..edafcd651ddd
--- /dev/null
+++ b/irc/eggdrop/files/patch-src__md5__md5c.c
@@ -0,0 +1,18 @@
+--- src/md5/md5c.c.orig Fri Sep 3 14:08:28 2004
++++ src/md5/md5c.c Fri Sep 3 14:04:51 2004
+@@ -25,6 +25,7 @@
+
+ #include "compat/compat.h"
+
++#ifdef EGG_SSL_EXT
+ typedef unsigned long MD5_u32plus;
+
+ typedef struct {
+@@ -33,6 +34,7 @@
+ unsigned char buffer[64];
+ MD5_u32plus block[16];
+ } MD5_CTX;
++#endif
+
+ /*
+ * The basic MD5 functions.
diff --git a/irc/eggdrop/files/patch-src__mod__Makefile.in b/irc/eggdrop/files/patch-src__mod__Makefile.in
new file mode 100644
index 000000000000..daa14cf0703e
--- /dev/null
+++ b/irc/eggdrop/files/patch-src__mod__Makefile.in
@@ -0,0 +1,11 @@
+--- src/mod/Makefile.in.orig Mon Jun 2 11:36:50 2003
++++ src/mod/Makefile.in Mon Jun 2 11:39:02 2003
+@@ -86,7 +86,7 @@
+ echo ""; \
+ echo "Configuring module '$${modname}'."; \
+ 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); \
+ fi; \
+ done; \
+ echo ""
diff --git a/irc/eggdrop/files/patch-src__mod__ctcp.mod__ctcp.c b/irc/eggdrop/files/patch-src__mod__ctcp.mod__ctcp.c
new file mode 100644
index 000000000000..4440fa705b43
--- /dev/null
+++ b/irc/eggdrop/files/patch-src__mod__ctcp.mod__ctcp.c
@@ -0,0 +1,13 @@
+--- src/mod/ctcp.mod/ctcp.c.orig Mon Jun 2 11:27:58 2003
++++ src/mod/ctcp.mod/ctcp.c Mon Jun 2 11:29:29 2003
+@@ -161,8 +161,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",
+- 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/irc/eggdrop/files/patch-src__mod__filesys.mod__filesys.c b/irc/eggdrop/files/patch-src__mod__filesys.mod__filesys.c
new file mode 100644
index 000000000000..a7c19d1e57f7
--- /dev/null
+++ b/irc/eggdrop/files/patch-src__mod__filesys.mod__filesys.c
@@ -0,0 +1,11 @@
+--- src/mod/filesys.mod/filesys.c.orig Mon Jun 2 11:25:01 2003
++++ src/mod/filesys.mod/filesys.c Mon Jun 2 11:25:46 2003
+@@ -461,7 +461,7 @@
+ if (at_limit(nick)) {
+ char xxx[1024];
+
+- sprintf(xxx, "%d*%s%s", 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/irc/eggdrop/files/patch-src__mod__share.mod__share.c b/irc/eggdrop/files/patch-src__mod__share.mod__share.c
new file mode 100644
index 000000000000..b36fad862168
--- /dev/null
+++ b/irc/eggdrop/files/patch-src__mod__share.mod__share.c
@@ -0,0 +1,22 @@
+--- src/mod/share.mod/share.c.orig Mon May 5 00:05:33 2003
++++ src/mod/share.mod/share.c Tue Nov 18 16:51:41 2003
+@@ -1120,7 +1120,7 @@
+ 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");
+@@ -1889,8 +1889,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.%s.%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/irc/eggdrop/files/patch-src__modules.c b/irc/eggdrop/files/patch-src__modules.c
new file mode 100644
index 000000000000..5ad3cfa09ada
--- /dev/null
+++ b/irc/eggdrop/files/patch-src__modules.c
@@ -0,0 +1,8 @@
+--- src/modules.c.orig Mon Jun 2 11:31:15 2003
++++ src/modules.c Mon Jun 2 11:31:44 2003
+@@ -120,4 +120,4 @@
+ #ifndef STATIC
+-char moddir[121] = "modules/";
++char moddir[121] = __PREFIX__ "/lib/eggdrop/";
+ #endif
+
diff --git a/irc/eggdrop/files/pkg-message.in b/irc/eggdrop/files/pkg-message.in
new file mode 100644
index 000000000000..68f969678c0c
--- /dev/null
+++ b/irc/eggdrop/files/pkg-message.in
@@ -0,0 +1,10 @@
+========================================================================
+
+This Port of Eggdrop differs from a normal eggdrop installation, because
+it does respect hier(7). That means your eggdrop.conf goes to
+%%PREFIX%%/etc/eggdrop.conf and .chan, .notes, .user files go to
+%%PREFIX%%/share/eggdrop. Modules will go to %%PREFIX%%/lib/eggdrop and
+documentation can be found in %%PREFIX%%/share/doc/eggdrop, scripts go
+to %%PREFIX%%/share/eggdrop/scripts.
+
+========================================================================
diff --git a/irc/eggdrop/pkg-message b/irc/eggdrop/pkg-message
deleted file mode 100644
index 68f969678c0c..000000000000
--- a/irc/eggdrop/pkg-message
+++ /dev/null
@@ -1,10 +0,0 @@
-========================================================================
-
-This Port of Eggdrop differs from a normal eggdrop installation, because
-it does respect hier(7). That means your eggdrop.conf goes to
-%%PREFIX%%/etc/eggdrop.conf and .chan, .notes, .user files go to
-%%PREFIX%%/share/eggdrop. Modules will go to %%PREFIX%%/lib/eggdrop and
-documentation can be found in %%PREFIX%%/share/doc/eggdrop, scripts go
-to %%PREFIX%%/share/eggdrop/scripts.
-
-========================================================================
diff --git a/irc/eggdrop/pkg-plist b/irc/eggdrop/pkg-plist
index fee61512922c..58d8a3cdd35a 100644
--- a/irc/eggdrop/pkg-plist
+++ b/irc/eggdrop/pkg-plist
@@ -173,14 +173,14 @@ lib/eggdrop/wire.so
%%PORTDOCS%%%%DOCSDIR%%/settings/mod.uptime
%%PORTDOCS%%%%DOCSDIR%%/settings/mod.wire
%%PORTDOCS%%%%DOCSDIR%%/settings/mod.woobie
-@dirrm lib/eggdrop
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/settings
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/text
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/language
@dirrm %%DATADIR%%/help/set
@dirrm %%DATADIR%%/help/msg
@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%/language
-@dirrm %%DATADIR%%/scripts
-@dirrm %%DATADIR%%/text
@dirrmtry %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/settings
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm lib/eggdrop
--
cgit v1.2.3