chat/anope: Update to 2.0.6

[10 years of updates, no changelog. Based on work in pkgsrc-wip.]

15 files changed, 395 insertions, 425 deletions

diff --git a/chat/anope/DESCR b/chat/anope/DESCR
index 2d5b5e02161..4510cfff6eb 100644
--- a/chat/anope/DESCR
+++ b/chat/anope/DESCR
@@ -1,3 +1,5 @@
-Anope is a set of Services for IRC networks that allows users to
-manage their nicks and channels in a secure and efficient way, and
-administrators to manage their network with powerful tools.
+Anope is an open source set of IRC Services. It is highly modular,
+with a vast number of configurable parameters, and is the most used
+IRC services package. There are also many modules on the modsite
+to add additional features. It supports many modern IRCds, including
+InspIRCd, UnrealIRCd, and ircd-hybrid.
diff --git a/chat/anope/Makefile b/chat/anope/Makefile
index 27001d0a410..5d28d3c4fd9 100644
--- a/chat/anope/Makefile
+++ b/chat/anope/Makefile
@@ -1,88 +1,110 @@
-# $NetBSD: Makefile,v 1.21 2018/08/22 09:43:00 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/02/05 19:10:50 nia Exp $
 
-DISTNAME=	anope-1.7.21
-PKGREVISION=	9
+PKGNAME=	anope-2.0.6
+DISTNAME=	${PKGNAME}-source
 CATEGORIES=	chat
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=anope/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=anope/}
+GITHUB_PROJECT=	anope
+GITHUB_RELEASE=	${PKGVERSION_NOREV}
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.anope.org/
-COMMENT=	Set of Services for IRC networks
+MAINTAINER=	nia@NetBSD.org
+HOMEPAGE=	https://www.anope.org/
+COMMENT=	Modular set of IRC services
+LICENSE=	gnu-gpl-v2
 
-PKG_DESTDIR_SUPPORT=	destdir
+USE_LANGUAGES=	c c++
+USE_CMAKE=	yes
 
-GNU_CONFIGURE=	YES
-PTHREAD_OPTS+=	require
-USE_TOOLS+=	gmake perl:run
-ANOPE_USER=	anope
-ANOPE_GROUP=	anope
-RCD_SCRIPTS=	anope
-FILES_SUBST+=	ANOPE_USER=${ANOPE_USER}
-FILES_SUBST+=	ANOPE_GROUP=${ANOPE_GROUP}
+CMAKE_ARGS+=	-DPROGRAM_NAME=anope
 
-USERGROUP_PHASE=	pre-install
-PKG_USERS_VARS+=	ANOPE_USER
-PKG_GROUPS_VARS+=	ANOPE_GROUP
+CMAKE_ARGS+=	-DDISABLE_TOOLS=ON
 
-.include "../../mk/bsd.prefs.mk"
+CMAKE_ARGS+=	-DDB_DIR=anope/data
+CMAKE_ARGS+=	-DCONF_DIR=${PKG_SYSCONFDIR}/anope
+CMAKE_ARGS+=	-DLIB_DIR=lib/anope
+CMAKE_ARGS+=	-DLOCALE_DIR=${PKGLOCALEDIR}/locale
+CMAKE_ARGS+=	-DLOGS_DIR=anope/logs
 
-PKG_USERS=	${ANOPE_USER}:${ANOPE_GROUP}
-PKG_HOME.${ANOPE_USER}=		${PREFIX}/lib/anope
-PKG_GROUPS=	${ANOPE_GROUP}
-MAKE_ENV+=	RUNGROUP=${ANOPE_GROUP}
-OWN_DIRS_PERMS+=	${PREFIX}/lib/anope/logs \
-			${ANOPE_USER} ${ANOPE_GROUP} 2755
-OWN_DIRS_PERMS+=	${PREFIX}/lib/anope/modules/runtime \
-			${ANOPE_USER} ${ANOPE_GROUP} 2755
+.include "../../mk/bsd.prefs.mk"
 
-CONF_FILES_PERMS+=	${PREFIX}/share/examples/anope/example.conf \
-			${PREFIX}/lib/anope/services.conf \
-			${ANOPE_USER} ${ANOPE_GROUP} 0640
+ANOPE_USER?=		anope
+ANOPE_GROUP?=		anope
+PKG_GROUPS=		${ANOPE_GROUP}
+PKG_USERS=		${ANOPE_USER}:${ANOPE_GROUP}
+PKG_GROUPS_VARS=	ANOPE_USER
+PKG_USERS_VARS=		ANOPE_GROUP
+
+OWN_DIRS_PERMS+=	${PREFIX}/anope ${ANOPE_USER} ${ANOPE_GROUP} 0755
+OWN_DIRS_PERMS+=	${PREFIX}/anope/data ${ANOPE_USER} ${ANOPE_GROUP} 0755
+OWN_DIRS_PERMS+=	${PREFIX}/anope/logs ${ANOPE_USER} ${ANOPE_GROUP} 0755
+
+FILES_SUBST+=		ANOPE_GROUP=${ANOPE_GROUP:Q}
+FILES_SUBST+=		ANOPE_USER=${ANOPE_USER:Q}
+FILES_SUBST+=		PKGLOCALEDIR=${PKGLOCALEDIR}
+
+SUBST_CLASSES+=		conf
+SUBST_STAGE.conf=	pre-configure
+SUBST_MESSAGE.conf=	Set variables in configuration file.
+SUBST_FILES.conf+=	data/example.conf
+SUBST_SED.conf+=	-e "s,@PREFIX@,${PREFIX},g"
+SUBST_SED.conf+=	-e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g"
+SUBST_SED.conf+=	-e "s,@PKGLOCALEDIR@,${PKGLOCALEDIR},g"
 
-CONFIGURE_ARGS+=	--with-permissions=077
-CONFIGURE_ARGS+=	--with-bindir=${PREFIX}/lib/anope
-CONFIGURE_ARGS+=	--with-datadir=${PREFIX}/lib/anope
-CONFIGURE_ARGS+=	--with-rungroup=${ANOPE_GROUP}
+RCD_SCRIPTS=	anope
 
-.include "options.mk"
+EGDIR=		${PREFIX}/share/examples/anope
+DOCDIR=		${PREFIX}/share/doc/anope
 
-SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	pre-configure
-SUBST_FILES.paths=	data/example.chk data/example.conf
-SUBST_SED.paths=	-e "s|/home/ircd/services|${PREFIX}/lib/anope|g"
-SUBST_SED.paths+=	-e "s|/usr/local/lib/services|${PREFIX}/lib/anope|g"
-SUBST_SED.paths+=	-e "s|/home/username/services|${PREFIX}/lib/anope|g"
-SUBST_MESSAGE.paths=	Fixing hardcoded paths.
+USE_PKGLOCALEDIR=	yes
 
-SUBST_CLASSES+=		utils
-SUBST_STAGE.utils=	pre-configure
-SUBST_FILES.utils=	src/Makefile
-SUBST_SED.utils=	-e "s|find|${FIND}|g"
-SUBST_SED.utils+=	-e "s|chgrp|${CHGRP}|g"
-SUBST_SED.utils+=	-e "s|chmod|${CHMOD}|g"
-SUBST_SED.utils+=	-e "s|ln|${LN}|g"
-SUBST_MESSAGE.utils=	Fixing hardcoded utilities.
+INSTALLATION_DIRS+=	${EGDIR}
+INSTALLATION_DIRS+=	${DOCDIR}
 
-.include "../../mk/pthread.buildlink3.mk"
+CONF_FILES+=	${EGDIR}/botserv.conf ${PKG_SYSCONFDIR}/anope/botserv.conf
+CONF_FILES+=	${EGDIR}/chanserv.conf ${PKG_SYSCONFDIR}/anope/chanserv.conf
+CONF_FILES+=	${EGDIR}/chanstats.conf ${PKG_SYSCONFDIR}/anope/chanstats.conf
+CONF_FILES+=	${EGDIR}/services.conf ${PKG_SYSCONFDIR}/anope/services.conf
+CONF_FILES+=	${EGDIR}/global.conf ${PKG_SYSCONFDIR}/anope/global.conf
+CONF_FILES+=	${EGDIR}/hostserv.conf ${PKG_SYSCONFDIR}/anope/hostserv.conf
+CONF_FILES+=	${EGDIR}/irc2sql.conf ${PKG_SYSCONFDIR}/anope/irc2sql.conf
+CONF_FILES+=	${EGDIR}/memoserv.conf ${PKG_SYSCONFDIR}/anope/memoserv.conf
+CONF_FILES+=	${EGDIR}/modules.conf ${PKG_SYSCONFDIR}/anope/modules.conf
+CONF_FILES+=	${EGDIR}/nickserv.conf ${PKG_SYSCONFDIR}/anope/nickserv.conf
+CONF_FILES+=	${EGDIR}/operserv.conf ${PKG_SYSCONFDIR}/anope/operserv.conf
 
-# for backtrace
-.if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h)
-LDFLAGS+=  -lexecinfo
-.endif
+.include "options.mk"
 
-INSTALLATION_DIRS+=	share/doc/anope share/examples/anope lib/anope/modules
+pre-configure:
+.for srcfile in ${ANOPE_EXTRAS}
+	${LN} -sf ${WRKSRC}/modules/extra/${srcfile} ${WRKSRC}/modules/${srcfile}
+.endfor
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/docs/* ${DESTDIR}${PREFIX}/share/doc/anope
-	${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/anoperc
-	${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/listchans
-	${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/listnicks
-	${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/services
-	${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/lib/anope/modules/*.so
-	${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/lib/anope/languages/*
-	${CHOWN} ${ANOPE_USER} ${DESTDIR}${PREFIX}/lib/anope
-	${CHOWN} ${ANOPE_USER} ${DESTDIR}${PREFIX}/lib/anope/backups
-	${CHOWN} ${ANOPE_USER} ${DESTDIR}${PREFIX}/lib/anope/logs
-	${INSTALL_DATA} ${WRKSRC}/data/* ${DESTDIR}${PREFIX}/share/examples/anope
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/botserv.example.conf \
+		${DESTDIR}${EGDIR}/botserv.conf
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/chanserv.example.conf \
+		${DESTDIR}${EGDIR}/chanserv.conf
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/chanstats.example.conf \
+		${DESTDIR}${EGDIR}/chanstats.conf
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/example.conf \
+		${DESTDIR}${EGDIR}/services.conf
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/global.example.conf \
+		${DESTDIR}${EGDIR}/global.conf
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/hostserv.example.conf \
+		${DESTDIR}${EGDIR}/hostserv.conf
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/irc2sql.example.conf \
+		${DESTDIR}${EGDIR}/irc2sql.conf
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/memoserv.example.conf \
+		${DESTDIR}${EGDIR}/memoserv.conf
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/modules.example.conf \
+		${DESTDIR}${EGDIR}/modules.conf
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/nickserv.example.conf \
+		${DESTDIR}${EGDIR}/nickserv.conf
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/operserv.example.conf \
+		${DESTDIR}${EGDIR}/operserv.conf
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/example.chk \
+		${DESTDIR}${DOCDIR}/example.chk
+	${MV} ${DESTDIR}${PKG_SYSCONFDIR}/anope/stats.standalone.example.conf \
+		${DESTDIR}${DOCDIR}/stats.standalone.example.conf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/anope/PLIST b/chat/anope/PLIST
index ad41f756cc4..229b9d7506b 100644
--- a/chat/anope/PLIST
+++ b/chat/anope/PLIST
@@ -1,88 +1,117 @@
-@comment $NetBSD: PLIST,v 1.7 2018/01/01 22:29:19 rillig Exp $
-lib/anope/anoperc
-lib/anope/languages/cat
-lib/anope/languages/de
-lib/anope/languages/en_us
-lib/anope/languages/es
-lib/anope/languages/fr
-lib/anope/languages/gr
-lib/anope/languages/hun
-lib/anope/languages/it
-lib/anope/languages/nl
-lib/anope/languages/pl
-lib/anope/languages/pt
-lib/anope/languages/ru
-lib/anope/languages/tr
-lib/anope/listchans
-lib/anope/listnicks
+@comment $NetBSD: PLIST,v 1.8 2019/02/05 19:10:50 nia Exp $
+anope/data/modules/webcpanel/templates/default/chanserv/access.html
+anope/data/modules/webcpanel/templates/default/chanserv/akick.html
+anope/data/modules/webcpanel/templates/default/chanserv/chanlist.html
+anope/data/modules/webcpanel/templates/default/chanserv/drop.html
+anope/data/modules/webcpanel/templates/default/chanserv/main.html
+anope/data/modules/webcpanel/templates/default/chanserv/modes.html
+anope/data/modules/webcpanel/templates/default/chanserv/set.html
+anope/data/modules/webcpanel/templates/default/confirm.html
+anope/data/modules/webcpanel/templates/default/cubes.png
+anope/data/modules/webcpanel/templates/default/favicon.ico
+anope/data/modules/webcpanel/templates/default/footer.html
+anope/data/modules/webcpanel/templates/default/header.html
+anope/data/modules/webcpanel/templates/default/hostserv/request.html
+anope/data/modules/webcpanel/templates/default/login.html
+anope/data/modules/webcpanel/templates/default/logo.png
+anope/data/modules/webcpanel/templates/default/memoserv/memos.html
+anope/data/modules/webcpanel/templates/default/nickserv/access.html
+anope/data/modules/webcpanel/templates/default/nickserv/alist.html
+anope/data/modules/webcpanel/templates/default/nickserv/cert.html
+anope/data/modules/webcpanel/templates/default/nickserv/info.html
+anope/data/modules/webcpanel/templates/default/operserv/akill.html
+anope/data/modules/webcpanel/templates/default/register.html
+anope/data/modules/webcpanel/templates/default/style.css
+bin/anope
 lib/anope/modules/bahamut.so
-lib/anope/modules/bs_act.so
+lib/anope/modules/botserv.so
 lib/anope/modules/bs_assign.so
+lib/anope/modules/bs_autoassign.so
 lib/anope/modules/bs_badwords.so
 lib/anope/modules/bs_bot.so
 lib/anope/modules/bs_botlist.so
-lib/anope/modules/bs_fantasy.so
-lib/anope/modules/bs_fantasy_kick.so
-lib/anope/modules/bs_fantasy_kickban.so
-lib/anope/modules/bs_fantasy_owner.so
-lib/anope/modules/bs_fantasy_seen.so
-lib/anope/modules/bs_fantasy_unban.so
-lib/anope/modules/bs_help.so
+lib/anope/modules/bs_control.so
 lib/anope/modules/bs_info.so
 lib/anope/modules/bs_kick.so
-lib/anope/modules/bs_say.so
 lib/anope/modules/bs_set.so
-lib/anope/modules/bs_unassign.so
+lib/anope/modules/chanserv.so
 lib/anope/modules/charybdis.so
 lib/anope/modules/cs_access.so
 lib/anope/modules/cs_akick.so
-lib/anope/modules/cs_appendtopic.so
 lib/anope/modules/cs_ban.so
-lib/anope/modules/cs_clear.so
+lib/anope/modules/cs_clone.so
 lib/anope/modules/cs_drop.so
 lib/anope/modules/cs_enforce.so
-lib/anope/modules/cs_forbid.so
+lib/anope/modules/cs_entrymsg.so
+lib/anope/modules/cs_flags.so
 lib/anope/modules/cs_getkey.so
-lib/anope/modules/cs_getpass.so
-lib/anope/modules/cs_help.so
-lib/anope/modules/cs_identify.so
 lib/anope/modules/cs_info.so
 lib/anope/modules/cs_invite.so
 lib/anope/modules/cs_kick.so
 lib/anope/modules/cs_list.so
-lib/anope/modules/cs_logout.so
-lib/anope/modules/cs_modes.so
+lib/anope/modules/cs_log.so
+lib/anope/modules/cs_mode.so
 lib/anope/modules/cs_register.so
-lib/anope/modules/cs_sendpass.so
+lib/anope/modules/cs_seen.so
 lib/anope/modules/cs_set.so
+lib/anope/modules/cs_set_misc.so
 lib/anope/modules/cs_status.so
+lib/anope/modules/cs_statusupdate.so
 lib/anope/modules/cs_suspend.so
-lib/anope/modules/cs_tban.so
+lib/anope/modules/cs_sync.so
 lib/anope/modules/cs_topic.so
+lib/anope/modules/cs_unban.so
+lib/anope/modules/cs_updown.so
 lib/anope/modules/cs_xop.so
-lib/anope/modules/dreamforge.so
+lib/anope/modules/db_flatfile.so
+lib/anope/modules/db_old.so
+lib/anope/modules/db_redis.so
+lib/anope/modules/db_sql.so
+lib/anope/modules/db_sql_live.so
+lib/anope/modules/enc_bcrypt.so
 lib/anope/modules/enc_md5.so
 lib/anope/modules/enc_none.so
 lib/anope/modules/enc_old.so
 lib/anope/modules/enc_sha1.so
-lib/anope/modules/he_help.so
+lib/anope/modules/enc_sha256.so
+lib/anope/modules/fantasy.so
+lib/anope/modules/gl_global.so
+lib/anope/modules/global.so
+lib/anope/modules/greet.so
+lib/anope/modules/help.so
+lib/anope/modules/hostserv.so
 lib/anope/modules/hs_del.so
-lib/anope/modules/hs_delall.so
 lib/anope/modules/hs_group.so
-lib/anope/modules/hs_help.so
 lib/anope/modules/hs_list.so
 lib/anope/modules/hs_off.so
 lib/anope/modules/hs_on.so
 lib/anope/modules/hs_request.so
 lib/anope/modules/hs_set.so
-lib/anope/modules/hs_setall.so
 lib/anope/modules/hybrid.so
-lib/anope/modules/inspircd10.so
-lib/anope/modules/inspircd11.so
+lib/anope/modules/inspircd12.so
+lib/anope/modules/inspircd20.so
+lib/anope/modules/m_dns.so
+lib/anope/modules/m_dnsbl.so
+lib/anope/modules/m_helpchan.so
+lib/anope/modules/m_httpd.so
+${PLIST.ldap}lib/anope/modules/m_ldap.so
+${PLIST.ldap}lib/anope/modules/m_ldap_authentication.so
+${PLIST.mysql}lib/anope/modules/m_mysql.so
+lib/anope/modules/m_proxyscan.so
+lib/anope/modules/m_redis.so
+${PLIST.pcre}lib/anope/modules/m_regex_pcre.so
+lib/anope/modules/m_rewrite.so
+lib/anope/modules/m_sasl.so
+${PLIST.sqlite3}lib/anope/modules/m_sqlite.so
+${PLIST.gnutls}lib/anope/modules/m_ssl_gnutls.so
+${PLIST.openssl}lib/anope/modules/m_ssl_openssl.so
+lib/anope/modules/m_xmlrpc.so
+lib/anope/modules/m_xmlrpc_main.so
+lib/anope/modules/memoserv.so
 lib/anope/modules/ms_cancel.so
 lib/anope/modules/ms_check.so
 lib/anope/modules/ms_del.so
-lib/anope/modules/ms_help.so
+lib/anope/modules/ms_ignore.so
 lib/anope/modules/ms_info.so
 lib/anope/modules/ms_list.so
 lib/anope/modules/ms_read.so
@@ -91,100 +120,89 @@ lib/anope/modules/ms_send.so
 lib/anope/modules/ms_sendall.so
 lib/anope/modules/ms_set.so
 lib/anope/modules/ms_staff.so
+lib/anope/modules/ngircd.so
+lib/anope/modules/nickserv.so
 lib/anope/modules/ns_access.so
+lib/anope/modules/ns_ajoin.so
 lib/anope/modules/ns_alist.so
+lib/anope/modules/ns_cert.so
 lib/anope/modules/ns_drop.so
-lib/anope/modules/ns_forbid.so
 lib/anope/modules/ns_getemail.so
 lib/anope/modules/ns_getpass.so
-lib/anope/modules/ns_ghost.so
 lib/anope/modules/ns_group.so
-lib/anope/modules/ns_help.so
 lib/anope/modules/ns_identify.so
 lib/anope/modules/ns_info.so
 lib/anope/modules/ns_list.so
 lib/anope/modules/ns_logout.so
 lib/anope/modules/ns_maxemail.so
-lib/anope/modules/ns_noop_convert.so
 lib/anope/modules/ns_recover.so
 lib/anope/modules/ns_register.so
-lib/anope/modules/ns_release.so
-lib/anope/modules/ns_saset.so
-lib/anope/modules/ns_sendpass.so
+lib/anope/modules/ns_resetpass.so
 lib/anope/modules/ns_set.so
+lib/anope/modules/ns_set_misc.so
 lib/anope/modules/ns_status.so
 lib/anope/modules/ns_suspend.so
 lib/anope/modules/ns_update.so
-lib/anope/modules/os_admin.so
+lib/anope/modules/operserv.so
 lib/anope/modules/os_akill.so
 lib/anope/modules/os_chankill.so
-lib/anope/modules/os_chanlist.so
-lib/anope/modules/os_clearmodes.so
+lib/anope/modules/os_config.so
 lib/anope/modules/os_defcon.so
-lib/anope/modules/os_global.so
-lib/anope/modules/os_help.so
+lib/anope/modules/os_dns.so
+lib/anope/modules/os_forbid.so
 lib/anope/modules/os_ignore.so
 lib/anope/modules/os_info.so
 lib/anope/modules/os_jupe.so
 lib/anope/modules/os_kick.so
-lib/anope/modules/os_logonnews.so
+lib/anope/modules/os_kill.so
+lib/anope/modules/os_list.so
+lib/anope/modules/os_login.so
+lib/anope/modules/os_logsearch.so
 lib/anope/modules/os_mode.so
 lib/anope/modules/os_modinfo.so
-lib/anope/modules/os_modlist.so
-lib/anope/modules/os_modload.so
-lib/anope/modules/os_modunload.so
+lib/anope/modules/os_module.so
+lib/anope/modules/os_news.so
 lib/anope/modules/os_noop.so
 lib/anope/modules/os_oline.so
 lib/anope/modules/os_oper.so
-lib/anope/modules/os_opernews.so
-lib/anope/modules/os_quit.so
-lib/anope/modules/os_randomnews.so
-lib/anope/modules/os_raw.so
 lib/anope/modules/os_reload.so
-lib/anope/modules/os_restart.so
 lib/anope/modules/os_session.so
 lib/anope/modules/os_set.so
-lib/anope/modules/os_sgline.so
 lib/anope/modules/os_shutdown.so
-lib/anope/modules/os_sqline.so
-lib/anope/modules/os_staff.so
 lib/anope/modules/os_stats.so
-lib/anope/modules/os_svsnick.so
-lib/anope/modules/os_szline.so
-lib/anope/modules/os_umode.so
+lib/anope/modules/os_svs.so
+lib/anope/modules/os_sxline.so
 lib/anope/modules/os_update.so
-lib/anope/modules/os_userlist.so
-lib/anope/modules/plexus2.so
-lib/anope/modules/plexus3.so
-lib/anope/modules/ptlink.so
-lib/anope/modules/rageircd.so
+lib/anope/modules/plexus.so
 lib/anope/modules/ratbox.so
-lib/anope/modules/shadowircd.so
-lib/anope/modules/solidircd.so
-lib/anope/modules/ultimate2.so
-lib/anope/modules/ultimate3.so
-lib/anope/modules/unreal31.so
-lib/anope/modules/unreal32.so
-lib/anope/modules/viagra.so
-lib/anope/mydbgen
-lib/anope/services
-lib/anope/tools/anopesmtp
-lib/anope/tools/db-merger
-lib/anope/tools/epona2anope
-share/doc/anope/BUGS
-share/doc/anope/COPYING
-share/doc/anope/DEFCON
-share/doc/anope/EVENTS
-share/doc/anope/FAQ
-share/doc/anope/INSTALL
-share/doc/anope/IRCD
-share/doc/anope/MODULES
-share/doc/anope/MYSQL
-share/doc/anope/NEWS
-share/doc/anope/OLDCHANGES
-share/doc/anope/PROXY
-share/doc/anope/README
-share/doc/anope/WIN32.txt
-share/examples/anope/example.chk
-share/examples/anope/example.conf
-share/examples/anope/tables.sql
+lib/anope/modules/unreal.so
+lib/anope/modules/unreal4.so
+lib/anope/modules/webcpanel.so
+share/doc/anope/example.chk
+share/doc/anope/stats.standalone.example.conf
+share/examples/anope/botserv.conf
+share/examples/anope/chanserv.conf
+share/examples/anope/chanstats.conf
+share/examples/anope/global.conf
+share/examples/anope/hostserv.conf
+share/examples/anope/irc2sql.conf
+share/examples/anope/memoserv.conf
+share/examples/anope/modules.conf
+share/examples/anope/nickserv.conf
+share/examples/anope/operserv.conf
+share/examples/anope/services.conf
+share/locale/ca_ES/LC_MESSAGES/anope.mo
+share/locale/de_DE/LC_MESSAGES/anope.mo
+share/locale/el_GR/LC_MESSAGES/anope.mo
+share/locale/en_US/LC_MESSAGES/anope.mo
+share/locale/es_ES/LC_MESSAGES/anope.mo
+share/locale/fr_FR/LC_MESSAGES/anope.mo
+share/locale/hu_HU/LC_MESSAGES/anope.mo
+share/locale/it_IT/LC_MESSAGES/anope.mo
+share/locale/nl_NL/LC_MESSAGES/anope.mo
+share/locale/pl_PL/LC_MESSAGES/anope.mo
+share/locale/pt_PT/LC_MESSAGES/anope.mo
+share/locale/ru_RU/LC_MESSAGES/anope.mo
+share/locale/tr_TR/LC_MESSAGES/anope.mo
+@pkgdir anope/logs
+@pkgdir anope/data/backups
diff --git a/chat/anope/distinfo b/chat/anope/distinfo
index d6aeb473e3d..fc8cf02d6d7 100644
--- a/chat/anope/distinfo
+++ b/chat/anope/distinfo
@@ -1,14 +1,7 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 01:20:17 agc Exp $
+$NetBSD: distinfo,v 1.10 2019/02/05 19:10:50 nia Exp $
 
-SHA1 (anope-1.7.21.tar.gz) = 1a8c845fcfd6351a4225fc8e38bb6e90f5201a4b
-RMD160 (anope-1.7.21.tar.gz) = ac2b22d60e6be2e7ea02e933fc005c5b3b206180
-SHA512 (anope-1.7.21.tar.gz) = a2ab0430f72681c384b02d967672cad63e2876c4a5e16aead8ec404b2daf70273e5f051d771d7f67e99a62642fe6d872d795308b078b22e7d1f029432071bb81
-Size (anope-1.7.21.tar.gz) = 1523615 bytes
-SHA1 (patch-aa) = 6db1799996f7eb8f2d88ddd99f4baef5a843865b
-SHA1 (patch-ab) = 9684780fa938db06f53014e7d45e9e6debf9e92c
-SHA1 (patch-ac) = d08a26c28b7e6130b7eb459a7109ad67160eb43d
-SHA1 (patch-ad) = 7b64822e486fa8673db8e47edc9b86c7183505c7
-SHA1 (patch-ae) = 6c02aaa1d809e113338d35b672911269c1932d29
-SHA1 (patch-af) = 1d874c5be0f624f2c83bd6d66be0ddc4ce29d3fe
-SHA1 (patch-configure) = c151c6a87b04ecb35dc54b98425ad0027d70ea66
-SHA1 (patch-src_tools_anopesmtp.c) = 4322ba9479dad29898c58f8ed9b66e0f3f373487
+SHA1 (anope-2.0.6-source.tar.gz) = bba0c947657f7388da2980241bc11b03f9f64743
+RMD160 (anope-2.0.6-source.tar.gz) = 1771ee896cf30f9962abec56aed3a5f71f17b8e0
+SHA512 (anope-2.0.6-source.tar.gz) = c100758d6159023832bc7a4dceb7d554a9b3cd9120b033efc9a93c7ff28e76a086d0594b66b9cd2946b231421217674990f2a3ebaa8a6598c2a25e2dafd1b65b
+Size (anope-2.0.6-source.tar.gz) = 1792912 bytes
+SHA1 (patch-data_example.conf) = 0adb909df1a7fa0ed7c96433f37119d90b0516db
diff --git a/chat/anope/files/anope.sh b/chat/anope/files/anope.sh
index 564ac73d46c..fc388855639 100644
--- a/chat/anope/files/anope.sh
+++ b/chat/anope/files/anope.sh
@@ -1,23 +1,37 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: anope.sh,v 1.1.1.1 2006/10/20 22:40:24 adrianp Exp $
+# $NetBSD: anope.sh,v 1.2 2019/02/05 19:10:50 nia Exp $
 #
 # PROVIDE: anope
 # REQUIRE: DAEMON
-# KEYWORD: shutdown
-#
 
-if [ -f /etc/rc.subr ]
-then
-	. /etc/rc.subr
-fi
+. /etc/rc.subr
 
 name="anope"
 rcvar=${name}
-command="@PREFIX@/lib/anope/services"
-required_files="@PREFIX@/lib/anope/services.conf"
+command="@PREFIX@/bin/anope"
+command_args="--confdir=@PKG_SYSCONFDIR@/anope"
+command_args="${command_args} --dbdir=@PREFIX@/anope/data"
+command_args="${command_args} --localedir=@PREFIX@/@PKGLOCALEDIR@/locale"
+command_args="${command_args} --logdir=@PREFIX@/anope/logs"
+command_args="${command_args} --modulesdir=@PREFIX@/lib/anope"
+required_files="@PKG_SYSCONFDIR@/anope/services.conf"
+pidfile="@PREFIX@/anope/${name}.pid"
+
 anope_user="@ANOPE_USER@"
 anope_group="@ANOPE_GROUP@"
 
+extra_commands="support"
+support_cmd="anope_support"
+
+anope_support()
+{
+	if [ ! -f ${required_files} ]; then
+		warn "${required_files} does not exist."
+		return 1;
+	fi
+	su -m ${anope_user}:${anope_group} -c "${command} ${command_args} --support"
+}
+
 load_rc_config $name
 run_rc_command "$1"
diff --git a/chat/anope/options.mk b/chat/anope/options.mk
index 97c6b3ecf00..a499a938983 100644
--- a/chat/anope/options.mk
+++ b/chat/anope/options.mk
@@ -1,22 +1,45 @@
-# $NetBSD: options.mk,v 1.1.1.1 2006/10/20 22:40:24 adrianp Exp $
+# $NetBSD: options.mk,v 1.2 2019/02/05 19:10:50 nia Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.anope
-PKG_SUPPORTED_OPTIONS=	mysql anope-dbencryption
+PKG_OPTIONS_VAR=		PKG_OPTIONS.anope
+PKG_SUPPORTED_OPTIONS=		gnutls openssl mysql ldap pcre sqlite3
+PKG_SUGGESTED_OPTIONS=		openssl
+PLIST_VARS+=			gnutls openssl mysql ldap pcre sqlite3
 
 .include "../../mk/bsd.options.mk"
 
-###
-### Use MySQL for storing data
-###
+.if !empty(PKG_OPTIONS:Mgnutls)
+PLIST.gnutls=	yes
+ANOPE_EXTRAS+=	m_ssl_gnutls.cpp
+.include "../../security/gnutls/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mopenssl)
+PLIST.openssl=	yes
+ANOPE_EXTRAS+=	m_ssl_openssl.cpp
+.include "../../security/openssl/buildlink3.mk"
+.endif
+
 .if !empty(PKG_OPTIONS:Mmysql)
-.	include "../../mk/mysql.buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-mysql
+PLIST.mysql=	yes
+ANOPE_EXTRAS+=	m_mysql.cpp
+.include "../../mk/mysql.buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mldap)
+PLIST.ldap=	yes
+ANOPE_EXTRAS+=	m_ldap.cpp
+ANOPE_EXTRAS+=	m_ldap_authentication.cpp
+.include "../../databases/openldap-client/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mpcre)
+PLIST.pcre=	yes
+ANOPE_EXTRAS+=	m_regex_pcre.cpp
+.include "../../devel/pcre/buildlink3.mk"
 .endif
 
-###
-### Encrypt sensitive data in the database (only with mysql)
-###
-.if !empty(PKG_OPTIONS:Mmysql) && !empty(PKG_OPTIONS:Manope-dbencryption)
-CONFIGURE_ARGS+=	--with-encryption
+.if !empty(PKG_OPTIONS:Msqlite3)
+PLIST.sqlite3=	yes
+ANOPE_EXTRAS+=	m_sqlite.cpp
+.include "../../databases/sqlite3/buildlink3.mk"
 .endif
diff --git a/chat/anope/patches/patch-aa b/chat/anope/patches/patch-aa
deleted file mode 100644
index 7f863fb49c6..00000000000
--- a/chat/anope/patches/patch-aa
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2009/12/17 20:56:46 abs Exp $
-
---- src/Makefile.orig	2008-01-10 22:31:39.000000000 +0000
-+++ src/Makefile
-@@ -108,17 +108,16 @@ spotless:
- 	(cd core ; ${MAKE} distclean)
- 
- install: services
--	test -d ${BINDEST} || mkdir ${BINDEST}
--	$(INSTALL) services $(BINDEST)/services
--	$(INSTALL) bin/anoperc $(BINDEST)/anoperc
--	rm -f $(BINDEST)/listnicks $(BINDEST)/listchans
--	ln $(BINDEST)/services $(BINDEST)/listnicks
--	ln $(BINDEST)/services $(BINDEST)/listchans
-+	test -d ${DESTDIR}${BINDEST} || mkdir ${DESTDIR}${BINDEST}
-+	$(INSTALL) services ${DESTDIR}$(BINDEST)/services
-+	$(INSTALL) bin/anoperc ${DESTDIR}$(BINDEST)/anoperc
-+	rm -f ${DESTDIR}$(BINDEST)/listnicks ${DESTDIR}$(BINDEST)/listchans
-+	ln ${DESTDIR}$(BINDEST)/services ${DESTDIR}$(BINDEST)/listnicks
-+	ln ${DESTDIR}$(BINDEST)/services ${DESTDIR}$(BINDEST)/listchans
- 	(cd ../lang ; $(MAKE) install)
--	$(CP) ../data/* $(DATDEST)
--	$(INSTALL) bin/mydbgen $(DATDEST)/mydbgen
--	test -d $(DATDEST)/backups || mkdir $(DATDEST)/backups
--	test -d $(DATDEST)/logs || mkdir $(DATDEST)/logs
-+	$(INSTALL) bin/mydbgen ${DESTDIR}$(DATDEST)/mydbgen
-+	test -d ${DESTDIR}$(DATDEST)/backups || mkdir ${DESTDIR}$(DATDEST)/backups
-+	test -d ${DESTDIR}$(DATDEST)/logs || mkdir ${DESTDIR}$(DATDEST)/logs
- 	@if [ "$(MODULE_PATH)" ] ; then \
- 		test -d ${MODULE_PATH} || mkdir ${MODULE_PATH} ; \
- 		test -d ${MODULE_PATH}/runtime || mkdir ${MODULE_PATH}/runtime ; \
-@@ -127,12 +126,12 @@ install: services
- 		(cd core ; ${MAKE} install) ; \
- 	fi
- 	@if [ "$(RUNGROUP)" ] ; then \
--		echo chgrp -R $(RUNGROUP) $(DATDEST) ; \
--		chgrp -R $(RUNGROUP) $(DATDEST) ; \
--		echo chmod -R g+rw $(DATDEST) ; \
--		chmod -R g+rw $(DATDEST) ; \
--		echo find $(DATDEST) -type d -exec chmod g+xs \'\{\}\' \\\; ; \
--		find $(DATDEST) -type d -exec chmod g+xs '{}' \; ; \
-+		echo chgrp -R $(RUNGROUP) ${DESTDIR}$(DATDEST) ; \
-+		chgrp -R $(RUNGROUP) ${DESTDIR}$(DATDEST) ; \
-+		echo chmod -R g+rw ${DESTDIR}$(DATDEST) ; \
-+		chmod -R g+rw ${DESTDIR}$(DATDEST) ; \
-+		echo find ${DESTDIR}$(DATDEST) -type d -exec chmod g+xs \'\{\}\' \\\; ; \
-+		find ${DESTDIR}$(DATDEST) -type d -exec chmod g+xs '{}' \; ; \
- 	fi
- 
- DUMMY:
diff --git a/chat/anope/patches/patch-ab b/chat/anope/patches/patch-ab
deleted file mode 100644
index 23a86ac0846..00000000000
--- a/chat/anope/patches/patch-ab
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/12/17 20:56:46 abs Exp $
-
---- lang/Makefile.orig	2008-01-10 22:31:35.000000000 +0000
-+++ lang/Makefile
-@@ -18,22 +18,22 @@ all: $(LANGOBJS)
- distclean: clean spotless
- 
- install: all
--	test -d $(DATDEST)/languages || mkdir $(DATDEST)/languages
-+	test -d $(DESTDIR)$(DATDEST)/languages || mkdir $(DESTDIR)$(DATDEST)/languages
- 	@if [ "$(RUNGROUP)" ] ; then \
--		echo chgrp -R $(RUNGROUP) $(DATDEST)/languages ; \
--		chgrp -R $(RUNGROUP) $(DATDEST)/languages ; \
--		echo chmod -R g+rw $(DATDEST)/languages ; \
--		chmod -R g+rw $(DATDEST)/languages ; \
--		$(CP) $(LANGOBJS) $(DATDEST)/languages ; \
--		echo chgrp -R $(RUNGROUP) $(DATDEST)/languages ; \
--		chgrp -R $(RUNGROUP) $(DATDEST)/languages/* ; \
--		echo chmod -R g+rw $(DATDEST)/languages/* ; \
--		chmod -R g+rw $(DATDEST)/languages/* ; \
-+		echo chgrp -R $(RUNGROUP) $(DESTDIR)$(DATDEST)/languages ; \
-+		chgrp -R $(RUNGROUP) $(DESTDIR)$(DATDEST)/languages ; \
-+		echo chmod -R g+rw $(DESTDIR)$(DATDEST)/languages ; \
-+		chmod -R g+rw $(DESTDIR)$(DATDEST)/languages ; \
-+		$(CP) $(LANGOBJS) $(DESTDIR)$(DATDEST)/languages ; \
-+		echo chgrp -R $(RUNGROUP) $(DESTDIR)$(DATDEST)/languages ; \
-+		chgrp -R $(RUNGROUP) $(DESTDIR)$(DATDEST)/languages/* ; \
-+		echo chmod -R g+rw $(DESTDIR)$(DATDEST)/languages/* ; \
-+		chmod -R g+rw $(DESTDIR)$(DATDEST)/languages/* ; \
- 	fi
- 	@if [ ! "$(RUNGROUP)" ] ; then \
--		chmod 700 $(DATDEST)/languages/ ; \
--		$(CP) $(LANGOBJS) $(DATDEST)/languages ; \
--		chmod 600 $(DATDEST)/languages/* ; \
-+		chmod 700 $(DESTDIR)$(DATDEST)/languages/ ; \
-+		$(CP) $(LANGOBJS) $(DESTDIR)$(DATDEST)/languages ; \
-+		chmod 600 $(DESTDIR)$(DATDEST)/languages/* ; \
- 	fi
- 	
- clean:
diff --git a/chat/anope/patches/patch-ac b/chat/anope/patches/patch-ac
deleted file mode 100644
index 5a5c14d59a9..00000000000
--- a/chat/anope/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2009/12/17 20:56:46 abs Exp $
-
---- src/modules/Makefile.orig	2008-01-10 22:31:39.000000000 +0000
-+++ src/modules/Makefile
-@@ -16,7 +16,7 @@ all: modules subs
- modules: $(OBJECTS) $(SO_FILES)
- 
- install: 
--	$(CP) ./*.so $(MODULE_PATH) 
-+	$(CP) ./*.so $(DESTDIR)$(MODULE_PATH) 
- 
- distclean: spotless
- 
diff --git a/chat/anope/patches/patch-ad b/chat/anope/patches/patch-ad
deleted file mode 100644
index 7fe61d3eed7..00000000000
--- a/chat/anope/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2009/12/17 20:56:46 abs Exp $
-
---- src/protocol/Makefile.orig	2008-01-10 22:31:38.000000000 +0000
-+++ src/protocol/Makefile
-@@ -16,7 +16,7 @@ all: modules subs
- modules: $(OBJECTS) $(SO_FILES)
- 
- install: 
--	$(CP) ./*.so $(MODULE_PATH) 
-+	$(CP) ./*.so $(DESTDIR)$(MODULE_PATH) 
- 
- distclean: clean spotless
- 
diff --git a/chat/anope/patches/patch-ae b/chat/anope/patches/patch-ae
deleted file mode 100644
index 16f5a4e9bee..00000000000
--- a/chat/anope/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2009/12/17 20:56:46 abs Exp $
-
---- src/core/Makefile.orig	2008-01-10 22:31:37.000000000 +0000
-+++ src/core/Makefile
-@@ -16,7 +16,7 @@ all: modules subs
- modules: $(OBJECTS) $(SO_FILES)
- 
- install: 
--	$(CP) ./*.so $(MODULE_PATH) 
-+	$(CP) ./*.so $(DESTDIR)$(MODULE_PATH) 
- 
- distclean: spotless
- 
diff --git a/chat/anope/patches/patch-af b/chat/anope/patches/patch-af
deleted file mode 100644
index e10063f4dde..00000000000
--- a/chat/anope/patches/patch-af
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-af,v 1.2 2012/02/16 13:39:26 hans Exp $
-
---- src/tools/Makefile.orig	2008-01-10 22:31:37.000000000 +0000
-+++ src/tools/Makefile
-@@ -16,8 +16,14 @@ all: ${OBJS}
- 
- distclean: spotless
- 
--anopesmpt:  $(OBJS)
--	$(CC) $(CFLAGS) $(OBJS) $(ANOPELIBS) $(MLIBS) -o $@ $(LDFLAGS) 
-+anopesmtp: anopesmtp.o
-+	$(CC) $(CFLAGS) $< $(ANOPELIBS) $(MLIBS) -o $@ $(LDFLAGS) 
-+
-+db-merger:  db-merger.o
-+	$(CC) $(CFLAGS) $< $(ANOPELIBS) $(MLIBS) -o $@ $(LDFLAGS) 
-+
-+epona2anope:  epona2anope.o
-+	$(CC) $(CFLAGS) $< $(ANOPELIBS) $(MLIBS) -o $@ $(LDFLAGS) 
- 
- $(OBJS): Makefile
- anopesmtp.o:    anopesmtp.c $(INCLUDES)
-@@ -30,10 +36,10 @@ clean:
- spotless: clean
- 
- install: anopesmtp db-merger epona2anope
--	test -d ${BINDEST} || mkdir ${BINDEST}
--	test -d $(BINDEST)/tools || mkdir $(BINDEST)/tools
--	$(INSTALL) anopesmtp $(BINDEST)/tools/anopesmtp
--	$(INSTALL) db-merger $(BINDEST)/tools/db-merger
--	$(INSTALL) epona2anope $(BINDEST)/tools/epona2anope
-+	test -d ${DESTDIR}/${BINDEST} || mkdir ${DESTDIR}/${BINDEST}
-+	test -d ${DESTDIR}/$(BINDEST)/tools || mkdir ${DESTDIR}/$(BINDEST)/tools
-+	$(INSTALL) anopesmtp ${DESTDIR}/$(BINDEST)/tools/anopesmtp
-+	$(INSTALL) db-merger ${DESTDIR}/$(BINDEST)/tools/db-merger
-+	$(INSTALL) epona2anope ${DESTDIR}/$(BINDEST)/tools/epona2anope
- 
- DUMMY:
diff --git a/chat/anope/patches/patch-configure b/chat/anope/patches/patch-configure
deleted file mode 100644
index e06a6ed821d..00000000000
--- a/chat/anope/patches/patch-configure
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2012/07/03 18:18:20 joerg Exp $
-
---- configure.orig	2012-07-03 10:07:01.000000000 +0000
-+++ configure
-@@ -4367,9 +4367,9 @@ fi
- 
- 
- hold_cflags=$CFLAGS
--CFLAGS="$CFLAGS -export-dynamic"
--{ echo "$as_me:$LINENO: checking if we need the -export-dynamic flag" >&5
--echo $ECHO_N "checking if we need the -export-dynamic flag... $ECHO_C" >&6; }
-+CFLAGS="$CFLAGS -Wl,--export-dynamic"
-+{ echo "$as_me:$LINENO: checking if we need the -Wl,--export-dynamic flag" >&5
-+echo $ECHO_N "checking if we need the -Wl,--export-dynamic flag... $ECHO_C" >&6; }
- if test "${ac_cv_export_dynamic+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
diff --git a/chat/anope/patches/patch-data_example.conf b/chat/anope/patches/patch-data_example.conf
new file mode 100644
index 00000000000..c622db26fc0
--- /dev/null
+++ b/chat/anope/patches/patch-data_example.conf
@@ -0,0 +1,110 @@
+$NetBSD: patch-data_example.conf,v 1.1 2019/02/05 19:10:50 nia Exp $
+
+Fix config file filenames for pkgsrc's CONF_FILES system.
+
+--- data/example.conf.orig	2017-03-30 21:00:24.000000000 +0000
++++ data/example.conf
+@@ -231,13 +231,13 @@ serverinfo
+ 	 * The filename containing the Services process ID. The path is relative to the
+ 	 * services root directory.
+ 	 */
+-	pid = "data/services.pid"
++	pid = "@PREFIX@/anope/anope.pid"
+ 
+ 	/*
+ 	 * The filename containing the Message of the Day. The path is relative to the
+ 	 * services root directory.
+ 	 */
+-	motd = "conf/services.motd"
++	motd = "@PKG_SYSCONFDIR@/anope/services.motd"
+ }
+ 
+ /*
+@@ -560,7 +560,7 @@ options
+ include
+ {
+ 	type = "file"
+-	name = "botserv.example.conf"
++	name = "botserv.conf"
+ }
+ 
+ /*
+@@ -573,7 +573,7 @@ include
+ include
+ {
+ 	type = "file"
+-	name = "chanserv.example.conf"
++	name = "chanserv.conf"
+ }
+ 
+ /*
+@@ -586,7 +586,7 @@ include
+ include
+ {
+ 	type = "file"
+-	name = "global.example.conf"
++	name = "global.conf"
+ }
+ 
+ /*
+@@ -599,7 +599,7 @@ include
+ include
+ {
+ 	type = "file"
+-	name = "hostserv.example.conf"
++	name = "hostserv.conf"
+ }
+ 
+ /*
+@@ -612,7 +612,7 @@ include
+ include
+ {
+ 	type = "file"
+-	name = "memoserv.example.conf"
++	name = "memoserv.conf"
+ }
+ 
+ /*
+@@ -625,7 +625,7 @@ include
+ include
+ {
+ 	type = "file"
+-	name = "nickserv.example.conf"
++	name = "nickserv.conf"
+ }
+ 
+ /*
+@@ -638,7 +638,7 @@ include
+ include
+ {
+ 	type = "file"
+-	name = "operserv.example.conf"
++	name = "operserv.conf"
+ }
+ 
+ /*
+@@ -1232,7 +1232,7 @@ module { name = "enc_sha256" }
+ include
+ {
+ 	type = "file"
+-	name = "modules.example.conf"
++	name = "modules.conf"
+ }
+ 
+ /*
+@@ -1242,7 +1242,7 @@ include
+ #include
+ {
+ 	type = "file"
+-	name = "chanstats.example.conf"
++	name = "chanstats.conf"
+ }
+ 
+ /*
+@@ -1255,5 +1255,5 @@ include
+ #include
+ {
+ 	type = "file"
+-	name = "irc2sql.example.conf"
++	name = "irc2sql.conf"
+ }
diff --git a/chat/anope/patches/patch-src_tools_anopesmtp.c b/chat/anope/patches/patch-src_tools_anopesmtp.c
deleted file mode 100644
index c5c537f915e..00000000000
--- a/chat/anope/patches/patch-src_tools_anopesmtp.c
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-src_tools_anopesmtp.c,v 1.1 2015/02/19 22:24:24 joerg Exp $
-
---- src/tools/anopesmtp.c.orig	2015-02-19 19:29:39.000000000 +0000
-+++ src/tools/anopesmtp.c
-@@ -144,7 +144,8 @@ void alog(const char *fmt, ...)
- 
-     checkday();
- 
--    if (!fmt) {
-+    if (!fmt || !logfile) {
-+        errno = errno_save;
-         return;
-     }
- 
-@@ -152,11 +153,9 @@ void alog(const char *fmt, ...)
-     time(&t);
-     tm = *localtime(&t);
-     strftime(buf, sizeof(buf) - 1, "[%b %d %H:%M:%S %Y] ", &tm);
--    if (logfile && args) {
--        fputs(buf, logfile);
--        vfprintf(logfile, fmt, args);
--        fputc('\n', logfile);
--    }
-+    fputs(buf, logfile);
-+    vfprintf(logfile, fmt, args);
-+    fputc('\n', logfile);
-     va_end(args);
-     errno = errno_save;
- }