3 files changed, 209 insertions, 118 deletions

diff --git a/irc/eggdrop/Makefile b/irc/eggdrop/Makefile
index d6d09645d9e5..7a62b759661b 100644
--- a/irc/eggdrop/Makefile
+++ b/irc/eggdrop/Makefile
@@ -7,17 +7,27 @@
 
 PORTNAME=	eggdrop
 PORTVERSION=	1.6.15
-CATEGORIES=	irc
+PORTREVISION=	1
+CATEGORIES=	irc tcl84
 MASTER_SITES=	ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/
 DISTNAME=	${PORTNAME:S/-//}${PORTVERSION}
 
 MAINTAINER=	q@uni.de
 COMMENT=	The most popular open source Internet Relay Chat bot
 
+.include <bsd.port.pre.mk>
+
 .if !defined(WITHOUT_TCL)
-BUILD_DEPENDS+=		${LOCALBASE}/include/tcl8.3/tcl.h:${PORTSDIR}/lang/tcl83
-CONFIGURE_ARGS+=	--with-tcllib=${LOCALBASE}/lib/libtcl83.so \
-			--with-tclinc=${LOCALBASE}/include/tcl8.3/tcl.h
+BUILD_DEPENDS+=		${LOCALBASE}/include/tcl8.4/tcl.h:${PORTSDIR}/lang/tcl84
+CONFIGURE_ARGS+=	--with-tcllib=${LOCALBASE}/lib/libtcl84.so \
+			--with-tclinc=${LOCALBASE}/include/tcl8.4/tcl.h
+.endif
+
+.if ${OSVERSION} >= 400014 && defined(WITH_IPV6)
+CONFIGURE_ARGS+=	--enable-ipv6
+PLIST_SUB+=		IPV6="@comment "
+.else
+PLIST_SUB+=		IPV6=""
 .endif
 
 GNU_CONFIGURE=	yes
@@ -26,6 +36,11 @@ INSTALLS_SHLIB=	yes
 
 MAN1=		eggdrop.1
 
+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/,' \
@@ -35,36 +50,57 @@ post-configure:
 	@(cd ${BUILD_WRKSRC}; ${MAKE} config)
 
 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
-	${MKDIR} ${PREFIX}/lib/eggdrop
-	${MKDIR} ${PREFIX}/share/eggdrop ${PREFIX}/share/eggdrop/scripts \
-		${PREFIX}/share/eggdrop/language ${PREFIX}/share/eggdrop/help \
-		${PREFIX}/share/eggdrop/help/set
-	${INSTALL_DATA} ${WRKSRC}/language/core.*.lang \
-		${PREFIX}/share/eggdrop/language/
+	@${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
+	@${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/
+	compress.so console.so ctcp.so filesys.so irc.so notes.so seen.so \
+	server.so share.so transfer.so uptime.so wire.so ${PREFIX}/lib/eggdrop
+.if !defined(WITH_IPV6)
+	@cd ${WRKSRC} && ${INSTALL_DATA} dns.so ${PREFIX}/lib/eggdrop
+.endif
+.for f in assoc.mod/help/assoc.help channels.mod/help/chaninfo.help \
+	channels.mod/help/channels.help console.mod/help/console.help \
+	filesys.mod/help/filesys.help irc.mod/help/irc.help \
+	notes.mod/help/notes.help seen.mod/help/seen.help \
+	server.mod/help/server.help share.mod/help/share.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 \
+	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 \
+	transfer.mod/help/set/transfer.help
+	@${INSTALL_DATA} ${WRKSRC}/src/mod/$f ${DATADIR}/help/set
+.endfor
+.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
+.endfor
 	@cd ${WRKSRC}/src/mod && ${FIND} . -name "*.lang" -exec ${INSTALL_DATA} "{}" \
-		${PREFIX}/share/eggdrop/language/ ";"
+		${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 \
-		${PREFIX}/share/eggdrop/scripts/
+		${DATADIR}/scripts
 	@cd ${WRKSRC}/help && ${INSTALL_DATA} cmds1.help cmds2.help core.help \
-		${PREFIX}/share/eggdrop/help/
+		${DATADIR}/help
 	@cd ${WRKSRC}/help/set && ${INSTALL_DATA} cmds1.help \
-		${PREFIX}/share/eggdrop/help/set/
+		${DATADIR}/help/set
+	@cd ${WRKSRC}/text && ${INSTALL_DATA} banner motd ${DATADIR}/text
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/eggdrop ${PREFIX}/share/eggdrop/html
+	@${MKDIR} ${DOCSDIR}/settings ${DOCSDIR}/html
 	@cd ${WRKSRC}/doc && ${INSTALL_DATA} BOTNET tcl-commands.doc tricks \
-		${PREFIX}/share/eggdrop/
-	@cd ${WRKSRC}/doc/html && ${INSTALL_DATA} *.html ${PREFIX}/share/eggdrop/html
+		BUG-REPORT first_script.txt KNOWN-PROBLEMS MODULES PARTYLINE \
+		text-substitutions.doc UPDATES1.5 UPDATES1.6 ${DOCSDIR}
+	@cd ${WRKSRC}/doc/html && ${INSTALL_DATA} *.html ${DOCSDIR}/html
+	@cd ${WRKSRC}/doc/settings && ${INSTALL_DATA} * ${DOCSDIR}/settings
 .endif
 
 post-install:
 	@${SED} -e 's#$${PREFIX}#${PREFIX}#g' ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/irc/eggdrop/pkg-message b/irc/eggdrop/pkg-message
index 9b0c37429dba..99b78c0953f1 100644
--- a/irc/eggdrop/pkg-message
+++ b/irc/eggdrop/pkg-message
@@ -2,5 +2,5 @@ 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/eggdrop/html, scripts go
+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 a61b3a24ad90..3da08d20c65c 100644
--- a/irc/eggdrop/pkg-plist
+++ b/irc/eggdrop/pkg-plist
@@ -6,7 +6,7 @@ lib/eggdrop/channels.so
 lib/eggdrop/compress.so
 lib/eggdrop/console.so
 lib/eggdrop/ctcp.so
-lib/eggdrop/dns.so
+%%IPV6%%lib/eggdrop/dns.so
 lib/eggdrop/filesys.so
 lib/eggdrop/irc.so
 lib/eggdrop/notes.so
@@ -16,97 +16,152 @@ lib/eggdrop/share.so
 lib/eggdrop/transfer.so
 lib/eggdrop/uptime.so
 lib/eggdrop/wire.so
-share/eggdrop/help/cmds1.help
-share/eggdrop/help/cmds2.help
-share/eggdrop/help/core.help
-share/eggdrop/help/set/cmds1.help
-%%PORTDOCS%%share/eggdrop/BOTNET
-%%PORTDOCS%%share/eggdrop/tcl-commands.doc
-%%PORTDOCS%%share/eggdrop/tricks
-%%PORTDOCS%%share/eggdrop/html/about.html
-%%PORTDOCS%%share/eggdrop/html/app-problems.html
-%%PORTDOCS%%share/eggdrop/html/app-textsub.html
-%%PORTDOCS%%share/eggdrop/html/app-tricks.html
-%%PORTDOCS%%share/eggdrop/html/app-weird.html
-%%PORTDOCS%%share/eggdrop/html/authors.html
-%%PORTDOCS%%share/eggdrop/html/bans.html
-%%PORTDOCS%%share/eggdrop/html/botnet.html
-%%PORTDOCS%%share/eggdrop/html/compiling.html
-%%PORTDOCS%%share/eggdrop/html/egg-core.html
-%%PORTDOCS%%share/eggdrop/html/faqs.html
-%%PORTDOCS%%share/eggdrop/html/features.html
-%%PORTDOCS%%share/eggdrop/html/index.html
-%%PORTDOCS%%share/eggdrop/html/install.html
-%%PORTDOCS%%share/eggdrop/html/ipv6.html
-%%PORTDOCS%%share/eggdrop/html/mod-assoc.html
-%%PORTDOCS%%share/eggdrop/html/mod-blowfish.html
-%%PORTDOCS%%share/eggdrop/html/mod-channels.html
-%%PORTDOCS%%share/eggdrop/html/mod-compress.html
-%%PORTDOCS%%share/eggdrop/html/mod-console.html
-%%PORTDOCS%%share/eggdrop/html/mod-ctcp.html
-%%PORTDOCS%%share/eggdrop/html/mod-dns.html
-%%PORTDOCS%%share/eggdrop/html/mod-filesys.html
-%%PORTDOCS%%share/eggdrop/html/mod-irc.html
-%%PORTDOCS%%share/eggdrop/html/mod-notes.html
-%%PORTDOCS%%share/eggdrop/html/mod-seen.html
-%%PORTDOCS%%share/eggdrop/html/mod-server.html
-%%PORTDOCS%%share/eggdrop/html/mod-share.html
-%%PORTDOCS%%share/eggdrop/html/mod-uptime.html
-%%PORTDOCS%%share/eggdrop/html/mod-wire.html
-%%PORTDOCS%%share/eggdrop/html/mod-woobie.html
-%%PORTDOCS%%share/eggdrop/html/news.html
-%%PORTDOCS%%share/eggdrop/html/party.html
-%%PORTDOCS%%share/eggdrop/html/patch-howto.html
-%%PORTDOCS%%share/eggdrop/html/readme.html
-%%PORTDOCS%%share/eggdrop/html/starting.html
-%%PORTDOCS%%share/eggdrop/html/tcl-commands.html
-%%PORTDOCS%%share/eggdrop/html/users.html
-share/eggdrop/language/core.danish.lang
-share/eggdrop/language/core.english.lang
-share/eggdrop/language/core.french.lang
-share/eggdrop/language/core.german.lang
-share/eggdrop/language/assoc.danish.lang
-share/eggdrop/language/assoc.english.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.french.lang
-share/eggdrop/language/console.german.lang
-share/eggdrop/language/filesys.danish.lang
-share/eggdrop/language/filesys.english.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.french.lang
-share/eggdrop/language/notes.german.lang
-share/eggdrop/language/transfer.danish.lang
-share/eggdrop/language/transfer.english.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.french.lang
-share/eggdrop/language/wire.german.lang
-share/eggdrop/scripts/CONTENTS
-share/eggdrop/scripts/action.fix.tcl
-share/eggdrop/scripts/alltools.tcl
-share/eggdrop/scripts/autobotchk
-share/eggdrop/scripts/botchk
-share/eggdrop/scripts/cmd_resolve.tcl
-share/eggdrop/scripts/compat.tcl
-share/eggdrop/scripts/getops.tcl
-share/eggdrop/scripts/klined.tcl
-share/eggdrop/scripts/notes2.tcl
-share/eggdrop/scripts/ques5.tcl
-share/eggdrop/scripts/sentinel.tcl
-share/eggdrop/scripts/userinfo.tcl
-share/eggdrop/scripts/weed
+%%DATADIR%%/help/assoc.help
+%%DATADIR%%/help/chaninfo.help
+%%DATADIR%%/help/channels.help
+%%DATADIR%%/help/cmds1.help
+%%DATADIR%%/help/cmds2.help
+%%DATADIR%%/help/console.help
+%%DATADIR%%/help/core.help
+%%DATADIR%%/help/filesys.help
+%%DATADIR%%/help/irc.help
+%%DATADIR%%/help/notes.help
+%%DATADIR%%/help/seen.help
+%%DATADIR%%/help/server.help
+%%DATADIR%%/help/share.help
+%%DATADIR%%/help/msg/irc.help
+%%DATADIR%%/help/msg/notes.help
+%%DATADIR%%/help/msg/seen.help
+%%DATADIR%%/help/set/channels.help
+%%DATADIR%%/help/set/cmds1.help
+%%DATADIR%%/help/set/compress.help
+%%DATADIR%%/help/set/console.help
+%%DATADIR%%/help/set/ctcp.help
+%%DATADIR%%/help/set/filesys.help
+%%DATADIR%%/help/set/irc.help
+%%DATADIR%%/help/set/notes.help
+%%DATADIR%%/help/set/server.help
+%%DATADIR%%/help/set/transfer.help
+%%DATADIR%%/language/core.danish.lang
+%%DATADIR%%/language/core.english.lang
+%%DATADIR%%/language/core.french.lang
+%%DATADIR%%/language/core.german.lang
+%%DATADIR%%/language/assoc.danish.lang
+%%DATADIR%%/language/assoc.english.lang
+%%DATADIR%%/language/assoc.french.lang
+%%DATADIR%%/language/assoc.german.lang
+%%DATADIR%%/language/console.danish.lang
+%%DATADIR%%/language/console.english.lang
+%%DATADIR%%/language/console.french.lang
+%%DATADIR%%/language/console.german.lang
+%%DATADIR%%/language/filesys.danish.lang
+%%DATADIR%%/language/filesys.english.lang
+%%DATADIR%%/language/filesys.french.lang
+%%DATADIR%%/language/filesys.german.lang
+%%DATADIR%%/language/notes.danish.lang
+%%DATADIR%%/language/notes.english.lang
+%%DATADIR%%/language/notes.french.lang
+%%DATADIR%%/language/notes.german.lang
+%%DATADIR%%/language/transfer.danish.lang
+%%DATADIR%%/language/transfer.english.lang
+%%DATADIR%%/language/transfer.french.lang
+%%DATADIR%%/language/transfer.german.lang
+%%DATADIR%%/language/wire.danish.lang
+%%DATADIR%%/language/wire.english.lang
+%%DATADIR%%/language/wire.french.lang
+%%DATADIR%%/language/wire.german.lang
+%%DATADIR%%/scripts/CONTENTS
+%%DATADIR%%/scripts/action.fix.tcl
+%%DATADIR%%/scripts/alltools.tcl
+%%DATADIR%%/scripts/autobotchk
+%%DATADIR%%/scripts/botchk
+%%DATADIR%%/scripts/cmd_resolve.tcl
+%%DATADIR%%/scripts/compat.tcl
+%%DATADIR%%/scripts/getops.tcl
+%%DATADIR%%/scripts/klined.tcl
+%%DATADIR%%/scripts/notes2.tcl
+%%DATADIR%%/scripts/ques5.tcl
+%%DATADIR%%/scripts/sentinel.tcl
+%%DATADIR%%/scripts/userinfo.tcl
+%%DATADIR%%/scripts/weed
+%%DATADIR%%/text/banner
+%%DATADIR%%/text/motd
+%%PORTDOCS%%%%DOCSDIR%%/BOTNET
+%%PORTDOCS%%%%DOCSDIR%%/tcl-commands.doc
+%%PORTDOCS%%%%DOCSDIR%%/tricks
+%%PORTDOCS%%%%DOCSDIR%%/BUG-REPORT
+%%PORTDOCS%%%%DOCSDIR%%/first_script.txt
+%%PORTDOCS%%%%DOCSDIR%%/KNOWN-PROBLEMS
+%%PORTDOCS%%%%DOCSDIR%%/MODULES
+%%PORTDOCS%%%%DOCSDIR%%/PARTYLINE
+%%PORTDOCS%%%%DOCSDIR%%/text-substitutions.doc
+%%PORTDOCS%%%%DOCSDIR%%/UPDATES1.5
+%%PORTDOCS%%%%DOCSDIR%%/UPDATES1.6
+%%PORTDOCS%%%%DOCSDIR%%/html/about.html
+%%PORTDOCS%%%%DOCSDIR%%/html/app-problems.html
+%%PORTDOCS%%%%DOCSDIR%%/html/app-textsub.html
+%%PORTDOCS%%%%DOCSDIR%%/html/app-tricks.html
+%%PORTDOCS%%%%DOCSDIR%%/html/app-weird.html
+%%PORTDOCS%%%%DOCSDIR%%/html/authors.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bans.html
+%%PORTDOCS%%%%DOCSDIR%%/html/botnet.html
+%%PORTDOCS%%%%DOCSDIR%%/html/compiling.html
+%%PORTDOCS%%%%DOCSDIR%%/html/egg-core.html
+%%PORTDOCS%%%%DOCSDIR%%/html/faqs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/features.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/install.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ipv6.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mod-assoc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mod-blowfish.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mod-channels.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mod-compress.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mod-console.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mod-ctcp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mod-dns.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mod-filesys.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mod-irc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mod-notes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mod-seen.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mod-server.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mod-share.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mod-uptime.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mod-wire.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mod-woobie.html
+%%PORTDOCS%%%%DOCSDIR%%/html/news.html
+%%PORTDOCS%%%%DOCSDIR%%/html/party.html
+%%PORTDOCS%%%%DOCSDIR%%/html/patch-howto.html
+%%PORTDOCS%%%%DOCSDIR%%/html/readme.html
+%%PORTDOCS%%%%DOCSDIR%%/html/starting.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tcl-commands.html
+%%PORTDOCS%%%%DOCSDIR%%/html/users.html
+%%PORTDOCS%%%%DOCSDIR%%/settings/CONTENTS
+%%PORTDOCS%%%%DOCSDIR%%/settings/core.settings
+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.assoc
+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.blowfish
+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.channels
+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.compress
+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.console
+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.ctcp
+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.dns
+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.filesys
+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.irc
+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.notes
+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.seen
+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.server
+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.share
+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.transfer
+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.uptime
+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.wire
+%%PORTDOCS%%%%DOCSDIR%%/settings/mod.woobie
 @dirrm lib/eggdrop
-%%PORTDOCS%%@dirrm share/eggdrop/html
-@dirrm share/eggdrop/help/set
-@dirrm share/eggdrop/help
-@dirrm share/eggdrop/language
-@dirrm share/eggdrop/scripts
-@dirrm share/eggdrop
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/settings
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/help/set
+@dirrm %%DATADIR%%/help/msg
+@dirrm %%DATADIR%%/help
+@dirrm %%DATADIR%%/language
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/text
+@dirrm %%DATADIR%%