- Integrate SSL patch (turned off by default)

- Cleanup

PR:		ports/63767
Submitted by:	Ulrich Spoerlein <q@uni.de> (maintainer)

9 files changed, 54 insertions, 25 deletions

diff --git a/irc/eggdrop/files/patch-ab b/irc/eggdrop/files/patch-ab
index e1a09664c700..b709efdc11dd 100644
--- a/irc/eggdrop/files/patch-ab
+++ b/irc/eggdrop/files/patch-ab
@@ -1,5 +1,5 @@
---- src/main.c.orig	Mon May  5 06:05:32 2003
-+++ src/main.c	Mon Jun  2 11:16:57 2003
+--- eggdrop1.6.15/src/main.c.orig	Mon May  5 06:05:32 2003
++++ eggdrop1.6.15/src/main.c	Mon Jun  2 11:16:57 2003
 @@ -70,7 +70,7 @@
  #define _POSIX_SOURCE 1
  #endif
@@ -14,7 +14,7 @@
  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] = __PREFIX__ "eggdrop.conf";  /* Name of the config file */
++char configfile[121] = __PREFIX__ "/etc/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
diff --git a/irc/eggdrop/files/patch-ac b/irc/eggdrop/files/patch-ac
index 5d79af0ea591..86fd4882ec0c 100644
--- a/irc/eggdrop/files/patch-ac
+++ b/irc/eggdrop/files/patch-ac
@@ -1,20 +1,20 @@
---- src/Makefile.in.orig	Mon Jun  2 11:23:55 2003
-+++ src/Makefile.in	Mon Jun  2 11:24:24 2003
-@@ -16,7 +16,7 @@
- LD = @CC@
+--- eggdrop1.6.15/src/Makefile.in.orig	Mon Feb  9 22:42:35 2004
++++ eggdrop1.6.15/src/Makefile.in	Mon Feb  9 22:43:23 2004
+@@ -17,7 +17,7 @@
  STRIP = @STRIP@
- CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) @DEFS@ $(CFLGS)
+ #CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) @DEFS@ $(CFLGS)
+ CFLAGS = @CFLAGS@ -I$(XSSL_INCLUDE) -I.. -I$(top_srcdir) @DEFS@ $(CFLGS)
 -CPPFLAGS = @CPPFLAGS@
-+CPPFLAGS = @CPPFLAGS@ '-D__PREFIX__="@prefix@"'
++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 \
-@@ -37,7 +37,7 @@
- 	@echo "Linking eggdrop... $(EGGBUILD)"
+@@ -39,7 +39,7 @@
  	@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`
+ #	$(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs`
+-	$(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(XSSL_LIBS) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs`
++	$(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(XSSL_LIBS) $(MODOBJS) $(XLDFLAGS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs`
  	$(STRIP) ../$(EGGEXEC)
  	@echo "Successful compile: $(EGGEXEC)"
  	@echo ""
diff --git a/irc/eggdrop/files/patch-ad b/irc/eggdrop/files/patch-ad
index 44a2ff2330d0..e046a545deb2 100644
--- a/irc/eggdrop/files/patch-ad
+++ b/irc/eggdrop/files/patch-ad
@@ -1,5 +1,5 @@
---- 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
+--- eggdrop1.6.15/src/mod/filesys.mod/filesys.c.orig	Mon Jun  2 11:25:01 2003
++++ eggdrop1.6.15/src/mod/filesys.mod/filesys.c	Mon Jun  2 11:25:46 2003
 @@ -452,7 +452,7 @@
    if (at_limit(nick)) {
      char xxx[1024];
diff --git a/irc/eggdrop/files/patch-ae b/irc/eggdrop/files/patch-ae
index ecb59c4957a0..8c8dd38f8a78 100644
--- a/irc/eggdrop/files/patch-ae
+++ b/irc/eggdrop/files/patch-ae
@@ -1,5 +1,5 @@
---- 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
+--- eggdrop1.6.15/src/mod/ctcp.mod/ctcp.c.orig	Mon Jun  2 11:27:58 2003
++++ eggdrop1.6.15/src/mod/ctcp.mod/ctcp.c	Mon Jun  2 11:29:29 2003
 @@ -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
diff --git a/irc/eggdrop/files/patch-ah b/irc/eggdrop/files/patch-ah
index 982f0dafdc6e..116e324e31d9 100644
--- a/irc/eggdrop/files/patch-ah
+++ b/irc/eggdrop/files/patch-ah
@@ -1,5 +1,5 @@
---- src/modules.c.orig	Mon Jun  2 11:31:15 2003
-+++ src/modules.c	Mon Jun  2 11:31:44 2003
+--- eggdrop1.6.15/src/modules.c.orig	Mon Jun  2 11:31:15 2003
++++ eggdrop1.6.15/src/modules.c	Mon Jun  2 11:31:44 2003
 @@ -101,7 +101,7 @@
  #ifndef STATIC
  
diff --git a/irc/eggdrop/files/patch-ai b/irc/eggdrop/files/patch-ai
index 1544a5a0f184..6794cc94a763 100644
--- a/irc/eggdrop/files/patch-ai
+++ b/irc/eggdrop/files/patch-ai
@@ -1,5 +1,5 @@
---- 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
+--- eggdrop1.6.15/src/mod/share.mod/share.c.orig	Mon May  5 00:05:33 2003
++++ eggdrop1.6.15/src/mod/share.mod/share.c	Tue Nov 18 16:51:41 2003
 @@ -1113,7 +1113,7 @@
    int i, sock;
    FILE *f;
diff --git a/irc/eggdrop/files/patch-aj b/irc/eggdrop/files/patch-aj
index 905f7e1026ed..31ee127ba094 100644
--- a/irc/eggdrop/files/patch-aj
+++ b/irc/eggdrop/files/patch-aj
@@ -1,5 +1,5 @@
---- src/mod/Makefile.in.orig	Mon Jun  2 11:36:50 2003
-+++ src/mod/Makefile.in	Mon Jun  2 11:39:02 2003
+--- eggdrop1.6.15/src/mod/Makefile.in.orig	Mon Jun  2 11:36:50 2003
++++ eggdrop1.6.15/src/mod/Makefile.in	Mon Jun  2 11:39:02 2003
 @@ -87,7 +87,7 @@
  			echo "Configuring module $${modname} ..."; \
  			echo ""; \
diff --git a/irc/eggdrop/files/patch-ak b/irc/eggdrop/files/patch-ak
index 13f381689b52..8f5e11bb6bdb 100644
--- a/irc/eggdrop/files/patch-ak
+++ b/irc/eggdrop/files/patch-ak
@@ -1,5 +1,5 @@
---- src/eggdrop.h.orig	Mon Jun  2 11:39:45 2003
-+++ src/eggdrop.h	Mon Jun  2 11:40:17 2003
+--- eggdrop1.6.15/src/eggdrop.h.orig	Mon Jun  2 11:39:45 2003
++++ eggdrop1.6.15/src/eggdrop.h	Mon Jun  2 11:40:17 2003
 @@ -85,7 +85,7 @@
  
  
diff --git a/irc/eggdrop/files/patch-eggdrop.conf b/irc/eggdrop/files/patch-eggdrop.conf
new file mode 100644
index 000000000000..569eee5c1ea1
--- /dev/null
+++ b/irc/eggdrop/files/patch-eggdrop.conf
@@ -0,0 +1,29 @@
+--- eggdrop1.6.15/eggdrop.conf.orig	Mon May  5 00:05:32 2003
++++ eggdrop1.6.15/eggdrop.conf	Wed Mar  3 21:17:14 2004
+@@ -1,4 +1,4 @@
+-#! /path/to/executable/eggdrop
++#!%%PREFIX%%/bin/eggdrop
+ # ^- This should contain a fully qualified path to your Eggdrop executable.
+ #
+ # $Id: eggdrop.conf,v 1.26 2003/04/17 04:38:33 wcc Exp $
+@@ -422,7 +422,7 @@
+ # 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 :)
+-set mod-path "modules/"
++set mod-path "%%PREFIX%%/lib/eggdrop/"
+ 
+ 
+ #### DNS MODULE ####
+@@ -814,6 +814,11 @@
+   you.need.to.change.this:6667
+   another.example.com: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
+ 
+ # This setting makes the bot try to get his original nickname back if its
+ # primary nickname is already in use.