Skip to content

Commit

Permalink
Changes 1.6.17:
Browse files Browse the repository at this point in the history
  - Lots of doc updates.
  - Added a "stripcodes" Tcl command. See doc/tcl-commands.doc for more
    information.
  - Bot idx's should be considered valid to tcl_valididx.
  - Always try to detect shared Tcl libraries before static ones.
  - We now correctly differentiate the +l user flag from the +l bot flag.
  - Cleaned up modules.c and the module configure stuff quite a bit.
  - Detect Tcl in $HOME/lib and $HOME/tcl/lib first, as to make it easier
    to allow users to override the system's Tcl version.
  - We now support module loading under Darwin (Mac OS X) and NeXT Step.
  - Don't try to call tcl_notes if the notes module isn't loaded.
  - Show a more descriptive error message when a listen socket can't be opened.
  - Fixed Tcl encoding issues with .tcl and .set.
  - Added a set of Finnish language files and a Finnish MOTD.
  - time_t isn't unsigned, and therefor %lu should not be used as a
    conversion specifier.
  - Fixed a gcc warning in dcc.c.
  - Added support for Quakenet channel modes.
  - Removed an invalid killsock() in dcc.c.
  - Fixed extra spaces being written to chan file.
  - Reworked 'make config' / module configure process.
  - Op (+o) implies halfop (+l) now.
  - Cleaned up and optimized rmspace() and fixfrom().
  - Updated recomended Tcl version to 8.4.6.
  - Fix behavior of the BCST bind. BCST is now correctly triggered for
    dccbroadcasts, as well as when a bot "says" something on a channel.
    See doc/tcl-commands.doc for more information.
  - Remove some unneeded casts.
  - Fixed performance issues with mv/cp when a lot of files are in the
    file area.
  - Typo in doc/COMPILING-FAQ. It's LD_LIBRARY_PATH, not LB_LIBRARY_PATH.
  - Fix a possible issue with ident code.
  - Don't let .tcl mkdir create duplicate filedb entries.
  - Fixed a compile error related to varargs when using old Tcl versions.
  - Fixed a compile error on systems that don't have socklen_t.
  - Suppress configure warnings on systems that use newer versions of GNU
    coreutils.
  • Loading branch information
adam committed Dec 3, 2004
1 parent d1d076e commit 4ee4094
Show file tree
Hide file tree
Showing 14 changed files with 125 additions and 135 deletions.
21 changes: 9 additions & 12 deletions chat/eggdrop/Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
# $NetBSD: Makefile,v 1.14 2004/10/03 00:13:14 tv Exp $
#
# $NetBSD: Makefile,v 1.15 2004/12/03 12:15:54 adam Exp $

DISTNAME= eggdrop1.6.15
PKGNAME= ${DISTNAME:S/eggdrop/eggdrop-/}
PKGREVISION= 3
DISTNAME= eggdrop1.6.17
PKGNAME= eggdrop-1.6.17
CATEGORIES= chat
MASTER_SITES= ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/
EXTRACT_SUFX= .tar.bz2
Expand All @@ -12,10 +10,9 @@ MAINTAINER= [email protected]
HOMEPAGE= http://www.eggheads.org/
COMMENT= IRC robot with TCL scripting and multi-channel ability

USE_BUILDLINK3= YES
USE_PKGINSTALL= YES
GNU_CONFIGURE= YES

USE_BUILDLINK3= yes
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ENV+= TCLLIB="${PREFIX}/lib" TCLINC="${PREFIX}/include"

Expand Down Expand Up @@ -49,9 +46,9 @@ do-install-program:
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
cd ${WRKSRC}/doc && ${INSTALL_DATA} BANS BOTNET FIRST-SCRIPT MODULES \
PARTYLINE USERS TRICKS TEXT-SUBSTITUTIONS tcl-commands.doc \
${PREFIX}/share/doc/eggdrop
${INSTALL_DATA_DIR} ${PREFIX}/share/eggdrop
${INSTALL_DATA_DIR} ${PREFIX}/share/eggdrop/help
${INSTALL_DATA_DIR} ${PREFIX}/share/eggdrop/language
Expand Down
16 changes: 11 additions & 5 deletions chat/eggdrop/PLIST
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.6 2003/05/24 16:43:05 salo Exp $
@comment $NetBSD: PLIST,v 1.7 2004/12/03 12:15:54 adam Exp $
bin/eggdrop
${NOPIC}lib/eggdrop/assoc.so
${NOPIC}lib/eggdrop/blowfish.so
Expand All @@ -19,13 +19,13 @@ ${NOPIC}lib/eggdrop/wire.so
man/man1/eggdrop.1
share/doc/eggdrop/BANS
share/doc/eggdrop/BOTNET
share/doc/eggdrop/FIRST-SCRIPT
share/doc/eggdrop/MODULES
share/doc/eggdrop/PARTYLINE
share/doc/eggdrop/USERS
share/doc/eggdrop/first_script.txt
share/doc/eggdrop/TEXT-SUBSTITUTIONS
share/doc/eggdrop/TRICKS
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
Expand All @@ -40,7 +40,6 @@ 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
Expand Down Expand Up @@ -70,30 +69,37 @@ share/eggdrop/help/core.help
share/eggdrop/help/set/cmds1.help
share/eggdrop/language/assoc.danish.lang
share/eggdrop/language/assoc.english.lang
share/eggdrop/language/assoc.finnish.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.finnish.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.finnish.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.finnish.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.finnish.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.finnish.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.finnish.lang
share/eggdrop/language/wire.french.lang
share/eggdrop/language/wire.german.lang
share/eggdrop/scripts/CONTENTS
Expand Down
27 changes: 13 additions & 14 deletions chat/eggdrop/distinfo
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
$NetBSD: distinfo,v 1.7 2004/08/27 06:29:06 jlam Exp $
$NetBSD: distinfo,v 1.8 2004/12/03 12:15:54 adam Exp $

SHA1 (eggdrop1.6.15.tar.bz2) = 8740800b066b35c745c7e753e7f58daac9929f3a
Size (eggdrop1.6.15.tar.bz2) = 760615 bytes
SHA1 (patch-aa) = 25f5b1202a8eee7cd04c5830256f280eec6fbb1e
SHA1 (patch-ab) = 87c5697a2b33488b96c0f457414187e6caa5881b
SHA1 (patch-ac) = a1c5648e2748f5efbcb890b5ed8a3e8faac5f0a5
SHA1 (patch-ad) = 8b9f740e82d44df7daeede770fce7f5add751407
SHA1 (patch-ae) = 370fe00ada6b9432483ab3e0ef9c349f7c7dd00f
SHA1 (patch-af) = 1915d3f9ac55e49d829613c6f003b2800f62a734
SHA1 (patch-ag) = 9cb1acc1be5ad4186dc7c9fac9f20955a9f51292
SHA1 (patch-ah) = b9f6e10f0a1a8f73f014ceae5015dc157f8fe124
SHA1 (patch-ai) = 0bbf9e3be1368897e2a9399c9ea58f28c8f84e0c
SHA1 (patch-aj) = 7701eefed77228fe46360bea717403314386de03
SHA1 (patch-ak) = c2239684483a78dd294055c4f14239cae531d056
SHA1 (eggdrop1.6.17.tar.bz2) = 0e8a0b5506dde4a99f2be9f0700d6da65f54357f
Size (eggdrop1.6.17.tar.bz2) = 805376 bytes
SHA1 (patch-aa) = bdc5a3560672599e5645e14ef283cc2205780346
SHA1 (patch-ab) = ac7aa4b3cb32e53b7e6abe828191afe153a1bbb1
SHA1 (patch-ac) = c71d67618a5b53a3de2f3041ed8fa098a89e4471
SHA1 (patch-ad) = eaa3d342f47e0f3060dd29b6d64ef1f984eda6a8
SHA1 (patch-ae) = bdbb616282b7dc643182a35c606401850b33fdca
SHA1 (patch-af) = 8f314d65d1a396b85e17400ee046f2ad4324a690
SHA1 (patch-ag) = 61a030dc33de4f78cb19653035bebf7661f57c50
SHA1 (patch-ah) = a5360c748e16cbc3d6ae4f2968799e96007971f1
SHA1 (patch-ai) = ee0cfe95a1aa9a883fd95db0fbc0cef60deb8e3a
SHA1 (patch-ak) = 92f269a3f382a9f917d7e58c2cee5bb1d500ab6d
28 changes: 14 additions & 14 deletions chat/eggdrop/patches/patch-aa
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
$NetBSD: patch-aa,v 1.2 2003/01/16 08:23:47 salo Exp $
$NetBSD: patch-aa,v 1.3 2004/12/03 12:15:54 adam Exp $

--- configure.orig Sat Mar 30 04:48:49 2002
--- configure.orig 2004-08-22 22:34:02.000000000 +0000
+++ configure
@@ -2808,7 +2808,13 @@
*BSD)
# 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"
@@ -5306,7 +5306,13 @@ _ACEOF
*BSD)
# 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
+ else
+ SHLIB_LD="ld -Bshareable -x"
+ BEL_MOD_LD="$CC $LDFLAGS"
+ fi
cat >>confdefs.h <<\_ACEOF
#define MODULES_OK 1
_ACEOF
+ fi
;;
Darwin)
# Mac OS X
32 changes: 16 additions & 16 deletions chat/eggdrop/patches/patch-ab
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
$NetBSD: patch-ab,v 1.3 2003/05/24 16:43:05 salo Exp $
$NetBSD: patch-ab,v 1.4 2004/12/03 12:15:54 adam Exp $

--- 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
--- src/main.c.orig 2004-07-02 21:21:08.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;
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 @@
@@ -102,7 +102,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 */
@@ -726,6 +726,8 @@ int main(int argc, char **argv)
}
#endif

Expand All @@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.3 2003/05/24 16:43:05 salo Exp $
/* Initialise context list */
for (i = 0; i < 16; i++)
Context;
@@ -834,7 +836,8 @@
@@ -825,7 +827,8 @@ int main(int argc, char **argv)
cache_miss = 0;
cache_hit = 0;
if (!pid_file[0])
Expand Down
14 changes: 7 additions & 7 deletions chat/eggdrop/patches/patch-ac
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$NetBSD: patch-ac,v 1.3 2003/05/24 16:43:05 salo Exp $
$NetBSD: patch-ac,v 1.4 2004/12/03 12:15:54 adam Exp $

--- src/Makefile.in.orig 2003-05-04 22:15:53.000000000 +0200
+++ src/Makefile.in 2003-05-24 16:58:42.000000000 +0200
--- 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@
Expand All @@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.3 2003/05/24 16:43:05 salo Exp $
VPATH = @srcdir@

@SET_MAKE@
@@ -16,7 +17,7 @@
@@ -16,7 +17,7 @@ CC = @CC@
LD = @CC@
STRIP = @STRIP@
CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) @DEFS@ $(CFLGS)
Expand All @@ -19,12 +19,12 @@ $NetBSD: patch-ac,v 1.3 2003/05/24 16:43:05 salo Exp $

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 @@
@echo "Linking eggdrop... $(EGGBUILD)"
@@ -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 "Successful compile: $(EGGEXEC)"
@echo ""
@echo "Successful compile: $(EGGEXEC)"
8 changes: 4 additions & 4 deletions chat/eggdrop/patches/patch-ad
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
$NetBSD: patch-ad,v 1.1.1.1 2002/06/26 03:48:14 kent Exp $
$NetBSD: patch-ad,v 1.2 2004/12/03 12:15:54 adam Exp $

--- src/mod/filesys.mod/filesys.c.orig Wed Dec 9 20:05:21 1998
+++ src/mod/filesys.mod/filesys.c Wed Dec 9 20:09:13 1998
@@ -458,7 +458,7 @@
--- src/mod/filesys.mod/filesys.c.orig 2004-07-02 21:02:02.000000000 +0000
+++ src/mod/filesys.mod/filesys.c
@@ -461,7 +461,7 @@ static int do_dcc_send(int idx, char *di
if (at_limit(nick)) {
char xxx[1024];

Expand Down
8 changes: 4 additions & 4 deletions chat/eggdrop/patches/patch-ae
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
$NetBSD: patch-ae,v 1.2 2003/05/24 16:43:05 salo Exp $
$NetBSD: patch-ae,v 1.3 2004/12/03 12:15:54 adam Exp $

--- 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 @@
--- 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 */
Expand Down
8 changes: 4 additions & 4 deletions chat/eggdrop/patches/patch-af
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
$NetBSD: patch-af,v 1.1 2004/03/11 06:37:50 minskim Exp $
$NetBSD: patch-af,v 1.2 2004/12/03 12:15:54 adam Exp $

--- src/mod/uptime.mod/uptime.c.orig 2003-05-04 17:05:33.000000000 -0500
--- src/mod/uptime.mod/uptime.c.orig 2004-06-14 01:14:07.000000000 +0000
+++ src/mod/uptime.mod/uptime.c
@@ -34,8 +34,8 @@
#define MAKING_UPTIME
@@ -35,8 +35,8 @@

#include "uptime.h"
#include "../module.h"
-#include "../server.mod/server.h"
Expand Down
43 changes: 22 additions & 21 deletions chat/eggdrop/patches/patch-ag
Original file line number Diff line number Diff line change
@@ -1,34 +1,35 @@
$NetBSD: patch-ag,v 1.5 2004/08/27 06:29:06 jlam Exp $
$NetBSD: patch-ag,v 1.6 2004/12/03 12:15:54 adam Exp $

--- Makefile.in.orig Tue Feb 27 20:06:27 2001
+++ Makefile.in Fri Nov 2 11:40:10 2001
@@ -42,7 +42,7 @@

# make modules
SHLIB_CC = @SHLIB_CC@
--- Makefile.in.orig 2004-07-25 11:17:33.000000000 +0000
+++ Makefile.in
@@ -38,7 +38,7 @@ SHLIB_CC = @SHLIB_CC@
# Linker
LD = @CC@
MOD_LD = @MOD_LD@
-SHLIB_LD = @SHLIB_LD@
+SHLIB_LD = @SHLIB_LD@ $(LINKER_RPATH_FLAG) @TCLLIB@
SHLIB_STRIP = @SHLIB_STRIP@
MOD_EXT = @MOD_EXT@

@@ -61,6 +61,7 @@
# stuff for Tcl
XREQS = @TCL_REQS@
# Stripping
# To turn STRIP off, use 'STRIP = touch' not 'STRIP ='.
@@ -64,6 +64,7 @@ TCLLIBFN = @TCLLIBFN@
# XLIBS will be linked with everything; MODULE_XLIBS will only be linked with
# the actual module objects.
XLIBS = @TCL_LIBS@ @LIBS@
+XLDFLAGS = $(COMPILER_RPATH_FLAG)@TCLLIB@
TCLLIB = @TCLLIB@
TCLLIBFN = @TCLLIBFN@
MODULE_XLIBS = @MODULE_XLIBS@

@@ -86,29 +87,29 @@
# Shouldn't need to touch anything below here.
@@ -89,30 +90,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=' 'MODOBJS='
+'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' 'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=' 'MODOBJS='
-'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)' 'MOD_EXT=$(MOD_EXT)'
+'STRIP=$(SHLIB_STRIP)' 'CFLGS=$(CFLGS)' 'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' 'MOD_EXT=$(MOD_EXT)'
-'STRIP=$(SHLIB_STRIP)' 'CFLGS=$(CFLGS)' 'XLIBS=$(XLIBS)' 'MOD_EXT=$(MOD_EXT)' \
+'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' \
Expand All @@ -46,12 +47,12 @@ $NetBSD: patch-ag,v 1.5 2004/08/27 06:29:06 jlam Exp $
MAKE_DEBMODULES = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(SHLIB_CC)' 'LD=$(SHLIB_LD)' \
-'XLIBS=$(XLIBS)' 'STRIP=touch' 'CFLGS=-g3 $(DEBCFLAGS) $(CFLGS)' \
+'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' 'STRIP=touch' 'CFLGS=-g3 $(DEBCFLAGS) $(CFLGS)' \
'MOD_EXT=$(MOD_EXT)'
'MOD_EXT=$(MOD_EXT)' 'MODULE_XLIBS=$(MODULE_XLIBS)'

MAKE_SDEBUG = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD) -g' \
'STRIP=touch' 'RANLIB=$(RANLIB)' 'CFLGS=-g3 $(DEBCFLAGS) -DSTATIC $(CFLGS)' \
-'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)' \
+'TCLLIB=$(TCLLIB)' 'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLDFLAGS=$(XLDFLAGS)' 'XLIBS=$(XLIBS)' \
'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(static and debug version)' 'MODOBJS=mod/*.o'
'EGGEXEC=$(EGGEXEC)' 'EGGBUILD=(static debug version)' 'MODOBJS=mod/*.o'

MAKE_DEPEND = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
16 changes: 8 additions & 8 deletions chat/eggdrop/patches/patch-ah
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
$NetBSD: patch-ah,v 1.1.1.1 2002/06/26 03:48:14 kent Exp $
$NetBSD: patch-ah,v 1.2 2004/12/03 12:15:54 adam Exp $

--- src/modules.c.orig Mon Jul 16 18:54:01 2001
+++ src/modules.c Fri Nov 2 11:49:45 2001
@@ -94,7 +94,7 @@
#ifndef STATIC
--- 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);

/* Directory to look for modules */
#ifndef STATIC
-char moddir[121] = "modules/";
+char moddir[121] = __PREFIX__ "/lib/eggdrop/";
#endif

#else

#ifdef STATIC
Loading

0 comments on commit 4ee4094

Please sign in to comment.