- Integrate SSL patch (turned off by default)

- Cleanup

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

13 files changed, 91 insertions, 42 deletions

diff --git a/irc/eggdrop/Makefile b/irc/eggdrop/Makefile
index 6853fe5e81e7..a4c04401006c 100644
--- a/irc/eggdrop/Makefile
+++ b/irc/eggdrop/Makefile
@@ -7,15 +7,19 @@
 
 PORTNAME=	eggdrop
 PORTVERSION=	1.6.15
-PORTREVISION=	3
-CATEGORIES=	irc tcl84
+PORTREVISION=	4
+CATEGORIES=	irc tcl84 ipv6
 MASTER_SITES=	ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/
 DISTNAME=	${PORTNAME:S/-//}${PORTVERSION}
 
+PATCHFILES=	eggdrop1.6.15-ssl.fixed.diff.gz
+PATCH_SITES=	http://www.egghelp.org/files/patches/
+PATCH_WRKSRC=	${WRKDIR}
+
 MAINTAINER=	q@uni.de
 COMMENT=	The most popular open source Internet Relay Chat bot
 
-.include <bsd.port.pre.mk>
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 .if !defined(WITHOUT_TCL)
 LIB_DEPENDS+=		tcl84.1:${PORTSDIR}/lang/tcl84
@@ -23,6 +27,15 @@ CONFIGURE_ARGS+=	--with-tcllib=${LOCALBASE}/lib/libtcl84.so \
 			--with-tclinc=${LOCALBASE}/include/tcl8.4/tcl.h
 .endif
 
+.if defined(WITH_SSL)
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=	--with-ssl
+.else
+CONFIGURE_ARGS+=	--without-ssl
+.endif
+
+.include <bsd.port.pre.mk>
+
 .if ${OSVERSION} >= 400014 && defined(WITH_IPV6)
 CONFIGURE_ARGS+=	--enable-ipv6
 PLIST_SUB+=		IPV6="@comment "
@@ -31,7 +44,6 @@ PLIST_SUB+=		IPV6=""
 .endif
 
 GNU_CONFIGURE=	yes
-USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
 MAN1=		eggdrop.1
@@ -40,19 +52,21 @@ pre-everything::
 .if ${OSVERSION} >= 400014 && !defined(WITH_IPV6)
 	@${ECHO_MSG} 'Define WITH_IPV6 to enable IPv6 support'
 .endif
-
-post-patch:
-	@(cd ${WRKSRC} && ${REINPLACE_CMD} \
-		-e 's,modules/,${PREFIX}/lib/eggdrop/,' \
-		-e 's,#! /path/to/executable/,#!${PREFIX}/bin/,' eggdrop.conf)
+.if !defined(WITH_SSL)
+	@${ECHO_MSG} 'Define WITH_SSL to enable SSL support'
+.endif
 
 post-configure:
-	@(cd ${BUILD_WRKSRC}; ${MAKE} config)
+	@(cd ${WRKSRC}; ${MAKE} config)
+	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKSRC}/eggdrop.conf \
+		> ${WRKSRC}/eggdrop.conf.sample
+	# Workaround broken relative path in SSL-patch
+	@(cd ${WRKSRC}/src && ${LN} -s ../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 ${PREFIX}/etc/eggdrop.conf.sample
+	@${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
@@ -101,6 +115,6 @@ do-install:
 .endif
 
 post-install:
-	@${SED} -e 's#$${PREFIX}#${PREFIX}#g' ${PKGMESSAGE}
+	@${SED} -e 's#%%PREFIX%%#${PREFIX}#g' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/irc/eggdrop/distinfo b/irc/eggdrop/distinfo
index 940a5373170d..0662f2b01ee4 100644
--- a/irc/eggdrop/distinfo
+++ b/irc/eggdrop/distinfo
@@ -1,2 +1,4 @@
 MD5 (eggdrop1.6.15.tar.gz) = f1f0c3e8b914d626c06a567560f737dd
 SIZE (eggdrop1.6.15.tar.gz) = 961868
+MD5 (eggdrop1.6.15-ssl.fixed.diff.gz) = ac2a146dc1ec2c4e28bf8e77178fae74
+SIZE (eggdrop1.6.15-ssl.fixed.diff.gz) = 20318
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.
diff --git a/irc/eggdrop/pkg-message b/irc/eggdrop/pkg-message
index 99b78c0953f1..68f969678c0c 100644
--- a/irc/eggdrop/pkg-message
+++ b/irc/eggdrop/pkg-message
@@ -1,6 +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.
+%%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 3da08d20c65c..b3ee8a706c32 100644
--- a/irc/eggdrop/pkg-plist
+++ b/irc/eggdrop/pkg-plist
@@ -164,4 +164,4 @@ lib/eggdrop/wire.so
 @dirrm %%DATADIR%%/language
 @dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/text
-@dirrm %%DATADIR%%
+@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true