3 files changed, 302 insertions, 353 deletions

diff --git a/irc/inspircd/Makefile b/irc/inspircd/Makefile
index d872acc865e7..c42e7c17df95 100644
--- a/irc/inspircd/Makefile
+++ b/irc/inspircd/Makefile
@@ -10,152 +10,114 @@ MAINTAINER=	dg@syrec.org
 COMMENT=	Modular C++ IRC daemon
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/docs/COPYING
 
-CONFLICTS=	inspircd-1.*
-
+# Configure script is written in perl
+USES=		cpe perl5
+USE_PERL5=	build
+CPE_VENDOR=	inspire_ircd
+CPE_PRODUCT=	inspircd
 USE_GITHUB=	yes
-GH_ACCOUNT=	inspircd
+
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-cc=${CXX} \
+		--config-dir=${ETCDIR} \
+		--prefix=${PREFIX}/libexec/${PORTNAME} \
+		--binary-dir=${PREFIX}/bin \
+		--module-dir=${PREFIX}/libexec/${PORTNAME}/modules \
+		--log-dir=${INSPIRCD_LOGDIR} \
+		--data-dir=${INSPIRCD_DBDIR} \
+		--uid=${INSPIRCD_UID} \
+		--enable-kqueue \
+		--disable-interactive
 
 USE_RC_SUBR=	${PORTNAME}
 MAKEFILE=	BSDmakefile
 
-USERS=	ircd
-GROUPS=	ircd
+USERS=		ircd
+GROUPS=		ircd
 INSPIRCD_UID=	72
 
-INSPIRCD_RUN?=	/var/run/${PORTNAME}
-INSPIRCD_LOG?=	/var/log/${PORTNAME}/ircd.log
-SUB_LIST+=	PORTNAME=${PORTNAME} \
-		INSPIRCD_LOG=${INSPIRCD_LOG} \
-		INSPIRCD_RUN=${INSPIRCD_RUN} \
-		USERS=${USERS} \
-		GROUPS=${GROUPS}
+INSPIRCD_DBDIR?=	/var/db/${PORTNAME}
+INSPIRCD_LOGDIR?=	/var/log/${PORTNAME}
+INSPIRCD_RUNDIR?=	/var/run/${PORTNAME}
+
+SUB_FILES=	pkg-deinstall
+SUB_LIST=	PORTNAME=${PORTNAME} \
+		INSPIRCD_DBDIR=${INSPIRCD_DBDIR} \
+		INSPIRCD_LOGDIR=${INSPIRCD_LOGDIR} \
+		INSPIRCD_RUNDIR=${INSPIRCD_RUNDIR} \
+		INSPIRCD_USER=${USERS} \
+		INSPIRCD_GROUP=${GROUPS}
+PLIST_SUB=	INSPIRCD_DBDIR=${INSPIRCD_DBDIR} \
+		INSPIRCD_LOGDIR=${INSPIRCD_LOGDIR} \
+		INSPIRCD_RUNDIR=${INSPIRCD_RUNDIR} \
+		INSPIRCD_USER=${USERS} \
+		INSPIRCD_GROUP=${GROUPS}
 
-# Configure script is written in perl
-USES=		cpe perl5
-USE_PERL5=	build
-
-CPE_VENDOR=	inspire_ircd
-CPE_PRODUCT=	inspircd
-
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-cc=${CXX} --config-dir=${ETCDIR} \
-		--module-dir=${PREFIX}/lib/${PORTNAME}/modules \
-		--prefix=${PREFIX}/lib/${PORTNAME} \
-		--binary-dir=${PREFIX}/bin --library-dir=${PREFIX}/lib/${PORTNAME} \
-		--log-dir=${INSPIRCD_LOG} --data-dir=/var/db/inspircd \
-		--enable-kqueue --disable-interactive \
-		--uid=${INSPIRCD_UID}
+CONFLICTS=	inspircd-1.*
 
-OPTIONS_DEFINE=	MYSQL PGSQL SQLITE LDAPAUTH LDAPOPER GNUTLS OPENSSL PCRE POSIX GEOIP
-OPTIONS_DEFAULT=	OPENSSL POSIX
+OPTIONS_DEFINE=	GEOIP GNUTLS IPV6 LDAPAUTH LDAPOPER MYSQL OPENSSL PCRE PGSQL POSIX SQLITE
+OPTIONS_DEFAULT=OPENSSL POSIX
+OPTIONS_SUB=	yes
 
+GEOIP_DESC=	Build m_geoip module
 GNUTLS_DESC=	Build m_ssl_gnutls module
 LDAPAUTH_DESC=	Build m_ldapauth module
 LDAPOPER_DESC=	Build m_ldapoper module
 MYSQL_DESC=	Build m_mysql module
 OPENSSL_DESC=	Build m_ssl_openssl module
-PGSQL_DESC=	Build m_pgsql module
-SQLITE_DESC=	Build m_sqlite3 module
 PCRE_DESC=	Build m_regex_pcre module
+PGSQL_DESC=	Build m_pgsql module
 POSIX_DESC=	Build m_regex_posix module
-GEOIP_DESC=	Build m_geoip module
+SQLITE_DESC=	Build m_sqlite3 module
+
+GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
+GEOIP_VARS=		extras+=m_geoip.cpp
+
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
+GNUTLS_USES=		pkgconfig
+GNUTLS_CONFGURE_ENABLE=	gnutls
+GNUTLS_VARS=		extras+=m_ssl_gnutls.cpp
+
+IPV6_CONFIGURE_ENABLE=	ipv6
+
+LDAPAUTH_USE=		openldap=yes
+LDAPAUTH_VARS=		extras+=m_ldapauth.cpp
+
+LDAPOPER_USE=		openldap=yes
+LDAPOPER_VARS=		extras+=m_ldapoper.cpp
+
+MYSQL_USES=		mysql
+MYSQL_VARS=		extras+=m_mysql.cpp
+
+OPENSSL_USES=		pkgconfig ssl
+OPENSSL_CONFIGURE_ENABLE=	openssl
+OPENSSL_VARS=		extras+=m_ssl_openssl.cpp
+
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
+PCRE_VARS=		extras+=m_regex_pcre.cpp
+
+PGSQL_USES=		pgsql
+PGSQL_VARS=		extras+=m_pgsql.cpp
+
+POSIX_VARS=		extras+=m_regex_posix.cpp
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MLDAPAUTH}
-USE_OPENLDAP=	yes
-EXTRAS:=${EXTRAS},m_ldapauth.cpp
-PLIST_SUB+=	LDAPAUTH=""
-.else
-PLIST_SUB+=	LDAPAUTH="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MLDAPOPER}
-USE_OPENLDAP=	yes
-EXTRAS:=${EXTRAS},m_ldapoper.cpp
-PLIST_SUB+=	LDAPOPER=""
-.else
-PLIST_SUB+=	LDAPOPER="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	yes
-EXTRAS:=${EXTRAS},m_mysql.cpp
-PLIST_SUB+=	MYSQL=""
-.else
-PLIST_SUB+=	MYSQL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-USES+=		pgsql
-EXTRAS:=${EXTRAS},m_pgsql.cpp
-PLIST_SUB+=	PGSQL=""
-.else
-PLIST_SUB+=	PGSQL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSQLITE}
-USES+=	pkgconfig sqlite
-EXTRAS:=${EXTRAS},m_sqlite3.cpp
-PLIST_SUB+=	SQLITE=""
-.else
-PLIST_SUB+=	SQLITE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGNUTLS}
-USES+=	pkgconfig
-LIB_DEPENDS+=	libgnutls.so:security/gnutls
-CONFIGURE_ARGS+=	--enable-gnutls
-EXTRAS:=${EXTRAS},m_ssl_gnutls.cpp
-PLIST_SUB+=	GNUTLS=""
-.else
-PLIST_SUB+=	GNUTLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MOPENSSL}
-USES+=	ssl pkgconfig
-CONFIGURE_ARGS+=	--enable-openssl
-EXTRAS:=${EXTRAS},m_ssl_openssl.cpp
-PLIST_SUB+=	OPENSSL=""
-.else
-PLIST_SUB+=	OPENSSL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPCRE}
-LIB_DEPENDS+=	libpcre.so:devel/pcre
-EXTRAS:=${EXTRAS},m_regex_pcre.cpp
-PLIST_SUB+=	PCRE=""
-.else
-PLIST_SUB+=	PCRE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPOSIX}
-EXTRAS:=${EXTRAS},m_regex_posix.cpp
-PLIST_SUB+=	POSIX=""
-.else
-PLIST_SUB+=	POSIX="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGEOIP}
-LIB_DEPENDS+=	libGeoIP.so:net/GeoIP
-EXTRAS:=${EXTRAS},m_geoip.cpp
-PLIST_SUB+=	GEOIP=""
-.else
-PLIST_SUB+=	GEOIP="@comment "
-.endif
+SQLITE_USES=		pkgconfig sqlite
+SQLITE_VARS=		extras+=m_sqlite3.cpp
 
 pre-configure:
-	@if [ ${EXTRAS} ]; then \
-		cd ${WRKSRC} && ${CONFIGURE_CMD} --enable-extras=${EXTRAS} ; \
-	fi
+	@(cd ${WRKSRC}/src/modules && for m in ${EXTRAS}; do ${RLN} extra/$$m $$m; done)
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|DATA_PATH "/inspircd.pid"|"/var/run/inspircd/inspircd.pid"|' ${WRKSRC}/src/inspircd.cpp
+	@${REINPLACE_CMD} -e 's|DATA_PATH "/inspircd.pid"|"${INSPIRCD_RUNDIR}/inspircd.pid"|' ${WRKSRC}/src/inspircd.cpp
 	@${REINPLACE_CMD} -e 's|conf/examples|examples|g' ${WRKSRC}/docs/conf/inspircd.conf.example
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules/*.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/modules/*.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	@${MKDIR} ${STAGEDIR}${INSPIRCD_DBDIR}
+	@${MKDIR} ${STAGEDIR}${INSPIRCD_LOGDIR}
+	@${MKDIR} ${STAGEDIR}${INSPIRCD_RUNDIR}
 
 .include <bsd.port.mk>
diff --git a/irc/inspircd/files/inspircd.in b/irc/inspircd/files/inspircd.in
index 71cb5fdf584e..d2e5f97792e7 100644
--- a/irc/inspircd/files/inspircd.in
+++ b/irc/inspircd/files/inspircd.in
@@ -17,10 +17,10 @@
 #
 # inspircd_config="%%ETCDIR%%/inspircd.conf"
 #                          -- path to config file
-# inspircd_pidfile="%%INSPIRCD_RUN%%/inspircd.pid"
+# inspircd_pidfile="%%INSPIRCD_RUNDIR%%/inspircd.pid"
 #                          -- location of pidfile: must match setting
 #                             in ${inspircd_conffile}
-# inspircd_logfile="%%INSPIRCD_LOG%%"
+# inspircd_logfile="%%INSPIRCD_LOGDIR%%/inspircd.log"
 #                          -- file inspircd writes logs to
 #
 . /etc/rc.subr
@@ -32,34 +32,19 @@ load_rc_config ${name}
 
 : ${inspircd_enable:=NO}
 : ${inspircd_config="%%ETCDIR%%/inspircd.conf"}
-: ${inspircd_pidfile="%%INSPIRCD_RUN%%/inspircd.pid"}
-: ${inspircd_user="%%USERS%%"}
-: ${inspircd_group="%%GROUPS%%"}
-: ${inspircd_data=/var/db/inspircd}
-: ${inspircd_logfile="%%INSPIRCD_LOG%%"}
-: ${inspircd_flags="${inspircd_flags} --logfile ${inspircd_logfile} --config ${inspircd_config}"}
+: ${inspircd_pidfile="%%INSPIRCD_RUNDIR%%/inspircd.pid"}
+: ${inspircd_user="%%INSPIRCD_USER%%"}
+: ${inspircd_group="%%INSPIRCD_GROUP%%"}
+: ${inspircd_data="%%INSPIRCD_DBDIR%%"}
+: ${inspircd_logfile="%%INSPIRCD_LOGDIR%%/inspircd.log"}
 : ${inspircd_chdir="%%ETCDIR%%"}
 
 command=/usr/sbin/daemon
-command_args=" -f %%PREFIX%%/bin/inspircd --nofork ${inspircd_flags}"
+command_args="-f %%PREFIX%%/bin/inspircd --nofork --config ${inspircd_config} --logfile ${inspircd_logfile} ${inspircd_flags}"
 procname=%%PREFIX%%/bin/inspircd
 pidfile=${inspircd_pidfile}
 required_files=${inspircd_config}
 configtest_cmd=inspircd_configtest
-start_precmd=inspircd_prestart
 extra_commands="reload status"
 
-inspircd_prestart()
-{
-	# inspircd_flags gets applied too early if we don't do this.
-	# I didn't want to force people to update their rc.conf files
-	# and change the inspircd_flags to something else.
-        rc_flags=""
-
-	for i in ${inspircd_pidfile} ${inspircd_logfile}; do
-		install -d -m 755 -o ${inspircd_user} -g ${inspircd_group} ${i%/*}
-	done
-	install -d -m 755 -o ${inspircd_user} -g ${inspircd_group} ${inspircd_data}
-}
-
 run_rc_command "$1"
diff --git a/irc/inspircd/pkg-plist b/irc/inspircd/pkg-plist
index d614df841856..6047b2ebc21e 100644
--- a/irc/inspircd/pkg-plist
+++ b/irc/inspircd/pkg-plist
@@ -15,213 +15,215 @@ bin/inspircd
 @sample %%ETCDIR%%/examples/opers.conf.example %%ETCDIR%%/opers.conf
 @sample %%ETCDIR%%/examples/quotes.txt.example %%ETCDIR%%/quotes.txt
 @sample %%ETCDIR%%/examples/rules.txt.example %%ETCDIR%%/rules.txt
-lib/inspircd/.gdbargs
-lib/inspircd/inspircd
-lib/inspircd/modules/cmd_admin.so
-lib/inspircd/modules/cmd_away.so
-lib/inspircd/modules/cmd_clearcache.so
-lib/inspircd/modules/cmd_commands.so
-lib/inspircd/modules/cmd_connect.so
-lib/inspircd/modules/cmd_die.so
-lib/inspircd/modules/cmd_eline.so
-lib/inspircd/modules/cmd_gline.so
-lib/inspircd/modules/cmd_info.so
-lib/inspircd/modules/cmd_invite.so
-lib/inspircd/modules/cmd_ison.so
-lib/inspircd/modules/cmd_join.so
-lib/inspircd/modules/cmd_kick.so
-lib/inspircd/modules/cmd_kill.so
-lib/inspircd/modules/cmd_kline.so
-lib/inspircd/modules/cmd_links.so
-lib/inspircd/modules/cmd_list.so
-lib/inspircd/modules/cmd_loadmodule.so
-lib/inspircd/modules/cmd_lusers.so
-lib/inspircd/modules/cmd_map.so
-lib/inspircd/modules/cmd_mode.so
-lib/inspircd/modules/cmd_modenotice.so
-lib/inspircd/modules/cmd_modules.so
-lib/inspircd/modules/cmd_motd.so
-lib/inspircd/modules/cmd_names.so
-lib/inspircd/modules/cmd_nick.so
-lib/inspircd/modules/cmd_notice.so
-lib/inspircd/modules/cmd_oper.so
-lib/inspircd/modules/cmd_part.so
-lib/inspircd/modules/cmd_pass.so
-lib/inspircd/modules/cmd_ping.so
-lib/inspircd/modules/cmd_pong.so
-lib/inspircd/modules/cmd_privmsg.so
-lib/inspircd/modules/cmd_qline.so
-lib/inspircd/modules/cmd_quit.so
-lib/inspircd/modules/cmd_rehash.so
-lib/inspircd/modules/cmd_reloadmodule.so
-lib/inspircd/modules/cmd_restart.so
-lib/inspircd/modules/cmd_rules.so
-lib/inspircd/modules/cmd_server.so
-lib/inspircd/modules/cmd_squit.so
-lib/inspircd/modules/cmd_stats.so
-lib/inspircd/modules/cmd_time.so
-lib/inspircd/modules/cmd_topic.so
-lib/inspircd/modules/cmd_unloadmodule.so
-lib/inspircd/modules/cmd_user.so
-lib/inspircd/modules/cmd_userhost.so
-lib/inspircd/modules/cmd_version.so
-lib/inspircd/modules/cmd_wallops.so
-lib/inspircd/modules/cmd_who.so
-lib/inspircd/modules/cmd_whois.so
-lib/inspircd/modules/cmd_whowas.so
-lib/inspircd/modules/cmd_zline.so
-lib/inspircd/modules/m_abbreviation.so
-lib/inspircd/modules/m_alias.so
-lib/inspircd/modules/m_allowinvite.so
-lib/inspircd/modules/m_alltime.so
-lib/inspircd/modules/m_auditorium.so
-lib/inspircd/modules/m_autoop.so
-lib/inspircd/modules/m_banexception.so
-lib/inspircd/modules/m_banredirect.so
-lib/inspircd/modules/m_blockamsg.so
-lib/inspircd/modules/m_blockcaps.so
-lib/inspircd/modules/m_blockcolor.so
-lib/inspircd/modules/m_botmode.so
-lib/inspircd/modules/m_callerid.so
-lib/inspircd/modules/m_cap.so
-lib/inspircd/modules/m_cban.so
-lib/inspircd/modules/m_censor.so
-lib/inspircd/modules/m_cgiirc.so
-lib/inspircd/modules/m_chancreate.so
-lib/inspircd/modules/m_chanfilter.so
-lib/inspircd/modules/m_chanhistory.so
-lib/inspircd/modules/m_chanlog.so
-lib/inspircd/modules/m_channames.so
-lib/inspircd/modules/m_channelban.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_chgname.so
-lib/inspircd/modules/m_cloaking.so
-lib/inspircd/modules/m_clones.so
-lib/inspircd/modules/m_close.so
-lib/inspircd/modules/m_commonchans.so
-lib/inspircd/modules/m_conn_join.so
-lib/inspircd/modules/m_conn_umodes.so
-lib/inspircd/modules/m_conn_waitpong.so
-lib/inspircd/modules/m_connectban.so
-lib/inspircd/modules/m_connflood.so
-lib/inspircd/modules/m_customprefix.so
-lib/inspircd/modules/m_customtitle.so
-lib/inspircd/modules/m_cycle.so
-lib/inspircd/modules/m_dccallow.so
-lib/inspircd/modules/m_deaf.so
-lib/inspircd/modules/m_delayjoin.so
-lib/inspircd/modules/m_delaymsg.so
-lib/inspircd/modules/m_denychans.so
-lib/inspircd/modules/m_devoice.so
-lib/inspircd/modules/m_dnsbl.so
-lib/inspircd/modules/m_exemptchanops.so
-lib/inspircd/modules/m_filter.so
-lib/inspircd/modules/m_gecosban.so
-lib/inspircd/modules/m_globalload.so
-lib/inspircd/modules/m_globops.so
-lib/inspircd/modules/m_halfop.so
-lib/inspircd/modules/m_helpop.so
-lib/inspircd/modules/m_hidechans.so
-lib/inspircd/modules/m_hideoper.so
-lib/inspircd/modules/m_hostchange.so
-lib/inspircd/modules/m_httpd.so
-lib/inspircd/modules/m_httpd_acl.so
-lib/inspircd/modules/m_httpd_config.so
-lib/inspircd/modules/m_httpd_stats.so
-lib/inspircd/modules/m_ident.so
-lib/inspircd/modules/m_inviteexception.so
-lib/inspircd/modules/m_ircv3.so
-lib/inspircd/modules/m_joinflood.so
-lib/inspircd/modules/m_jumpserver.so
-lib/inspircd/modules/m_kicknorejoin.so
-lib/inspircd/modules/m_knock.so
-lib/inspircd/modules/m_lockserv.so
-lib/inspircd/modules/m_maphide.so
-lib/inspircd/modules/m_md5.so
-lib/inspircd/modules/m_messageflood.so
-lib/inspircd/modules/m_mlock.so
-lib/inspircd/modules/m_muteban.so
-lib/inspircd/modules/m_namedmodes.so
-lib/inspircd/modules/m_namesx.so
-lib/inspircd/modules/m_nationalchars.so
-lib/inspircd/modules/m_nickflood.so
-lib/inspircd/modules/m_nicklock.so
-lib/inspircd/modules/m_noctcp.so
-lib/inspircd/modules/m_nokicks.so
-lib/inspircd/modules/m_nonicks.so
-lib/inspircd/modules/m_nonotice.so
-lib/inspircd/modules/m_nopartmsg.so
-lib/inspircd/modules/m_ojoin.so
-lib/inspircd/modules/m_operchans.so
-lib/inspircd/modules/m_operjoin.so
-lib/inspircd/modules/m_operlevels.so
-lib/inspircd/modules/m_operlog.so
-lib/inspircd/modules/m_opermodes.so
-lib/inspircd/modules/m_opermotd.so
-lib/inspircd/modules/m_operprefix.so
-lib/inspircd/modules/m_override.so
-lib/inspircd/modules/m_passforward.so
-lib/inspircd/modules/m_password_hash.so
-lib/inspircd/modules/m_permchannels.so
-lib/inspircd/modules/m_randquote.so
-lib/inspircd/modules/m_redirect.so
-lib/inspircd/modules/m_regex_glob.so
-lib/inspircd/modules/m_regonlycreate.so
-lib/inspircd/modules/m_remove.so
-lib/inspircd/modules/m_restrictchans.so
-lib/inspircd/modules/m_restrictmsg.so
-lib/inspircd/modules/m_ripemd160.so
-lib/inspircd/modules/m_rline.so
-lib/inspircd/modules/m_sajoin.so
-lib/inspircd/modules/m_sakick.so
-lib/inspircd/modules/m_samode.so
-lib/inspircd/modules/m_sanick.so
-lib/inspircd/modules/m_sapart.so
-lib/inspircd/modules/m_saquit.so
-lib/inspircd/modules/m_sasl.so
-lib/inspircd/modules/m_satopic.so
-lib/inspircd/modules/m_securelist.so
-lib/inspircd/modules/m_seenicks.so
-lib/inspircd/modules/m_serverban.so
-lib/inspircd/modules/m_services_account.so
-lib/inspircd/modules/m_servprotect.so
-lib/inspircd/modules/m_sethost.so
-lib/inspircd/modules/m_setident.so
-lib/inspircd/modules/m_setidle.so
-lib/inspircd/modules/m_setname.so
-lib/inspircd/modules/m_sha256.so
-lib/inspircd/modules/m_showwhois.so
-lib/inspircd/modules/m_shun.so
-lib/inspircd/modules/m_silence.so
-lib/inspircd/modules/m_spanningtree.so
-lib/inspircd/modules/m_sqlauth.so
-lib/inspircd/modules/m_sqloper.so
-%%LDAPAUTH%%lib/inspircd/modules/m_ldapauth.so
-%%LDAPOPER%%lib/inspircd/modules/m_ldapoper.so
-%%MYSQL%%lib/inspircd/modules/m_mysql.so
-%%PGSQL%%lib/inspircd/modules/m_pgsql.so
-%%SQLITE%%lib/inspircd/modules/m_sqlite3.so
-%%GNUTLS%%lib/inspircd/modules/m_ssl_gnutls.so
-%%OPENSSL%%lib/inspircd/modules/m_ssl_openssl.so
-%%PCRE%%lib/inspircd/modules/m_regex_pcre.so
-%%POSIX%%lib/inspircd/modules/m_regex_posix.so
-%%GEOIP%%lib/inspircd/modules/m_geoip.so
-lib/inspircd/modules/m_sslinfo.so
-lib/inspircd/modules/m_sslmodes.so
-lib/inspircd/modules/m_stripcolor.so
-lib/inspircd/modules/m_svshold.so
-lib/inspircd/modules/m_swhois.so
-lib/inspircd/modules/m_testnet.so
-lib/inspircd/modules/m_timedbans.so
-lib/inspircd/modules/m_tline.so
-lib/inspircd/modules/m_topiclock.so
-lib/inspircd/modules/m_uhnames.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_xline_db.so
-@postunexec echo "If permanently removing software, you may wish to remove the configuration directory by running \"rm -rf %%PREFIX%%/%%ETCDIR%%\""
+libexec/inspircd/.gdbargs
+libexec/inspircd/inspircd
+libexec/inspircd/modules/cmd_admin.so
+libexec/inspircd/modules/cmd_away.so
+libexec/inspircd/modules/cmd_clearcache.so
+libexec/inspircd/modules/cmd_commands.so
+libexec/inspircd/modules/cmd_connect.so
+libexec/inspircd/modules/cmd_die.so
+libexec/inspircd/modules/cmd_eline.so
+libexec/inspircd/modules/cmd_gline.so
+libexec/inspircd/modules/cmd_info.so
+libexec/inspircd/modules/cmd_invite.so
+libexec/inspircd/modules/cmd_ison.so
+libexec/inspircd/modules/cmd_join.so
+libexec/inspircd/modules/cmd_kick.so
+libexec/inspircd/modules/cmd_kill.so
+libexec/inspircd/modules/cmd_kline.so
+libexec/inspircd/modules/cmd_links.so
+libexec/inspircd/modules/cmd_list.so
+libexec/inspircd/modules/cmd_loadmodule.so
+libexec/inspircd/modules/cmd_lusers.so
+libexec/inspircd/modules/cmd_map.so
+libexec/inspircd/modules/cmd_mode.so
+libexec/inspircd/modules/cmd_modenotice.so
+libexec/inspircd/modules/cmd_modules.so
+libexec/inspircd/modules/cmd_motd.so
+libexec/inspircd/modules/cmd_names.so
+libexec/inspircd/modules/cmd_nick.so
+libexec/inspircd/modules/cmd_notice.so
+libexec/inspircd/modules/cmd_oper.so
+libexec/inspircd/modules/cmd_part.so
+libexec/inspircd/modules/cmd_pass.so
+libexec/inspircd/modules/cmd_ping.so
+libexec/inspircd/modules/cmd_pong.so
+libexec/inspircd/modules/cmd_privmsg.so
+libexec/inspircd/modules/cmd_qline.so
+libexec/inspircd/modules/cmd_quit.so
+libexec/inspircd/modules/cmd_rehash.so
+libexec/inspircd/modules/cmd_reloadmodule.so
+libexec/inspircd/modules/cmd_restart.so
+libexec/inspircd/modules/cmd_rules.so
+libexec/inspircd/modules/cmd_server.so
+libexec/inspircd/modules/cmd_squit.so
+libexec/inspircd/modules/cmd_stats.so
+libexec/inspircd/modules/cmd_time.so
+libexec/inspircd/modules/cmd_topic.so
+libexec/inspircd/modules/cmd_unloadmodule.so
+libexec/inspircd/modules/cmd_user.so
+libexec/inspircd/modules/cmd_userhost.so
+libexec/inspircd/modules/cmd_version.so
+libexec/inspircd/modules/cmd_wallops.so
+libexec/inspircd/modules/cmd_who.so
+libexec/inspircd/modules/cmd_whois.so
+libexec/inspircd/modules/cmd_whowas.so
+libexec/inspircd/modules/cmd_zline.so
+libexec/inspircd/modules/m_abbreviation.so
+libexec/inspircd/modules/m_alias.so
+libexec/inspircd/modules/m_allowinvite.so
+libexec/inspircd/modules/m_alltime.so
+libexec/inspircd/modules/m_auditorium.so
+libexec/inspircd/modules/m_autoop.so
+libexec/inspircd/modules/m_banexception.so
+libexec/inspircd/modules/m_banredirect.so
+libexec/inspircd/modules/m_blockamsg.so
+libexec/inspircd/modules/m_blockcaps.so
+libexec/inspircd/modules/m_blockcolor.so
+libexec/inspircd/modules/m_botmode.so
+libexec/inspircd/modules/m_callerid.so
+libexec/inspircd/modules/m_cap.so
+libexec/inspircd/modules/m_cban.so
+libexec/inspircd/modules/m_censor.so
+libexec/inspircd/modules/m_cgiirc.so
+libexec/inspircd/modules/m_chancreate.so
+libexec/inspircd/modules/m_chanfilter.so
+libexec/inspircd/modules/m_chanhistory.so
+libexec/inspircd/modules/m_chanlog.so
+libexec/inspircd/modules/m_channames.so
+libexec/inspircd/modules/m_channelban.so
+libexec/inspircd/modules/m_chanprotect.so
+libexec/inspircd/modules/m_check.so
+libexec/inspircd/modules/m_chghost.so
+libexec/inspircd/modules/m_chgident.so
+libexec/inspircd/modules/m_chgname.so
+libexec/inspircd/modules/m_cloaking.so
+libexec/inspircd/modules/m_clones.so
+libexec/inspircd/modules/m_close.so
+libexec/inspircd/modules/m_commonchans.so
+libexec/inspircd/modules/m_conn_join.so
+libexec/inspircd/modules/m_conn_umodes.so
+libexec/inspircd/modules/m_conn_waitpong.so
+libexec/inspircd/modules/m_connectban.so
+libexec/inspircd/modules/m_connflood.so
+libexec/inspircd/modules/m_customprefix.so
+libexec/inspircd/modules/m_customtitle.so
+libexec/inspircd/modules/m_cycle.so
+libexec/inspircd/modules/m_dccallow.so
+libexec/inspircd/modules/m_deaf.so
+libexec/inspircd/modules/m_delayjoin.so
+libexec/inspircd/modules/m_delaymsg.so
+libexec/inspircd/modules/m_denychans.so
+libexec/inspircd/modules/m_devoice.so
+libexec/inspircd/modules/m_dnsbl.so
+libexec/inspircd/modules/m_exemptchanops.so
+libexec/inspircd/modules/m_filter.so
+libexec/inspircd/modules/m_gecosban.so
+libexec/inspircd/modules/m_globalload.so
+libexec/inspircd/modules/m_globops.so
+libexec/inspircd/modules/m_halfop.so
+libexec/inspircd/modules/m_helpop.so
+libexec/inspircd/modules/m_hidechans.so
+libexec/inspircd/modules/m_hideoper.so
+libexec/inspircd/modules/m_hostchange.so
+libexec/inspircd/modules/m_httpd.so
+libexec/inspircd/modules/m_httpd_acl.so
+libexec/inspircd/modules/m_httpd_config.so
+libexec/inspircd/modules/m_httpd_stats.so
+libexec/inspircd/modules/m_ident.so
+libexec/inspircd/modules/m_inviteexception.so
+libexec/inspircd/modules/m_ircv3.so
+libexec/inspircd/modules/m_joinflood.so
+libexec/inspircd/modules/m_jumpserver.so
+libexec/inspircd/modules/m_kicknorejoin.so
+libexec/inspircd/modules/m_knock.so
+libexec/inspircd/modules/m_lockserv.so
+libexec/inspircd/modules/m_maphide.so
+libexec/inspircd/modules/m_md5.so
+libexec/inspircd/modules/m_messageflood.so
+libexec/inspircd/modules/m_mlock.so
+libexec/inspircd/modules/m_muteban.so
+libexec/inspircd/modules/m_namedmodes.so
+libexec/inspircd/modules/m_namesx.so
+libexec/inspircd/modules/m_nationalchars.so
+libexec/inspircd/modules/m_nickflood.so
+libexec/inspircd/modules/m_nicklock.so
+libexec/inspircd/modules/m_noctcp.so
+libexec/inspircd/modules/m_nokicks.so
+libexec/inspircd/modules/m_nonicks.so
+libexec/inspircd/modules/m_nonotice.so
+libexec/inspircd/modules/m_nopartmsg.so
+libexec/inspircd/modules/m_ojoin.so
+libexec/inspircd/modules/m_operchans.so
+libexec/inspircd/modules/m_operjoin.so
+libexec/inspircd/modules/m_operlevels.so
+libexec/inspircd/modules/m_operlog.so
+libexec/inspircd/modules/m_opermodes.so
+libexec/inspircd/modules/m_opermotd.so
+libexec/inspircd/modules/m_operprefix.so
+libexec/inspircd/modules/m_override.so
+libexec/inspircd/modules/m_passforward.so
+libexec/inspircd/modules/m_password_hash.so
+libexec/inspircd/modules/m_permchannels.so
+libexec/inspircd/modules/m_randquote.so
+libexec/inspircd/modules/m_redirect.so
+libexec/inspircd/modules/m_regex_glob.so
+libexec/inspircd/modules/m_regonlycreate.so
+libexec/inspircd/modules/m_remove.so
+libexec/inspircd/modules/m_restrictchans.so
+libexec/inspircd/modules/m_restrictmsg.so
+libexec/inspircd/modules/m_ripemd160.so
+libexec/inspircd/modules/m_rline.so
+libexec/inspircd/modules/m_sajoin.so
+libexec/inspircd/modules/m_sakick.so
+libexec/inspircd/modules/m_samode.so
+libexec/inspircd/modules/m_sanick.so
+libexec/inspircd/modules/m_sapart.so
+libexec/inspircd/modules/m_saquit.so
+libexec/inspircd/modules/m_sasl.so
+libexec/inspircd/modules/m_satopic.so
+libexec/inspircd/modules/m_securelist.so
+libexec/inspircd/modules/m_seenicks.so
+libexec/inspircd/modules/m_serverban.so
+libexec/inspircd/modules/m_services_account.so
+libexec/inspircd/modules/m_servprotect.so
+libexec/inspircd/modules/m_sethost.so
+libexec/inspircd/modules/m_setident.so
+libexec/inspircd/modules/m_setidle.so
+libexec/inspircd/modules/m_setname.so
+libexec/inspircd/modules/m_sha256.so
+libexec/inspircd/modules/m_showwhois.so
+libexec/inspircd/modules/m_shun.so
+libexec/inspircd/modules/m_silence.so
+libexec/inspircd/modules/m_spanningtree.so
+libexec/inspircd/modules/m_sqlauth.so
+libexec/inspircd/modules/m_sqloper.so
+%%GEOIP%%libexec/inspircd/modules/m_geoip.so
+%%GNUTLS%%libexec/inspircd/modules/m_ssl_gnutls.so
+%%LDAPAUTH%%libexec/inspircd/modules/m_ldapauth.so
+%%LDAPOPER%%libexec/inspircd/modules/m_ldapoper.so
+%%MYSQL%%libexec/inspircd/modules/m_mysql.so
+%%OPENSSL%%libexec/inspircd/modules/m_ssl_openssl.so
+%%PCRE%%libexec/inspircd/modules/m_regex_pcre.so
+%%PGSQL%%libexec/inspircd/modules/m_pgsql.so
+%%POSIX%%libexec/inspircd/modules/m_regex_posix.so
+%%SQLITE%%libexec/inspircd/modules/m_sqlite3.so
+libexec/inspircd/modules/m_sslinfo.so
+libexec/inspircd/modules/m_sslmodes.so
+libexec/inspircd/modules/m_stripcolor.so
+libexec/inspircd/modules/m_svshold.so
+libexec/inspircd/modules/m_swhois.so
+libexec/inspircd/modules/m_testnet.so
+libexec/inspircd/modules/m_timedbans.so
+libexec/inspircd/modules/m_tline.so
+libexec/inspircd/modules/m_topiclock.so
+libexec/inspircd/modules/m_uhnames.so
+libexec/inspircd/modules/m_uninvite.so
+libexec/inspircd/modules/m_userip.so
+libexec/inspircd/modules/m_vhost.so
+libexec/inspircd/modules/m_watch.so
+libexec/inspircd/modules/m_xline_db.so
+@dir(%%INSPIRCD_USER%%,%%INSPIRCD_GROUP%%,750) %%INSPIRCD_DBDIR%%
+@dir(%%INSPIRCD_USER%%,%%INSPIRCD_GROUP%%,755) %%INSPIRCD_LOGDIR%%
+@dir(%%INSPIRCD_USER%%,%%INSPIRCD_GROUP%%,755) %%INSPIRCD_RUNDIR%%