Index: head/irc/anope/Makefile =================================================================== --- head/irc/anope/Makefile (revision 442988) +++ head/irc/anope/Makefile (revision 442989) @@ -1,153 +1,104 @@ # Created by: mat # $FreeBSD$ PORTNAME= anope -PORTVERSION= 2.0.2 -PORTREVISION= 2 +PORTVERSION= 2.0.5 +PORTREVISION= 0 CATEGORIES= irc MAINTAINER= feld@FreeBSD.org COMMENT= Set of IRC services for IRC networks LICENSE= GPLv2 USES= cmake:outsource shebangfix CMAKE_ARGS+= -DINSTDIR:STRING="${LOCALBASE}/anope" -CPPFLAGS+= "-I${LOCALBASE}/include" +CXXFLAGS+= "-I${LOCALBASE}/include" LDFLAGS+= "-L${LOCALBASE}/lib" SHEBANG_FILES= ${WRKSRC}/src/tools/*.sh USE_GITHUB= yes USE_RC_SUBR= anope SUB_FILES= pkg-message -OPTIONS_DEFINE= GNUTLS LDAP MYSQL NLS OPENSSL PCRE POSIX SASL SQLITE STATS TRE +OPTIONS_DEFINE= GNUTLS LDAP MYSQL NLS OPENSSL PCRE POSIX REDIS SASL SQLITE STATS TRE OPTIONS_DEFAULT= MYSQL OPENSSL POSIX +OPTIONS_SUB= yes POSIX_DESC= POSIX Regex Module STATS_DESC= Channel Statistics Module TRE_DESC= Tre Regex Module -NLS_USES= gettext +GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls -.include +LDAP_VARS_ON= USE_OPENLDAP=yes -.if ${PORT_OPTIONS:MGNUTLS} -PLIST_SUB+= GNUTLS="" -LIB_DEPENDS+= libgnutls.so:security/gnutls -.else -PLIST_SUB+= GNUTLS="@comment " -.endif +MYSQL_USES= mysql -.if ${PORT_OPTIONS:MLDAP} -PLIST_SUB+= LDAP="" -USE_OPENLDAP= yes -.else -PLIST_SUB+= LDAP="@comment " -.endif +NLS_USES= gettext -.if ${PORT_OPTIONS:MMYSQL} -PLIST_SUB+= MYSQL="" -USE_MYSQL= yes -.else -PLIST_SUB+= MYSQL="@comment " -.endif +OPENSSL_USES= ssl -.if ${PORT_OPTIONS:MOPENSSL} -PLIST_SUB+= OPENSSL="" -USES+= ssl -.else -PLIST_SUB+= OPENSSL="@comment " -.endif +REDIS_RUN_DEPENDS= redis:databases/redis -.if ${PORT_OPTIONS:MPCRE} -PLIST_SUB+= PCRE="" -LIB_DEPENDS+= libpcre.so:devel/pcre -.else -PLIST_SUB+= PCRE="@comment " -.endif +PCRE_LIB_DEPENDS= libpcre.so:devel/pcre -.if ${PORT_OPTIONS:MPOSIX} -PLIST_SUB+= POSIX="" -.else -PLIST_SUB+= POSIX="@comment " -.endif +SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -.if ${PORT_OPTIONS:MSASL} -PLIST_SUB+= SASL="" -LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2 -.else -PLIST_SUB+= SASL="@comment " -.endif +SQLITE_USES= sqlite -.if ${PORT_OPTIONS:MSQLITE} -PLIST_SUB+= SQLITE="" -USES+= sqlite -.else -PLIST_SUB+= SQLITE="@comment " -.endif +TRE_LIB_DEPENDS= libtre.so:textproc/libtre -.if ${PORT_OPTIONS:MSTATS} -PLIST_SUB+= STATS="" -.else -PLIST_SUB+= STATS="@comment " -.endif - -.if ${PORT_OPTIONS:MTRE} -PLIST_SUB+= TRE="" -LIB_DEPENDS+= libtre.so:textproc/libtre -.else -PLIST_SUB+= TRE="@comment " -.endif +.include .include # XXX Add here other arch which needs -fPIC :-) .if ${ARCH} == "amd64" || ${ARCH} == "ia64" CFLAGS+= -fPIC .endif post-patch: .if ${PORT_OPTIONS:MGNUTLS} ${LN} -s ${WRKSRC}/modules/extra/m_ssl_gnutls.cpp ${WRKSRC}/modules/ .endif .if ${PORT_OPTIONS:MLDAP} ${LN} -s ${WRKSRC}/modules/extra/m_ldap.cpp ${WRKSRC}/modules/ ${LN} -s ${WRKSRC}/modules/extra/m_ldap_authentication.cpp ${WRKSRC}/modules/ ${LN} -s ${WRKSRC}/modules/extra/m_ldap_oper.cpp ${WRKSRC}/modules/ .endif .if ${PORT_OPTIONS:MMYSQL} ${LN} -s ${WRKSRC}/modules/extra/m_mysql.cpp ${WRKSRC}/modules/ ${LN} -s ${WRKSRC}/modules/extra/m_sql_authentication.cpp ${WRKSRC}/modules/ ${LN} -s ${WRKSRC}/modules/extra/m_sql_log.cpp ${WRKSRC}/modules/ ${LN} -s ${WRKSRC}/modules/extra/m_sql_oper.cpp ${WRKSRC}/modules/ .endif .if ${PORT_OPTIONS:MOPENSSL} ${LN} -s ${WRKSRC}/modules/extra/m_ssl_openssl.cpp ${WRKSRC}/modules/ .endif .if ${PORT_OPTIONS:MSQLITE} ${LN} -s ${WRKSRC}/modules/extra/m_sqlite.cpp ${WRKSRC}/modules/ .endif .if ${PORT_OPTIONS:MPCRE} ${LN} -s ${WRKSRC}/modules/extra/m_regex_pcre.cpp ${WRKSRC}/modules/ .endif .if ${PORT_OPTIONS:MPOSIX} ${LN} -s ${WRKSRC}/modules/extra/m_regex_posix.cpp ${WRKSRC}/modules/ .endif .if ${PORT_OPTIONS:MSASL} ${LN} -s ${WRKSRC}/modules/extra/m_sasl_dh-aes.cpp ${WRKSRC}/modules/ ${LN} -s ${WRKSRC}/modules/extra/m_sasl_dh-blowfish.cpp ${WRKSRC}/modules/ .endif .if ${PORT_OPTIONS:MSTATS} ${LN} -s ${WRKSRC}/modules/extra/stats ${WRKSRC}/modules/ .endif .if ${PORT_OPTIONS:MTRE} ${LN} -s ${WRKSRC}/modules/extra/m_regex_tre.cpp ${WRKSRC}/modules/ .endif post-install: ${MKDIR} ${STAGEDIR}/${LOCALBASE}/anope/data/backups ${MKDIR} ${STAGEDIR}/${LOCALBASE}/anope/logs .include Index: head/irc/anope/distinfo =================================================================== --- head/irc/anope/distinfo (revision 442988) +++ head/irc/anope/distinfo (revision 442989) @@ -1,2 +1,3 @@ -SHA256 (anope-anope-2.0.2_GH0.tar.gz) = 15e041bf3ebe0c86002e41162e98beb9276a910ef43628c46b58ae0a230401e2 -SIZE (anope-anope-2.0.2_GH0.tar.gz) = 1764564 +TIMESTAMP = 1497014744 +SHA256 (anope-anope-2.0.5_GH0.tar.gz) = acfaa189b05a08108838dcdd6dc6c445cc437861911a7c922599eb7b862f3109 +SIZE (anope-anope-2.0.5_GH0.tar.gz) = 1779920 Index: head/irc/anope/files/patch-CMakeLists.txt =================================================================== --- head/irc/anope/files/patch-CMakeLists.txt (revision 442988) +++ head/irc/anope/files/patch-CMakeLists.txt (revision 442989) @@ -1,27 +1,24 @@ ---- CMakeLists.txt.orig 2015-03-22 19:34:50 UTC +--- CMakeLists.txt.orig 2017-06-09 13:48:41 UTC +++ CMakeLists.txt -@@ -485,17 +485,17 @@ get_target_property(SERVICES_BINARY ${PR +@@ -489,16 +489,16 @@ get_target_property(SERVICES_BINARY ${PR get_filename_component(SERVICES_BINARY ${SERVICES_BINARY} NAME) # At install time, create the following additional directories --install(CODE "file(MAKE_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}/${DB_DIR}/backups\")") --install(CODE "file(MAKE_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}/${LOGS_DIR}\")") -+#install(CODE "file(MAKE_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}/${DB_DIR}/backups\")") -+#install(CODE "file(MAKE_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}/${LOGS_DIR}\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${DB_DIR}/backups\")") +-install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${LOGS_DIR}\")") ++#install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${DB_DIR}/backups\")") ++#install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${LOGS_DIR}\")") if(WIN32) - install(CODE "file(MAKE_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}/${DB_DIR}/runtime\")") + install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${DB_DIR}/runtime\")") endif(WIN32) # On non-Windows platforms, if RUNGROUP is set, change the permissions of the below directories, as well as the group of the data directory --if(NOT WIN32 AND RUNGROUP) -- install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\${CMAKE_INSTALL_PREFIX}/\${DB_DIR}/backups\")") -- install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\${CMAKE_INSTALL_PREFIX}/\${LOGS_DIR}\")") -- install(CODE "execute_process(COMMAND ${CHGRP} -R ${RUNGROUP} \"\${CMAKE_INSTALL_PREFIX}\")") --endif(NOT WIN32 AND RUNGROUP) -+#if(NOT WIN32 AND RUNGROUP) -+# install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\${CMAKE_INSTALL_PREFIX}/\${DB_DIR}/backups\")") -+# install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\${CMAKE_INSTALL_PREFIX}/\${LOGS_DIR}\")") -+# install(CODE "execute_process(COMMAND ${CHGRP} -R ${RUNGROUP} \"\${CMAKE_INSTALL_PREFIX}\")") -+#endif(NOT WIN32 AND RUNGROUP) + if(NOT WIN32 AND RUNGROUP) +- install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/\${DB_DIR}/backups\")") +- install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/\${LOGS_DIR}\")") +- install(CODE "execute_process(COMMAND ${CHGRP} -R ${RUNGROUP} \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}\")") ++# install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/\${DB_DIR}/backups\")") ++# install(CODE "execute_process(COMMAND ${CHMOD} 2775 \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/\${LOGS_DIR}\")") ++# install(CODE "execute_process(COMMAND ${CHGRP} -R ${RUNGROUP} \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}\")") + endif(NOT WIN32 AND RUNGROUP) # On Windows platforms, install extra files if(WIN32) - install(FILES ${Anope_SOURCE_DIR}/src/win32/anope.bat Index: head/irc/anope/pkg-plist =================================================================== --- head/irc/anope/pkg-plist (revision 442988) +++ head/irc/anope/pkg-plist (revision 442989) @@ -1,222 +1,223 @@ anope/bin/anoperc anope/bin/anopesmtp anope/bin/geoipupdate.sh anope/bin/services anope/conf/botserv.example.conf anope/conf/chanserv.example.conf anope/conf/chanstats.example.conf anope/conf/example.chk anope/conf/example.conf anope/conf/global.example.conf anope/conf/hostserv.example.conf anope/conf/irc2sql.example.conf anope/conf/memoserv.example.conf anope/conf/modules.example.conf anope/conf/nickserv.example.conf anope/conf/operserv.example.conf anope/conf/stats.standalone.example.conf 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 anope/lib/modules/bahamut.so anope/lib/modules/botserv.so anope/lib/modules/bs_assign.so anope/lib/modules/bs_autoassign.so anope/lib/modules/bs_badwords.so anope/lib/modules/bs_bot.so anope/lib/modules/bs_botlist.so anope/lib/modules/bs_control.so anope/lib/modules/bs_info.so anope/lib/modules/bs_kick.so anope/lib/modules/bs_set.so anope/lib/modules/chanserv.so anope/lib/modules/charybdis.so anope/lib/modules/cs_access.so anope/lib/modules/cs_akick.so anope/lib/modules/cs_ban.so anope/lib/modules/cs_clone.so anope/lib/modules/cs_drop.so anope/lib/modules/cs_enforce.so anope/lib/modules/cs_entrymsg.so %%STATS%%anope/lib/modules/cs_fantasy_stats.so %%STATS%%anope/lib/modules/cs_fantasy_top.so anope/lib/modules/cs_flags.so anope/lib/modules/cs_getkey.so anope/lib/modules/cs_info.so anope/lib/modules/cs_invite.so anope/lib/modules/cs_kick.so anope/lib/modules/cs_list.so anope/lib/modules/cs_log.so anope/lib/modules/cs_mode.so anope/lib/modules/cs_register.so anope/lib/modules/cs_seen.so anope/lib/modules/cs_set.so anope/lib/modules/cs_set_misc.so anope/lib/modules/cs_status.so anope/lib/modules/cs_statusupdate.so anope/lib/modules/cs_suspend.so anope/lib/modules/cs_sync.so anope/lib/modules/cs_topic.so anope/lib/modules/cs_unban.so anope/lib/modules/cs_updown.so anope/lib/modules/cs_xop.so anope/lib/modules/db_flatfile.so anope/lib/modules/db_old.so anope/lib/modules/db_redis.so anope/lib/modules/db_sql.so anope/lib/modules/db_sql_live.so anope/lib/modules/enc_bcrypt.so anope/lib/modules/enc_md5.so anope/lib/modules/enc_none.so anope/lib/modules/enc_old.so anope/lib/modules/enc_sha1.so anope/lib/modules/enc_sha256.so anope/lib/modules/fantasy.so anope/lib/modules/gl_global.so anope/lib/modules/global.so anope/lib/modules/greet.so anope/lib/modules/help.so anope/lib/modules/hostserv.so anope/lib/modules/hs_del.so anope/lib/modules/hs_group.so anope/lib/modules/hs_list.so anope/lib/modules/hs_off.so anope/lib/modules/hs_on.so anope/lib/modules/hs_request.so anope/lib/modules/hs_set.so anope/lib/modules/hybrid.so anope/lib/modules/inspircd12.so anope/lib/modules/inspircd20.so %%STATS%%anope/lib/modules/irc2sql.so %%STATS%%anope/lib/modules/m_chanstats.so anope/lib/modules/m_dns.so anope/lib/modules/m_dnsbl.so anope/lib/modules/m_helpchan.so anope/lib/modules/m_httpd.so %%LDAP%%anope/lib/modules/m_ldap.so %%LDAP%%anope/lib/modules/m_ldap_authentication.so %%LDAP%%anope/lib/modules/m_ldap_oper.so %%MYSQL%%anope/lib/modules/m_mysql.so anope/lib/modules/m_proxyscan.so anope/lib/modules/m_redis.so %%PCRE%%anope/lib/modules/m_regex_pcre.so %%POSIX%%anope/lib/modules/m_regex_posix.so %%TRE%%anope/lib/modules/m_regex_tre.so anope/lib/modules/m_rewrite.so anope/lib/modules/m_sasl.so %%SASL%%anope/lib/modules/m_sasl_dh-aes.so %%SASL%%anope/lib/modules/m_sasl_dh-blowfish.so %%GNUTLS%%anope/lib/modules/m_ssl_gnutls.so %%OPENSSL%%anope/lib/modules/m_ssl_openssl.so %%MYSQL%%anope/lib/modules/m_sql_authentication.so %%MYSQL%%anope/lib/modules/m_sql_log.so %%MYSQL%%anope/lib/modules/m_sql_oper.so %%SQLITE%%anope/lib/modules/m_sqlite.so anope/lib/modules/m_xmlrpc.so anope/lib/modules/m_xmlrpc_main.so anope/lib/modules/memoserv.so anope/lib/modules/ms_cancel.so anope/lib/modules/ms_check.so anope/lib/modules/ms_del.so anope/lib/modules/ms_ignore.so anope/lib/modules/ms_info.so anope/lib/modules/ms_list.so anope/lib/modules/ms_read.so anope/lib/modules/ms_rsend.so anope/lib/modules/ms_send.so anope/lib/modules/ms_sendall.so anope/lib/modules/ms_set.so anope/lib/modules/ms_staff.so anope/lib/modules/ngircd.so anope/lib/modules/nickserv.so anope/lib/modules/ns_access.so anope/lib/modules/ns_ajoin.so anope/lib/modules/ns_alist.so anope/lib/modules/ns_cert.so anope/lib/modules/ns_drop.so anope/lib/modules/ns_getemail.so anope/lib/modules/ns_getpass.so anope/lib/modules/ns_group.so anope/lib/modules/ns_identify.so anope/lib/modules/ns_info.so anope/lib/modules/ns_list.so anope/lib/modules/ns_logout.so anope/lib/modules/ns_maxemail.so anope/lib/modules/ns_recover.so anope/lib/modules/ns_register.so anope/lib/modules/ns_resetpass.so anope/lib/modules/ns_set.so anope/lib/modules/ns_set_misc.so anope/lib/modules/ns_status.so anope/lib/modules/ns_suspend.so anope/lib/modules/ns_update.so anope/lib/modules/operserv.so anope/lib/modules/os_akill.so anope/lib/modules/os_chankill.so anope/lib/modules/os_config.so anope/lib/modules/os_defcon.so anope/lib/modules/os_dns.so anope/lib/modules/os_forbid.so anope/lib/modules/os_ignore.so anope/lib/modules/os_info.so anope/lib/modules/os_jupe.so anope/lib/modules/os_kick.so anope/lib/modules/os_kill.so anope/lib/modules/os_list.so anope/lib/modules/os_login.so anope/lib/modules/os_logsearch.so anope/lib/modules/os_mode.so anope/lib/modules/os_modinfo.so anope/lib/modules/os_module.so anope/lib/modules/os_news.so anope/lib/modules/os_noop.so anope/lib/modules/os_oline.so anope/lib/modules/os_oper.so anope/lib/modules/os_reload.so anope/lib/modules/os_session.so anope/lib/modules/os_set.so anope/lib/modules/os_shutdown.so anope/lib/modules/os_stats.so anope/lib/modules/os_svs.so anope/lib/modules/os_sxline.so anope/lib/modules/os_update.so anope/lib/modules/plexus.so anope/lib/modules/ratbox.so +anope/lib/modules/unreal4.so anope/lib/modules/unreal.so anope/lib/modules/webcpanel.so -anope/locale/ca_ES/LC_MESSAGES/anope.mo -anope/locale/de_DE/LC_MESSAGES/anope.mo -anope/locale/el_GR/LC_MESSAGES/anope.mo -anope/locale/en_US/LC_MESSAGES/anope.mo -anope/locale/es_ES/LC_MESSAGES/anope.mo -anope/locale/fr_FR/LC_MESSAGES/anope.mo -anope/locale/hu_HU/LC_MESSAGES/anope.mo -anope/locale/it_IT/LC_MESSAGES/anope.mo -anope/locale/nl_NL/LC_MESSAGES/anope.mo -anope/locale/pl_PL/LC_MESSAGES/anope.mo -anope/locale/pt_PT/LC_MESSAGES/anope.mo -anope/locale/ru_RU/LC_MESSAGES/anope.mo -anope/locale/tr_TR/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/ca_ES/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/de_DE/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/el_GR/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/en_US/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/es_ES/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/fr_FR/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/hu_HU/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/it_IT/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/nl_NL/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/pl_PL/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/pt_PT/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/ru_RU/LC_MESSAGES/anope.mo +%%NLS%%anope/locale/tr_TR/LC_MESSAGES/anope.mo @dir(nobody,,) anope/data/backups @dir(nobody,,) anope/data @dir(nobody,,) anope/logs