- Update to 1.1.8

- Remove 4.x cruft

PR:		ports/113501
Submitted by:	Craig Edwards <brain@inspircd.org>
Approved By:	sat (mentor)

5 files changed, 179 insertions, 140 deletions

diff --git a/irc/inspircd/Makefile b/irc/inspircd/Makefile
index ffee72a2cf2b..872593ed8bf1 100644
--- a/irc/inspircd/Makefile
+++ b/irc/inspircd/Makefile
@@ -6,53 +6,42 @@
 #
 
 PORTNAME=	inspircd
-PORTVERSION=	1.0.6
+PORTVERSION=	1.1.8
 CATEGORIES=	irc
 MASTER_SITES=	http://www.inspircd.org/downloads/ \
 		http://www.chatspike.net/downloads/
+DISTNAME=	InspIRCd-${PORTVERSION}
 
 MAINTAINER=	brain@inspircd.org
 COMMENT=	A modular C++ IRC daemon
 
-USE_GCC=	3.2+
+WRKSRC=	${WRKDIR}/inspircd
 USE_GMAKE=	yes
+USE_BZIP2=	yes
 
 # Configure script is written in perl
 USE_PERL5_BUILD=yes
 
-CONFIGURE_ARGS=	-update
 HAS_CONFIGURE=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		does not compile (old perl)
-.endif
-
-# We're using a nonstandard configure, so these cached
-# values must be copied into the ${WRKSRC} directory.
-pre-configure:
-	@${CP} ${FILESDIR}/config.cache ${WRKSRC}/.config.cache
-	@echo 'CC="${CC}"' >> ${WRKSRC}/.config.cache
-	@echo 'CONFIG_DIR="${PREFIX}/etc/inspircd"' >> ${WRKSRC}/.config.cache
-	@echo 'MODULE_DIR="${PREFIX}/lib/inspircd/modules"' >> ${WRKSRC}/.config.cache
-	@echo 'LIBRARY_DIR="${PREFIX}/lib/inspircd"' >> ${WRKSRC}/.config.cache
-	@echo 'BASE_DIR="${PREFIX}/inspircd"' >> ${WRKSRC}/.config.cache
-	@echo 'BINARY_DIR="${PREFIX}/bin"' >> ${WRKSRC}/.config.cache
-	@echo 'ME="${PREFIX}"' >> ${WRKSRC}/.config.cache
+CONFIGURE_ARGS=	--with-cc=${CXX} --config-dir=${PREFIX}/etc/inspircd \
+		--module-dir=${PREFIX}/lib/inspircd/modules \
+		--library-dir=${PREFIX}/lib/inspircd \
+		--prefix=${PREFIX}/inspircd --binary-dir=${PREFIX}/bin \
+		--enable-remote-ipv6 --disable-interactive
 
 # 1.0.6 Makefile forgets to make these directories
 # during install. We make these ourselves. This may
 # be fixed in a later version of InspIRCd.
-pre-su-install:
-	@-${MKDIR} ${PREFIX}/inspircd
-	@-${MKDIR} ${PREFIX}/lib/inspircd
-	@-${MKDIR} ${PREFIX}/lib/inspircd/modules
-	@-${MKDIR} ${PREFIX}/etc/inspircd
+pre-install:
+	@${INSTALL} -d ${PREFIX}/inspircd/
+	@${INSTALL} -d ${PREFIX}/lib/inspircd/
+	@${INSTALL} -d ${PREFIX}/lib/inspircd/modules/
+	@${INSTALL} -d ${PREFIX}/etc/inspircd/
 
 post-install:
-	${STRIP_CMD} ${PREFIX}/lib/inspircd/modules/*.so
-	${STRIP_CMD} ${PREFIX}/lib/inspircd/*.so
-	${STRIP_CMD} ${PREFIX}/bin/inspircd
+	@${STRIP_CMD} ${PREFIX}/lib/inspircd/modules/*.so
+	@${STRIP_CMD} ${PREFIX}/lib/inspircd/*.so
+	@${STRIP_CMD} ${PREFIX}/bin/inspircd
+	@${CHMOD} -R a+rX ${PREFIX}/bin/inspitcd ${PREFIX}/inspircd/ ${PREFIX}/lib/inspircd/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/irc/inspircd/distinfo b/irc/inspircd/distinfo
index 11675e903bda..e4abed9a0fbf 100644
--- a/irc/inspircd/distinfo
+++ b/irc/inspircd/distinfo
@@ -1,3 +1,3 @@
-MD5 (inspircd-1.0.6.tar.gz) = 574ddfd0a173f1f5249fb5313177d523
-SHA256 (inspircd-1.0.6.tar.gz) = d558309cedd74bc277174a633d218826aab3eb66ff41581301319ea120be8ab7
-SIZE (inspircd-1.0.6.tar.gz) = 422997
+MD5 (InspIRCd-1.1.8.tar.bz2) = f86b39cef74381434a27508357161fe8
+SHA256 (InspIRCd-1.1.8.tar.bz2) = 427af997ee9d90e073c3daa30d978c63a61d3731b731efc519a121dca41d85f0
+SIZE (InspIRCd-1.1.8.tar.bz2) = 484433
diff --git a/irc/inspircd/files/config.cache b/irc/inspircd/files/config.cache
deleted file mode 100644
index 80411c765e60..000000000000
--- a/irc/inspircd/files/config.cache
+++ /dev/null
@@ -1,36 +0,0 @@
-MAX_KICK="255"
-MAKEPROG="make"
-MAX_IDENT="12"
-HAS_KQUEUE="1"
-MAX_GECOS="128"
-MAX_CLIENT_T="5018"
-STATIC_LINK="no"
-MAXI_MODES="20"
-USE_GNUTLS="n"
-HAS_OPENSSL="n"
-GCCVER="3"
-THREADED_DNS="n"
-MAX_TOPIC="307"
-MAKEORDER="ircd mods"
-HAS_GNUTLS="n"
-HAS_EPOLL="0"
-CHAN_LENGT="64"
-USE_OPENSSL="n"
-OPTIMISATI="-g"
-USE_KQUEUE="y"
-FLAGS="-fPIC -frtti -Wall -Woverloaded-virtual -g"
-NICK_LENGT="31"
-HAS_STRLCPY="true"
-MAX_CLIENT="5018"
-MAX_CHANNE="20"
-MAX_DESCRIPTORS="5018"
-GCC34="4"
-MAX_AWAY="200"
-LDLIBS="-Ldl -lstdc++"
-CHANGE_COMPILER="n"
-MAX_QUIT="255"
-STATICLIBS=""
-OSNAME="FreeBSD"
-MAX_OPERCH="60"
-OPTIMITEMP="0"
-USE_EPOLL="y"
diff --git a/irc/inspircd/pkg-message b/irc/inspircd/pkg-message
deleted file mode 100644
index 82eba2dc7302..000000000000
--- a/irc/inspircd/pkg-message
+++ /dev/null
@@ -1,2 +0,0 @@
-Don't forget to copy the example configuration file inspircd.conf.example
-as inspircd.conf, or use inspircd -config <filename> to start InspIRCd.
diff --git a/irc/inspircd/pkg-plist b/irc/inspircd/pkg-plist
index 463d6a48b5ba..5a40ad0e810b 100644
--- a/irc/inspircd/pkg-plist
+++ b/irc/inspircd/pkg-plist
@@ -1,20 +1,25 @@
 bin/inspircd
+etc/inspircd/inspircd.motd.example
+etc/inspircd/inspircd.helpop-full.example
+etc/inspircd/inspircd.helpop.example
+etc/inspircd/inspircd.censor.example
+etc/inspircd/inspircd.filter.example
 inspircd/inspircd
-lib/inspircd/libIRCDaes.so
+inspircd/.gdbargs
 lib/inspircd/libIRCDasyncdns.so
 lib/inspircd/libIRCDbase.so
 lib/inspircd/libIRCDchannels.so
 lib/inspircd/libIRCDcommand_parse.so
 lib/inspircd/libIRCDcommands.so
+lib/inspircd/libIRCDconfigreader.so
 lib/inspircd/libIRCDcull_list.so
-lib/inspircd/libIRCDdnsqueue.so
 lib/inspircd/libIRCDdynamic.so
 lib/inspircd/libIRCDhash.so
 lib/inspircd/libIRCDhelper.so
-lib/inspircd/libIRCDio.so
-lib/inspircd/libIRCDmessage.so
+lib/inspircd/libIRCDinspsocket.so
 lib/inspircd/libIRCDmode.so
 lib/inspircd/libIRCDmodules.so
+lib/inspircd/libIRCDsnomasks.so
 lib/inspircd/libIRCDsocket.so
 lib/inspircd/libIRCDsocketengine.so
 lib/inspircd/libIRCDstring.so
@@ -23,87 +28,170 @@ lib/inspircd/libIRCDuserprocess.so
 lib/inspircd/libIRCDusers.so
 lib/inspircd/libIRCDwildcard.so
 lib/inspircd/libIRCDxline.so
-lib/inspircd/modules/m_alias.so
-lib/inspircd/modules/m_antibear.so
-lib/inspircd/modules/m_antibottler.so
-lib/inspircd/modules/m_banexception.so
-lib/inspircd/modules/m_blockamsg.so
+lib/inspircd/cmd_admin.so
+lib/inspircd/cmd_away.so
+lib/inspircd/cmd_clearcache.so
+lib/inspircd/cmd_commands.so
+lib/inspircd/cmd_connect.so
+lib/inspircd/cmd_die.so
+lib/inspircd/cmd_eline.so
+lib/inspircd/cmd_gline.so
+lib/inspircd/cmd_info.so
+lib/inspircd/cmd_invite.so
+lib/inspircd/cmd_ison.so
+lib/inspircd/cmd_join.so
+lib/inspircd/cmd_kick.so
+lib/inspircd/cmd_kill.so
+lib/inspircd/cmd_kline.so
+lib/inspircd/cmd_links.so
+lib/inspircd/cmd_list.so
+lib/inspircd/cmd_loadmodule.so
+lib/inspircd/cmd_lusers.so
+lib/inspircd/cmd_map.so
+lib/inspircd/cmd_mode.so
+lib/inspircd/cmd_modules.so
+lib/inspircd/cmd_motd.so
+lib/inspircd/cmd_names.so
+lib/inspircd/cmd_nick.so
+lib/inspircd/cmd_notice.so
+lib/inspircd/cmd_oper.so
+lib/inspircd/cmd_part.so
+lib/inspircd/cmd_pass.so
+lib/inspircd/cmd_ping.so
+lib/inspircd/cmd_pong.so
+lib/inspircd/cmd_privmsg.so
+lib/inspircd/cmd_qline.so
+lib/inspircd/cmd_quit.so
+lib/inspircd/cmd_rehash.so
+lib/inspircd/cmd_reloadmodule.so
+lib/inspircd/cmd_restart.so
+lib/inspircd/cmd_rules.so
+lib/inspircd/cmd_server.so
+lib/inspircd/cmd_squit.so
+lib/inspircd/cmd_stats.so
+lib/inspircd/cmd_summon.so
+lib/inspircd/cmd_time.so
+lib/inspircd/cmd_topic.so
+lib/inspircd/cmd_trace.so
+lib/inspircd/cmd_unloadmodule.so
+lib/inspircd/cmd_user.so
+lib/inspircd/cmd_userhost.so
+lib/inspircd/cmd_users.so
+lib/inspircd/cmd_version.so
+lib/inspircd/cmd_wallops.so
+lib/inspircd/cmd_who.so
+lib/inspircd/cmd_whois.so
+lib/inspircd/cmd_whowas.so
+lib/inspircd/cmd_zline.so
 lib/inspircd/modules/m_blockcaps.so
-lib/inspircd/modules/m_blockcolor.so
-lib/inspircd/modules/m_botmode.so
-lib/inspircd/modules/m_cban.so
+lib/inspircd/modules/m_blockamsg.so
+lib/inspircd/modules/m_dnsbl.so
 lib/inspircd/modules/m_censor.so
-lib/inspircd/modules/m_chanfilter.so
-lib/inspircd/modules/m_chanprotect.so
-lib/inspircd/modules/m_check.so
-lib/inspircd/modules/m_chghost.so
-lib/inspircd/modules/m_chgident.so
-lib/inspircd/modules/m_cloaking.so
-lib/inspircd/modules/m_conn_lusers.so
+lib/inspircd/modules/m_hideoper.so
 lib/inspircd/modules/m_conn_waitpong.so
-lib/inspircd/modules/m_connflood.so
-lib/inspircd/modules/m_denychans.so
-lib/inspircd/modules/m_devoice.so
+lib/inspircd/modules/m_vhost.so
+lib/inspircd/modules/m_safelist.so
+lib/inspircd/modules/m_remove.so
+lib/inspircd/modules/m_override.so
+lib/inspircd/modules/m_sapart.so
+lib/inspircd/modules/m_watch.so
+lib/inspircd/modules/m_botmode.so
+lib/inspircd/modules/m_tline.so
+lib/inspircd/modules/m_silence_ext.so
+lib/inspircd/modules/m_xmlsocket.so
+lib/inspircd/modules/m_uhnames.so
+lib/inspircd/modules/m_noinvite.so
+lib/inspircd/modules/m_services.so
 lib/inspircd/modules/m_filter.so
-lib/inspircd/modules/m_foobar.so
-lib/inspircd/modules/m_globalload.so
-lib/inspircd/modules/m_globops.so
-lib/inspircd/modules/m_helpop.so
-lib/inspircd/modules/m_hostchange.so
-lib/inspircd/modules/m_ident.so
-lib/inspircd/modules/m_inviteexception.so
-lib/inspircd/modules/m_joinflood.so
-lib/inspircd/modules/m_kicknorejoin.so
+lib/inspircd/modules/m_invisible.so
+lib/inspircd/modules/m_operjoin.so
+lib/inspircd/modules/m_sha256.so
 lib/inspircd/modules/m_knock.so
-lib/inspircd/modules/m_messageflood.so
-lib/inspircd/modules/m_nicklock.so
+lib/inspircd/modules/m_cban.so
 lib/inspircd/modules/m_noctcp.so
-lib/inspircd/modules/m_noinvite.so
+lib/inspircd/modules/m_oper_hash.so
+lib/inspircd/modules/m_globalload.so
+lib/inspircd/modules/m_userip.so
+lib/inspircd/modules/m_antibottler.so
 lib/inspircd/modules/m_nokicks.so
+lib/inspircd/modules/m_devoice.so
+lib/inspircd/modules/m_showwhois.so
+lib/inspircd/modules/m_ident.so
+lib/inspircd/modules/m_joinflood.so
+lib/inspircd/modules/m_blockcolor.so
+lib/inspircd/modules/m_helpop.so
+lib/inspircd/modules/m_opermotd.so
+lib/inspircd/modules/m_sslmodes.so
+lib/inspircd/modules/m_timedbans.so
+lib/inspircd/modules/m_chanprotect.so
 lib/inspircd/modules/m_nonicks.so
-lib/inspircd/modules/m_nonotice.so
-lib/inspircd/modules/m_operchans.so
-lib/inspircd/modules/m_operjoin.so
-lib/inspircd/modules/m_operlevels.so
-lib/inspircd/modules/m_opermd5.so
+lib/inspircd/modules/m_connflood.so
+lib/inspircd/modules/m_chanfilter.so
 lib/inspircd/modules/m_opermodes.so
-lib/inspircd/modules/m_opermotd.so
-lib/inspircd/modules/m_opersha256.so
-lib/inspircd/modules/m_operwho.so
-lib/inspircd/modules/m_override.so
-lib/inspircd/modules/m_park.so
-lib/inspircd/modules/m_randquote.so
-lib/inspircd/modules/m_redirect.so
-lib/inspircd/modules/m_remove.so
-lib/inspircd/modules/m_restrictchans.so
+lib/inspircd/modules/m_md5.so
+lib/inspircd/modules/m_namesx.so
 lib/inspircd/modules/m_restrictmsg.so
-lib/inspircd/modules/m_safelist.so
-lib/inspircd/modules/m_sajoin.so
-lib/inspircd/modules/m_samode.so
+lib/inspircd/modules/m_chghost.so
+lib/inspircd/modules/m_operchans.so
+lib/inspircd/modules/m_uninvite.so
+lib/inspircd/modules/m_services_account.so
+lib/inspircd/modules/m_taxonomy.so
+lib/inspircd/modules/m_banredirect.so
 lib/inspircd/modules/m_sanick.so
-lib/inspircd/modules/m_sapart.so
-lib/inspircd/modules/m_saquit.so
+lib/inspircd/modules/m_alias.so
+lib/inspircd/modules/m_inviteexception.so
+lib/inspircd/modules/m_deaf.so
+lib/inspircd/modules/m_lockserv.so
+lib/inspircd/modules/m_banexception.so
+lib/inspircd/modules/m_redirect.so
+lib/inspircd/modules/m_restrictchans.so
 lib/inspircd/modules/m_securelist.so
-lib/inspircd/modules/m_services.so
-lib/inspircd/modules/m_services_account.so
-lib/inspircd/modules/m_sethost.so
-lib/inspircd/modules/m_setident.so
-lib/inspircd/modules/m_setidle.so
+lib/inspircd/modules/m_globops.so
+lib/inspircd/modules/m_check.so
+lib/inspircd/modules/m_seenicks.so
+lib/inspircd/modules/m_spy.so
+lib/inspircd/modules/m_spanningtree.so
+lib/inspircd/modules/m_swhois.so
 lib/inspircd/modules/m_setname.so
-lib/inspircd/modules/m_showwhois.so
+lib/inspircd/modules/m_nonotice.so
+lib/inspircd/modules/m_randquote.so
+lib/inspircd/modules/m_httpd_stats.so
+lib/inspircd/modules/m_cgiirc.so
+lib/inspircd/modules/m_cloaking.so
+lib/inspircd/modules/m_setidle.so
 lib/inspircd/modules/m_silence.so
-lib/inspircd/modules/m_spanningtree.so
-lib/inspircd/modules/m_spy.so
-lib/inspircd/modules/m_ssl_dummy.so
-lib/inspircd/modules/m_sslmodes.so
+lib/inspircd/modules/m_http_client.so
+lib/inspircd/modules/m_regonlycreate.so
+lib/inspircd/modules/m_operlevels.so
+lib/inspircd/modules/m_messageflood.so
 lib/inspircd/modules/m_stripcolor.so
-lib/inspircd/modules/m_swhois.so
+lib/inspircd/modules/m_conn_join.so
+lib/inspircd/modules/m_denychans.so
+lib/inspircd/modules/m_httpd.so
+lib/inspircd/modules/m_foobar.so
+lib/inspircd/modules/m_svshold.so
+lib/inspircd/modules/m_hostchange.so
+lib/inspircd/modules/m_sajoin.so
+lib/inspircd/modules/m_hidechans.so
+lib/inspircd/modules/m_saquit.so
+lib/inspircd/modules/m_dccallow.so
+lib/inspircd/modules/m_samode.so
+lib/inspircd/modules/m_sethost.so
+lib/inspircd/modules/m_nicklock.so
+lib/inspircd/modules/m_ssl_dummy.so
+lib/inspircd/modules/m_jumpserver.so
+lib/inspircd/modules/m_operlog.so
+lib/inspircd/modules/m_kicknorejoin.so
+lib/inspircd/modules/m_conn_umodes.so
+lib/inspircd/modules/m_setident.so
 lib/inspircd/modules/m_testcommand.so
-lib/inspircd/modules/m_timedbans.so
-lib/inspircd/modules/m_uninvite.so
-lib/inspircd/modules/m_userip.so
-lib/inspircd/modules/m_vhost.so
-lib/inspircd/modules/m_watch.so
+lib/inspircd/modules/m_clones.so
+lib/inspircd/modules/m_alltime.so
+lib/inspircd/modules/m_auditorium.so
+lib/inspircd/modules/m_chancreate.so
+lib/inspircd/modules/m_chgident.so
+lib/inspircd/modules/m_restrictbanned.so
+lib/inspircd/modules/m_antibear.so
 @dirrm inspircd
 @dirrm lib/inspircd/modules
 @dirrm lib/inspircd