diff options
author | Tijl Coosemans <tijl@FreeBSD.org> | 2015-04-20 19:06:29 +0000 |
---|---|---|
committer | Tijl Coosemans <tijl@FreeBSD.org> | 2015-04-20 19:06:29 +0000 |
commit | 68edbeeaae964d81a4b96aea76974015371e7b07 (patch) | |
tree | 3686bc2aca372d50de8d274ce1e86a1d8116f741 /irc | |
parent | multimedia/handbrake: register CONFLICTS_BUILD with x265 (diff) |
- Display a stage-qa warning when ports use PREFIX/var instead of /var
- Add --localstatedir=/var to _LATE_CONFIGURE_ARGS (like --mandir) but not
when CONFIGURE_ARGS already sets it. (GNU configure scripts set it to
PREFIX/var when PREFIX != /usr.)
- Add --localstatedir="${PREFIX}/var" to CONFIGURE_ARGS in some ports so
they aren't affected by this change (for now at least). This commit is
meant to ensure that new ports don't make the same mistake.
- games/acm: the configure script in this port is very old; instead of
patching it more, just replace GNU_CONFIGURE with HAS_CONFIGURE.
- irc/charybdis: it already used /var but adding --localstatedir=/var
changed the behaviour of the configure script; adjust the port to this.
PR: 199506
Exp-run by: antoine
Approved by: portmgr (antoine)
Notes
Notes:
svn path=/head/; revision=384380
Diffstat (limited to 'irc')
-rw-r--r-- | irc/charybdis/Makefile | 10 | ||||
-rw-r--r-- | irc/charybdis/files/charybdis.in | 3 | ||||
-rw-r--r-- | irc/charybdis/files/patch-configure | 11 | ||||
-rw-r--r-- | irc/charybdis/files/patch-configure-ac | 11 | ||||
-rw-r--r-- | irc/charybdis/pkg-plist | 267 |
5 files changed, 150 insertions, 152 deletions
diff --git a/irc/charybdis/Makefile b/irc/charybdis/Makefile index 94768069429f..e54e1962caac 100644 --- a/irc/charybdis/Makefile +++ b/irc/charybdis/Makefile @@ -2,7 +2,7 @@ PORTNAME= charybdis PORTVERSION= 3.4.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= irc net MASTER_SITES= http://www.stack.nl/~jilles/irc/ \ http://www.bayofrum.net/dist/${PORTNAME}/ @@ -25,17 +25,15 @@ MASTER_SITES:= ${MASTER_SITES} \ PORTDOCS= charybdis-oper-guide.pdf -USE_AUTOTOOLS= autoconf USES= libtool pathfix USE_OPENSSL= yes USE_RC_SUBR= ${PORTNAME} GNU_CONFIGURE= yes USERS= ircd GROUPS= ircd -CONFIGURE_ARGS= --with-confdir=${ETCDIR} \ - --with-helpdir=${DATADIR}/help \ - --with-logdir=/var/log/${PORTNAME} \ - --with-moduledir=${DATADIR}/modules \ +CONFIGURE_ARGS= --sysconfdir=${ETCDIR} \ + --with-rundir=/var/run \ + --enable-fhs-paths \ --enable-kqueue OPTIONS_DEFINE= DOCS diff --git a/irc/charybdis/files/charybdis.in b/irc/charybdis/files/charybdis.in index 63fcb6c3bf50..fbb5de99f28d 100644 --- a/irc/charybdis/files/charybdis.in +++ b/irc/charybdis/files/charybdis.in @@ -30,8 +30,7 @@ start_precmd=${name}_prestart charybdis_prestart() { - install -d -o ircd -m755 /var/run/${name} /var/log/${name} /var/db/${name} - chown -R ircd %%ETCDIR%% + chown -R ircd %%ETCDIR%% /var/run/${name} /var/log/${name} /var/db/${name} } run_rc_command $1 diff --git a/irc/charybdis/files/patch-configure b/irc/charybdis/files/patch-configure new file mode 100644 index 000000000000..1c947bf9ad59 --- /dev/null +++ b/irc/charybdis/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2012-12-31 21:47:31 UTC ++++ configure +@@ -5411,7 +5411,7 @@ if test "x$enable_fhs_paths" = "xyes"; t + pkglibexecdir='${libexecdir}/${PACKAGE_TARNAME}' + rundir=${rundir-'${prefix}/run'} + pkgrundir='${rundir}/${PACKAGE_TARNAME}' +- pkglocalstatedir='${localstatedir}/${PACKAGE_TARNAME}' ++ pkglocalstatedir='${localstatedir}/db/${PACKAGE_TARNAME}' + else + libexecdir='${bindir}' + pkglibexecdir='${libexecdir}' diff --git a/irc/charybdis/files/patch-configure-ac b/irc/charybdis/files/patch-configure-ac deleted file mode 100644 index 61d9cc1788c1..000000000000 --- a/irc/charybdis/files/patch-configure-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig 2013-01-02 14:54:13.907049431 +0000 -+++ configure.ac 2013-01-02 15:00:16.779052086 +0000 -@@ -247,7 +247,7 @@ - rundir='${sysconfdir}' - pkgrundir='${rundir}' - localstatedir='${prefix}' -- pkglocalstatedir='${sysconfdir}']) -+ pkglocalstatedir='/var/db/${PACKAGE_TARNAME}']) - pkglibdir='${libdir}/${PACKAGE_TARNAME}' - AC_SUBST([pkglibdir]) - AC_SUBST([rundir]) diff --git a/irc/charybdis/pkg-plist b/irc/charybdis/pkg-plist index d21b07222bd7..840998df0432 100644 --- a/irc/charybdis/pkg-plist +++ b/irc/charybdis/pkg-plist @@ -1,18 +1,147 @@ -bin/bandb bin/bantool bin/convertilines bin/convertklines bin/genssl.sh bin/ircd bin/mkpasswd -bin/ssld bin/viconf bin/vimotd -etc/charybdis/example.conf -@sample etc/charybdis/ircd.motd.sample +%%ETCDIR%%/example.conf +@sample %%ETCDIR%%/ircd.motd.sample %%ETCDIR%%/reference.conf +lib/charybdis/modules/autoload/m_accept.so +lib/charybdis/modules/autoload/m_admin.so +lib/charybdis/modules/autoload/m_away.so +lib/charybdis/modules/autoload/m_cap.so +lib/charybdis/modules/autoload/m_capab.so +lib/charybdis/modules/autoload/m_certfp.so +lib/charybdis/modules/autoload/m_challenge.so +lib/charybdis/modules/autoload/m_chghost.so +lib/charybdis/modules/autoload/m_close.so +lib/charybdis/modules/autoload/m_cmessage.so +lib/charybdis/modules/autoload/m_connect.so +lib/charybdis/modules/autoload/m_dline.so +lib/charybdis/modules/autoload/m_encap.so +lib/charybdis/modules/autoload/m_etrace.so +lib/charybdis/modules/autoload/m_help.so +lib/charybdis/modules/autoload/m_info.so +lib/charybdis/modules/autoload/m_invite.so +lib/charybdis/modules/autoload/m_ison.so +lib/charybdis/modules/autoload/m_kline.so +lib/charybdis/modules/autoload/m_knock.so +lib/charybdis/modules/autoload/m_links.so +lib/charybdis/modules/autoload/m_list.so +lib/charybdis/modules/autoload/m_locops.so +lib/charybdis/modules/autoload/m_lusers.so +lib/charybdis/modules/autoload/m_map.so +lib/charybdis/modules/autoload/m_monitor.so +lib/charybdis/modules/autoload/m_motd.so +lib/charybdis/modules/autoload/m_names.so +lib/charybdis/modules/autoload/m_oper.so +lib/charybdis/modules/autoload/m_operspy.so +lib/charybdis/modules/autoload/m_pass.so +lib/charybdis/modules/autoload/m_ping.so +lib/charybdis/modules/autoload/m_pong.so +lib/charybdis/modules/autoload/m_post.so +lib/charybdis/modules/autoload/m_privs.so +lib/charybdis/modules/autoload/m_rehash.so +lib/charybdis/modules/autoload/m_restart.so +lib/charybdis/modules/autoload/m_resv.so +lib/charybdis/modules/autoload/m_sasl.so +lib/charybdis/modules/autoload/m_scan.so +lib/charybdis/modules/autoload/m_services.so +lib/charybdis/modules/autoload/m_set.so +lib/charybdis/modules/autoload/m_signon.so +lib/charybdis/modules/autoload/m_snote.so +lib/charybdis/modules/autoload/m_stats.so +lib/charybdis/modules/autoload/m_svinfo.so +lib/charybdis/modules/autoload/m_tb.so +lib/charybdis/modules/autoload/m_testline.so +lib/charybdis/modules/autoload/m_testmask.so +lib/charybdis/modules/autoload/m_tginfo.so +lib/charybdis/modules/autoload/m_time.so +lib/charybdis/modules/autoload/m_topic.so +lib/charybdis/modules/autoload/m_trace.so +lib/charybdis/modules/autoload/m_unreject.so +lib/charybdis/modules/autoload/m_user.so +lib/charybdis/modules/autoload/m_userhost.so +lib/charybdis/modules/autoload/m_users.so +lib/charybdis/modules/autoload/m_version.so +lib/charybdis/modules/autoload/m_wallops.so +lib/charybdis/modules/autoload/m_who.so +lib/charybdis/modules/autoload/m_whois.so +lib/charybdis/modules/autoload/m_whowas.so +lib/charybdis/modules/autoload/m_xline.so +lib/charybdis/modules/autoload/sno_routing.so +lib/charybdis/modules/extensions/chm_adminonly.so +lib/charybdis/modules/extensions/chm_operonly.so +lib/charybdis/modules/extensions/chm_operonly_compat.so +lib/charybdis/modules/extensions/chm_quietunreg_compat.so +lib/charybdis/modules/extensions/chm_sslonly.so +lib/charybdis/modules/extensions/chm_sslonly_compat.so +lib/charybdis/modules/extensions/createauthonly.so +lib/charybdis/modules/extensions/createoperonly.so +lib/charybdis/modules/extensions/example_module.so +lib/charybdis/modules/extensions/extb_account.so +lib/charybdis/modules/extensions/extb_canjoin.so +lib/charybdis/modules/extensions/extb_channel.so +lib/charybdis/modules/extensions/extb_extgecos.so +lib/charybdis/modules/extensions/extb_oper.so +lib/charybdis/modules/extensions/extb_realname.so +lib/charybdis/modules/extensions/extb_server.so +lib/charybdis/modules/extensions/extb_ssl.so +lib/charybdis/modules/extensions/extb_usermode.so +lib/charybdis/modules/extensions/force_user_invis.so +lib/charybdis/modules/extensions/hurt.so +lib/charybdis/modules/extensions/ip_cloaking.so +lib/charybdis/modules/extensions/ip_cloaking_3.0.so +lib/charybdis/modules/extensions/ip_cloaking_4.0.so +lib/charybdis/modules/extensions/ip_cloaking_old.so +lib/charybdis/modules/extensions/m_42.so +lib/charybdis/modules/extensions/m_adminwall.so +lib/charybdis/modules/extensions/m_findforwards.so +lib/charybdis/modules/extensions/m_identify.so +lib/charybdis/modules/extensions/m_mkpasswd.so +lib/charybdis/modules/extensions/m_ojoin.so +lib/charybdis/modules/extensions/m_okick.so +lib/charybdis/modules/extensions/m_olist.so +lib/charybdis/modules/extensions/m_omode.so +lib/charybdis/modules/extensions/m_opme.so +lib/charybdis/modules/extensions/m_remove.so +lib/charybdis/modules/extensions/m_roleplay.so +lib/charybdis/modules/extensions/m_sendbans.so +lib/charybdis/modules/extensions/m_webirc.so +lib/charybdis/modules/extensions/no_locops.so +lib/charybdis/modules/extensions/no_oper_invis.so +lib/charybdis/modules/extensions/override.so +lib/charybdis/modules/extensions/sno_farconnect.so +lib/charybdis/modules/extensions/sno_globalkline.so +lib/charybdis/modules/extensions/sno_globaloper.so +lib/charybdis/modules/extensions/sno_whois.so +lib/charybdis/modules/extensions/spy_admin_notice.so +lib/charybdis/modules/extensions/spy_info_notice.so +lib/charybdis/modules/extensions/spy_links_notice.so +lib/charybdis/modules/extensions/spy_motd_notice.so +lib/charybdis/modules/extensions/spy_stats_notice.so +lib/charybdis/modules/extensions/spy_stats_p_notice.so +lib/charybdis/modules/extensions/spy_trace_notice.so +lib/charybdis/modules/m_ban.so +lib/charybdis/modules/m_die.so +lib/charybdis/modules/m_error.so +lib/charybdis/modules/m_join.so +lib/charybdis/modules/m_kick.so +lib/charybdis/modules/m_kill.so +lib/charybdis/modules/m_message.so +lib/charybdis/modules/m_mode.so +lib/charybdis/modules/m_nick.so +lib/charybdis/modules/m_part.so +lib/charybdis/modules/m_quit.so +lib/charybdis/modules/m_server.so +lib/charybdis/modules/m_squit.so lib/libratbox.so libdata/pkgconfig/libratbox.pc +libexec/charybdis/bandb +libexec/charybdis/ssld man/man8/ircd.8.gz %%DATADIR%%/help/opers/accept %%DATADIR%%/help/opers/admin @@ -146,134 +275,6 @@ man/man8/ircd.8.gz %%DATADIR%%/help/users/who %%DATADIR%%/help/users/whois %%DATADIR%%/help/users/whowas -%%DATADIR%%/modules/autoload/m_accept.so -%%DATADIR%%/modules/autoload/m_admin.so -%%DATADIR%%/modules/autoload/m_away.so -%%DATADIR%%/modules/autoload/m_cap.so -%%DATADIR%%/modules/autoload/m_capab.so -%%DATADIR%%/modules/autoload/m_certfp.so -%%DATADIR%%/modules/autoload/m_challenge.so -%%DATADIR%%/modules/autoload/m_chghost.so -%%DATADIR%%/modules/autoload/m_close.so -%%DATADIR%%/modules/autoload/m_cmessage.so -%%DATADIR%%/modules/autoload/m_connect.so -%%DATADIR%%/modules/autoload/m_dline.so -%%DATADIR%%/modules/autoload/m_encap.so -%%DATADIR%%/modules/autoload/m_etrace.so -%%DATADIR%%/modules/autoload/m_help.so -%%DATADIR%%/modules/autoload/m_info.so -%%DATADIR%%/modules/autoload/m_invite.so -%%DATADIR%%/modules/autoload/m_ison.so -%%DATADIR%%/modules/autoload/m_kline.so -%%DATADIR%%/modules/autoload/m_knock.so -%%DATADIR%%/modules/autoload/m_links.so -%%DATADIR%%/modules/autoload/m_list.so -%%DATADIR%%/modules/autoload/m_locops.so -%%DATADIR%%/modules/autoload/m_lusers.so -%%DATADIR%%/modules/autoload/m_map.so -%%DATADIR%%/modules/autoload/m_monitor.so -%%DATADIR%%/modules/autoload/m_motd.so -%%DATADIR%%/modules/autoload/m_names.so -%%DATADIR%%/modules/autoload/m_oper.so -%%DATADIR%%/modules/autoload/m_operspy.so -%%DATADIR%%/modules/autoload/m_pass.so -%%DATADIR%%/modules/autoload/m_ping.so -%%DATADIR%%/modules/autoload/m_pong.so -%%DATADIR%%/modules/autoload/m_post.so -%%DATADIR%%/modules/autoload/m_privs.so -%%DATADIR%%/modules/autoload/m_rehash.so -%%DATADIR%%/modules/autoload/m_restart.so -%%DATADIR%%/modules/autoload/m_resv.so -%%DATADIR%%/modules/autoload/m_sasl.so -%%DATADIR%%/modules/autoload/m_scan.so -%%DATADIR%%/modules/autoload/m_services.so -%%DATADIR%%/modules/autoload/m_set.so -%%DATADIR%%/modules/autoload/m_signon.so -%%DATADIR%%/modules/autoload/m_snote.so -%%DATADIR%%/modules/autoload/m_stats.so -%%DATADIR%%/modules/autoload/m_svinfo.so -%%DATADIR%%/modules/autoload/m_tb.so -%%DATADIR%%/modules/autoload/m_testline.so -%%DATADIR%%/modules/autoload/m_testmask.so -%%DATADIR%%/modules/autoload/m_tginfo.so -%%DATADIR%%/modules/autoload/m_time.so -%%DATADIR%%/modules/autoload/m_topic.so -%%DATADIR%%/modules/autoload/m_trace.so -%%DATADIR%%/modules/autoload/m_unreject.so -%%DATADIR%%/modules/autoload/m_user.so -%%DATADIR%%/modules/autoload/m_userhost.so -%%DATADIR%%/modules/autoload/m_users.so -%%DATADIR%%/modules/autoload/m_version.so -%%DATADIR%%/modules/autoload/m_wallops.so -%%DATADIR%%/modules/autoload/m_who.so -%%DATADIR%%/modules/autoload/m_whois.so -%%DATADIR%%/modules/autoload/m_whowas.so -%%DATADIR%%/modules/autoload/m_xline.so -%%DATADIR%%/modules/autoload/sno_routing.so -%%DATADIR%%/modules/extensions/chm_adminonly.so -%%DATADIR%%/modules/extensions/chm_operonly.so -%%DATADIR%%/modules/extensions/chm_operonly_compat.so -%%DATADIR%%/modules/extensions/chm_quietunreg_compat.so -%%DATADIR%%/modules/extensions/chm_sslonly.so -%%DATADIR%%/modules/extensions/chm_sslonly_compat.so -%%DATADIR%%/modules/extensions/createauthonly.so -%%DATADIR%%/modules/extensions/createoperonly.so -%%DATADIR%%/modules/extensions/example_module.so -%%DATADIR%%/modules/extensions/extb_account.so -%%DATADIR%%/modules/extensions/extb_canjoin.so -%%DATADIR%%/modules/extensions/extb_channel.so -%%DATADIR%%/modules/extensions/extb_extgecos.so -%%DATADIR%%/modules/extensions/extb_oper.so -%%DATADIR%%/modules/extensions/extb_realname.so -%%DATADIR%%/modules/extensions/extb_server.so -%%DATADIR%%/modules/extensions/extb_ssl.so -%%DATADIR%%/modules/extensions/extb_usermode.so -%%DATADIR%%/modules/extensions/force_user_invis.so -%%DATADIR%%/modules/extensions/hurt.so -%%DATADIR%%/modules/extensions/ip_cloaking.so -%%DATADIR%%/modules/extensions/ip_cloaking_3.0.so -%%DATADIR%%/modules/extensions/ip_cloaking_4.0.so -%%DATADIR%%/modules/extensions/ip_cloaking_old.so -%%DATADIR%%/modules/extensions/m_42.so -%%DATADIR%%/modules/extensions/m_adminwall.so -%%DATADIR%%/modules/extensions/m_findforwards.so -%%DATADIR%%/modules/extensions/m_identify.so -%%DATADIR%%/modules/extensions/m_mkpasswd.so -%%DATADIR%%/modules/extensions/m_ojoin.so -%%DATADIR%%/modules/extensions/m_okick.so -%%DATADIR%%/modules/extensions/m_olist.so -%%DATADIR%%/modules/extensions/m_omode.so -%%DATADIR%%/modules/extensions/m_opme.so -%%DATADIR%%/modules/extensions/m_remove.so -%%DATADIR%%/modules/extensions/m_roleplay.so -%%DATADIR%%/modules/extensions/m_sendbans.so -%%DATADIR%%/modules/extensions/m_webirc.so -%%DATADIR%%/modules/extensions/no_locops.so -%%DATADIR%%/modules/extensions/no_oper_invis.so -%%DATADIR%%/modules/extensions/override.so -%%DATADIR%%/modules/extensions/sno_farconnect.so -%%DATADIR%%/modules/extensions/sno_globalkline.so -%%DATADIR%%/modules/extensions/sno_globaloper.so -%%DATADIR%%/modules/extensions/sno_whois.so -%%DATADIR%%/modules/extensions/spy_admin_notice.so -%%DATADIR%%/modules/extensions/spy_info_notice.so -%%DATADIR%%/modules/extensions/spy_links_notice.so -%%DATADIR%%/modules/extensions/spy_motd_notice.so -%%DATADIR%%/modules/extensions/spy_stats_notice.so -%%DATADIR%%/modules/extensions/spy_stats_p_notice.so -%%DATADIR%%/modules/extensions/spy_trace_notice.so -%%DATADIR%%/modules/m_ban.so -%%DATADIR%%/modules/m_die.so -%%DATADIR%%/modules/m_error.so -%%DATADIR%%/modules/m_join.so -%%DATADIR%%/modules/m_kick.so -%%DATADIR%%/modules/m_kill.so -%%DATADIR%%/modules/m_message.so -%%DATADIR%%/modules/m_mode.so -%%DATADIR%%/modules/m_nick.so -%%DATADIR%%/modules/m_part.so -%%DATADIR%%/modules/m_quit.so -%%DATADIR%%/modules/m_server.so -%%DATADIR%%/modules/m_squit.so @dir /var/log/charybdis @dir /var/db/charybdis +@dir /var/run/charybdis |