Index: head/irc/inspircd/Makefile =================================================================== --- head/irc/inspircd/Makefile (revision 454967) +++ head/irc/inspircd/Makefile (revision 454968) @@ -1,153 +1,161 @@ # Created by: Craig Edwards # $FreeBSD$ PORTNAME= inspircd -PORTVERSION= 2.0.23 +PORTVERSION= 2.0.25 DISTVERSIONPREFIX= v -PORTREVISION= 0 CATEGORIES= irc MAINTAINER= feld@FreeBSD.org COMMENT= Modular C++ IRC daemon LICENSE= GPLv2 CONFLICTS= inspircd-1.* USE_GITHUB= yes GH_ACCOUNT= inspircd USE_RC_SUBR= ${PORTNAME} MAKEFILE= BSDmakefile 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} # 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} -OPTIONS_DEFINE= MYSQL PGSQL SQLITE LDAPAUTH LDAPOPER GNUTLS OPENSSL PCRE POSIX +OPTIONS_DEFINE= MYSQL PGSQL SQLITE LDAPAUTH LDAPOPER GNUTLS OPENSSL PCRE POSIX GEOIP OPTIONS_DEFAULT= OPENSSL POSIX 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 POSIX_DESC= Build m_regex_posix module +GEOIP_DESC= Build m_geoip module .include .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 pre-configure: @if [ ${EXTRAS} ]; then \ cd ${WRKSRC} && ${CONFIGURE_CMD} --enable-extras=${EXTRAS} ; \ fi post-patch: @${REINPLACE_CMD} -e 's|DATA_PATH "/inspircd.pid"|"/var/run/inspircd/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}/bin/${PORTNAME} .include Index: head/irc/inspircd/distinfo =================================================================== --- head/irc/inspircd/distinfo (revision 454967) +++ head/irc/inspircd/distinfo (revision 454968) @@ -1,3 +1,3 @@ -TIMESTAMP = 1473170069 -SHA256 (inspircd-inspircd-v2.0.23_GH0.tar.gz) = 522b31fc80e8fd90b66837bf50f8a941233709d5b1fc9c0b3c47a413fb69f162 -SIZE (inspircd-inspircd-v2.0.23_GH0.tar.gz) = 731695 +TIMESTAMP = 1511032831 +SHA256 (inspircd-inspircd-v2.0.25_GH0.tar.gz) = c2488fafd04fcabbd8ddc8b9cdc6e0b57e942802b451c9cbccaf5d8483ebd251 +SIZE (inspircd-inspircd-v2.0.25_GH0.tar.gz) = 734017 Index: head/irc/inspircd/pkg-plist =================================================================== --- head/irc/inspircd/pkg-plist (revision 454967) +++ head/irc/inspircd/pkg-plist (revision 454968) @@ -1,226 +1,227 @@ bin/inspircd %%ETCDIR%%/examples/aliases/anope.conf.example %%ETCDIR%%/examples/aliases/atheme.conf.example @sample %%ETCDIR%%/examples/censor.conf.example %%ETCDIR%%/censor.conf @sample %%ETCDIR%%/examples/filter.conf.example %%ETCDIR%%/filter.conf @sample %%ETCDIR%%/examples/helpop-full.conf.example %%ETCDIR%%/helpop-full.conf @sample %%ETCDIR%%/examples/helpop.conf.example %%ETCDIR%%/helpop.conf @sample %%ETCDIR%%/examples/inspircd.conf.example %%ETCDIR%%/inspircd.conf @sample %%ETCDIR%%/examples/links.conf.example %%ETCDIR%%/links.conf @sample %%ETCDIR%%/examples/modules.conf.example %%ETCDIR%%/modules.conf %%ETCDIR%%/examples/modules/charybdis.conf.example %%ETCDIR%%/examples/modules/unrealircd.conf.example @sample %%ETCDIR%%/examples/motd.txt.example %%ETCDIR%%/motd.txt @sample %%ETCDIR%%/examples/opermotd.txt.example %%ETCDIR%%/opermotd.txt @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%%\""