aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2015-12-29 15:30:59 +0000
committerMark Felder <feld@FreeBSD.org>2015-12-29 15:30:59 +0000
commit6f88241a3fab33b831cc2bc1c13b5627a7561f23 (patch)
treec0db2f9ede0fa1e5140dc72f36adb332ffe24279
parent6d60201519b35447c6bab8449989677f11c50dc3 (diff)
downloadports-6f88241a3fab33b831cc2bc1c13b5627a7561f23.tar.gz
ports-6f88241a3fab33b831cc2bc1c13b5627a7561f23.zip
MFH: r404751
irc/inspircd: Update to 2.0.20 Fix default config file path to sample configs and add rc script chdir so these relative paths work. This makes it easier to get a new install up and running. Security: b808c3a8-ae30-11e5-b864-14dae9d210b8 Approved by: ports-secteam (with hat)
Notes
Notes: svn path=/branches/2015Q4/; revision=404752
-rw-r--r--irc/inspircd/Makefile5
-rw-r--r--irc/inspircd/distinfo4
-rw-r--r--irc/inspircd/files/inspircd.in4
-rw-r--r--irc/inspircd/pkg-plist2
4 files changed, 8 insertions, 7 deletions
diff --git a/irc/inspircd/Makefile b/irc/inspircd/Makefile
index 6c8427b55534..e29561f2972b 100644
--- a/irc/inspircd/Makefile
+++ b/irc/inspircd/Makefile
@@ -2,9 +2,9 @@
# $FreeBSD$
PORTNAME= inspircd
-PORTVERSION= 2.0.18
+PORTVERSION= 2.0.20
DISTVERSIONPREFIX= v
-PORTREVISION= 2
+PORTREVISION= 0
CATEGORIES= irc
MAINTAINER= feld@FreeBSD.org
@@ -145,6 +145,7 @@ pre-configure:
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
diff --git a/irc/inspircd/distinfo b/irc/inspircd/distinfo
index e0ee8ce869e3..55ae6ce28cd3 100644
--- a/irc/inspircd/distinfo
+++ b/irc/inspircd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (inspircd-inspircd-v2.0.18_GH0.tar.gz) = 45168ed075e66b379cdb9bae01652a23a33304817363e519fcbb1a194783295d
-SIZE (inspircd-inspircd-v2.0.18_GH0.tar.gz) = 747846
+SHA256 (inspircd-inspircd-v2.0.20_GH0.tar.gz) = 5156e2da5da4cfa377705ecd633aee41cdcd785d12627497d55cab5f70dd686f
+SIZE (inspircd-inspircd-v2.0.20_GH0.tar.gz) = 728970
diff --git a/irc/inspircd/files/inspircd.in b/irc/inspircd/files/inspircd.in
index 50d9a502cdd1..71cb5fdf584e 100644
--- a/irc/inspircd/files/inspircd.in
+++ b/irc/inspircd/files/inspircd.in
@@ -38,14 +38,16 @@ load_rc_config ${name}
: ${inspircd_data=/var/db/inspircd}
: ${inspircd_logfile="%%INSPIRCD_LOG%%"}
: ${inspircd_flags="${inspircd_flags} --logfile ${inspircd_logfile} --config ${inspircd_config}"}
+: ${inspircd_chdir="%%ETCDIR%%"}
command=/usr/sbin/daemon
command_args=" -f %%PREFIX%%/bin/inspircd --nofork ${inspircd_flags}"
procname=%%PREFIX%%/bin/inspircd
pidfile=${inspircd_pidfile}
required_files=${inspircd_config}
+configtest_cmd=inspircd_configtest
start_precmd=inspircd_prestart
-extra_commands=reload
+extra_commands="reload status"
inspircd_prestart()
{
diff --git a/irc/inspircd/pkg-plist b/irc/inspircd/pkg-plist
index 32e0da379972..de8a713e74f2 100644
--- a/irc/inspircd/pkg-plist
+++ b/irc/inspircd/pkg-plist
@@ -1,8 +1,6 @@
bin/inspircd
%%ETCDIR%%/examples/aliases/anope.conf.example
%%ETCDIR%%/examples/aliases/atheme.conf.example
-%%ETCDIR%%/examples/aliases/ircservices.conf.example
-%%ETCDIR%%/examples/aliases/neostats.conf.example
%%ETCDIR%%/examples/censor.conf.example
%%ETCDIR%%/examples/filter.conf.example
%%ETCDIR%%/examples/helpop-full.conf.example