o Install documentation in the right place [1]

o Install more documentation [2]
o Introduce WITH_IPV6 [3]
o Use TCL 8.4
o Use DOCSDIR and DATADIR where appropriate
o Bump PORTREVISION

Submitted by:	maintainer
Obtained from:	NetBSD [1],[2],[3]

1 files changed, 59 insertions, 23 deletions

diff --git a/irc/eggdrop/Makefile b/irc/eggdrop/Makefile
index d6d0964..7a62b75 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>