svn commit: r404751 - in head/irc/inspircd: . files

[Mark Felder]

Author: feld
Date: Tue Dec 29 15:28:46 2015
New Revision: 404751
URL: https://svnweb.freebsd.org/changeset/ports/404751

Log:
  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.
  
  MFH:		2015Q4
  Security:	b808c3a8-ae30-11e5-b864-14dae9d210b8

Modified:
  head/irc/inspircd/Makefile
  head/irc/inspircd/distinfo
  head/irc/inspircd/files/inspircd.in
  head/irc/inspircd/pkg-plist

Modified: head/irc/inspircd/Makefile
==============================================================================
--- head/irc/inspircd/Makefile	Tue Dec 29 15:16:21 2015	(r404750)
+++ head/irc/inspircd/Makefile	Tue Dec 29 15:28:46 2015	(r404751)
@@ -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 at 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

Modified: head/irc/inspircd/distinfo
==============================================================================
--- head/irc/inspircd/distinfo	Tue Dec 29 15:16:21 2015	(r404750)
+++ head/irc/inspircd/distinfo	Tue Dec 29 15:28:46 2015	(r404751)
@@ -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

Modified: head/irc/inspircd/files/inspircd.in
==============================================================================
--- head/irc/inspircd/files/inspircd.in	Tue Dec 29 15:16:21 2015	(r404750)
+++ head/irc/inspircd/files/inspircd.in	Tue Dec 29 15:28:46 2015	(r404751)
@@ -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()
 {

Modified: head/irc/inspircd/pkg-plist
==============================================================================
--- head/irc/inspircd/pkg-plist	Tue Dec 29 15:16:21 2015	(r404750)
+++ head/irc/inspircd/pkg-plist	Tue Dec 29 15:28:46 2015	(r404751)
@@ -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