14 files changed, 99 insertions, 84 deletions

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-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-ac b/irc/eggdrop/files/patch-src__Makefile.in
index b66a1b6ef1c7..1b1bf646acd6 100644
--- a/irc/eggdrop/files/patch-ac
+++ b/irc/eggdrop/files/patch-src__Makefile.in
@@ -1,6 +1,7 @@
---- 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 @@
+--- 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@
diff --git a/irc/eggdrop/files/patch-ak b/irc/eggdrop/files/patch-src__eggdrop.h
index ffbf474a63fe..fd30aba9a92b 100644
--- a/irc/eggdrop/files/patch-ak
+++ b/irc/eggdrop/files/patch-src__eggdrop.h
@@ -1,5 +1,5 @@
---- 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
+--- 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                   */
diff --git a/irc/eggdrop/files/patch-ab b/irc/eggdrop/files/patch-src__main.c
index 9f449f297e57..bd4cb93d0a9d 100644
--- a/irc/eggdrop/files/patch-ab
+++ b/irc/eggdrop/files/patch-src__main.c
@@ -1,5 +1,5 @@
---- 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
+--- 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
  
diff --git a/irc/eggdrop/files/patch-src::md5::md5c.c b/irc/eggdrop/files/patch-src__md5__md5c.c
index 0d152f49d743..edafcd651ddd 100644
--- a/irc/eggdrop/files/patch-src::md5::md5c.c
+++ b/irc/eggdrop/files/patch-src__md5__md5c.c
@@ -1,5 +1,5 @@
---- 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
+--- 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"
diff --git a/irc/eggdrop/files/patch-aj b/irc/eggdrop/files/patch-src__mod__Makefile.in
index 9c9c648dfb93..daa14cf0703e 100644
--- a/irc/eggdrop/files/patch-aj
+++ b/irc/eggdrop/files/patch-src__mod__Makefile.in
@@ -1,5 +1,5 @@
---- 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
+--- 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}'."; \
diff --git a/irc/eggdrop/files/patch-ae b/irc/eggdrop/files/patch-src__mod__ctcp.mod__ctcp.c
index 754f5adcc17d..4440fa705b43 100644
--- a/irc/eggdrop/files/patch-ae
+++ b/irc/eggdrop/files/patch-src__mod__ctcp.mod__ctcp.c
@@ -1,5 +1,5 @@
---- 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
+--- 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
diff --git a/irc/eggdrop/files/patch-ad b/irc/eggdrop/files/patch-src__mod__filesys.mod__filesys.c
index cb0871338d4d..a7c19d1e57f7 100644
--- a/irc/eggdrop/files/patch-ad
+++ b/irc/eggdrop/files/patch-src__mod__filesys.mod__filesys.c
@@ -1,5 +1,5 @@
---- 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
+--- 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];
diff --git a/irc/eggdrop/files/patch-ai b/irc/eggdrop/files/patch-src__mod__share.mod__share.c
index f241da179281..b36fad862168 100644
--- a/irc/eggdrop/files/patch-ai
+++ b/irc/eggdrop/files/patch-src__mod__share.mod__share.c
@@ -1,5 +1,5 @@
---- 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
+--- 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;
diff --git a/irc/eggdrop/files/patch-ah b/irc/eggdrop/files/patch-src__modules.c
index a5c9c33fc5c3..5ad3cfa09ada 100644
--- a/irc/eggdrop/files/patch-ah
+++ b/irc/eggdrop/files/patch-src__modules.c
@@ -1,5 +1,5 @@
---- 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
+--- 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/";
diff --git a/irc/eggdrop/pkg-message b/irc/eggdrop/files/pkg-message.in
index 68f969678c0c..68f969678c0c 100644
--- a/irc/eggdrop/pkg-message
+++ b/irc/eggdrop/files/pkg-message.in
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