2 files changed, 199 insertions, 194 deletions

diff --git a/irc/dancer-services/Makefile b/irc/dancer-services/Makefile
index 556126cf1534..78a0cae2a38a 100644
--- a/irc/dancer-services/Makefile
+++ b/irc/dancer-services/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dancer-services
 PORTVERSION=	1.8.0.6.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc
 MASTER_SITES=	http://www.doc.ic.ac.uk/~aps100/dancer/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,7 +22,7 @@ GNU_CONFIGURE=	yes
 
 MAKE_ARGS=	BINDIR=${PREFIX}/sbin \
 		CONFDIR=${PREFIX}/etc/dancer-services \
-		HELPDIR=${PREFIX}/share/dancer-services \
+		HELPDIR=${PREFIX}/share/dancer-services/help \
 		WHOAMI=root
 
 .if !defined(PACKAGE_BUILDING) && !defined(BATCH)
@@ -35,15 +35,16 @@ post-patch:
 		${WRKSRC}/bin/settings.conf.in
 
 pre-install:
+	${MKDIR} ${PREFIX}/share/dancer-services
 .if !defined(PACKAGE_BUILDING) && !defined(BATCH)
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 .endif
 
 post-install:
 	${FIND} ${PREFIX}/share/dancer-services -type d -print0 | \
-		${XARGS} -0 ${CHMOD} -R 755
+		${XARGS} -0 ${CHMOD} 755
 	${FIND} ${PREFIX}/share/dancer-services -type f -print0 | \
-		${XARGS} -0 ${CHMOD} -R ${SHAREMODE}
+		${XARGS} -0 ${CHMOD} ${SHAREMODE}
 	${INSTALL} -d -m 700 -o ircservices -g ircservices \
 		/var/log/dancer-services \
 		/var/run/dancer-services
@@ -56,7 +57,10 @@ post-install:
 		${CP} ${PREFIX}/etc/dancer-services/${f}.sample ${PREFIX}/etc/dancer-services/${f}; \
 	fi
 .endfor
-	${CHMOD} -R ${SHAREMODE} ${PREFIX}/etc/dancer-services
+	${FIND} ${PREFIX}/etc/dancer-services -type d -print0 | \
+		${XARGS} -0 ${CHMOD} 700
+	${FIND} ${PREFIX}/etc/dancer-services -type f -print0 | \
+		${XARGS} -0 ${CHMOD} 600
 	${CHOWN} -R ircservices:ircservices ${PREFIX}/etc/dancer-services
 	${SED} -e "s,%PREFIX%,${PREFIX},g" ${FILESDIR}/dancer-services.sh \
 		> ${WRKDIR}/dancer-services.sh
diff --git a/irc/dancer-services/pkg-plist b/irc/dancer-services/pkg-plist
index b8a4bf0b274d..d810abbea074 100644
--- a/irc/dancer-services/pkg-plist
+++ b/irc/dancer-services/pkg-plist
@@ -30,195 +30,196 @@ etc/dancer-services/settings.conf.sample
 etc/rc.d/dancer-services.sh
 @exec install -d -o ircd -g ircd -m 700 /var/log/dancer-services /var/run/dancer-services
 @unexec rmdir %D/etc/dancer-services /var/log/dancer-services /var/run/dancer-services 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/etc/dancer-services /var/log/dancer-services /var/run/dancer-services`` to remove any configuration files and log files left." | fmt
-share/dancer-services/chanserv/access/add
-share/dancer-services/chanserv/access/del
-share/dancer-services/chanserv/access/index
-share/dancer-services/chanserv/access/list
-share/dancer-services/chanserv/akick/add
-share/dancer-services/chanserv/akick/del
-share/dancer-services/chanserv/akick/index
-share/dancer-services/chanserv/akick/list
-share/dancer-services/chanserv/autorem/add
-share/dancer-services/chanserv/autorem/del
-share/dancer-services/chanserv/autorem/index
-share/dancer-services/chanserv/autorem/list
-share/dancer-services/chanserv/clear
-share/dancer-services/chanserv/clearnoexp
-share/dancer-services/chanserv/drop
-share/dancer-services/chanserv/forbid
-share/dancer-services/chanserv/forget
-share/dancer-services/chanserv/identify
-share/dancer-services/chanserv/index
-share/dancer-services/chanserv/info
-share/dancer-services/chanserv/invite
-share/dancer-services/chanserv/level/index
-share/dancer-services/chanserv/level/list
-share/dancer-services/chanserv/level/reset
-share/dancer-services/chanserv/level/set
-share/dancer-services/chanserv/list
-share/dancer-services/chanserv/noexpire
-share/dancer-services/chanserv/op
-share/dancer-services/chanserv/register
-share/dancer-services/chanserv/resetlevels
-share/dancer-services/chanserv/set/email
-share/dancer-services/chanserv/set/entrymsg
-share/dancer-services/chanserv/set/forget
-share/dancer-services/chanserv/set/founder
-share/dancer-services/chanserv/set/guard
-share/dancer-services/chanserv/set/index
-share/dancer-services/chanserv/set/mlock
-share/dancer-services/chanserv/set/password
-share/dancer-services/chanserv/set/private
-share/dancer-services/chanserv/set/restricted
-share/dancer-services/chanserv/set/secure
-share/dancer-services/chanserv/set/secureops
-share/dancer-services/chanserv/set/splitops
-share/dancer-services/chanserv/set/successor
-share/dancer-services/chanserv/set/topiclock
-share/dancer-services/chanserv/set/url
-share/dancer-services/chanserv/set/verbose
-share/dancer-services/chanserv/setpass
-share/dancer-services/chanserv/status
-share/dancer-services/chanserv/unban
-share/dancer-services/chanserv/unforbid
-share/dancer-services/chanserv/voice
-share/dancer-services/global/gchannote
-share/dancer-services/global/gcmemo
-share/dancer-services/global/gmemo
-share/dancer-services/global/gnote
-share/dancer-services/global/index
-share/dancer-services/global/motd
-share/dancer-services/helpserv/chanserv
-share/dancer-services/helpserv/index
-share/dancer-services/helpserv/memoserv
-share/dancer-services/helpserv/nickserv
-share/dancer-services/helpserv/operserv
-share/dancer-services/helpserv/statserv
-share/dancer-services/memoserv/del
-share/dancer-services/memoserv/forward
-share/dancer-services/memoserv/index
-share/dancer-services/memoserv/list
-share/dancer-services/memoserv/purge
-share/dancer-services/memoserv/read
-share/dancer-services/memoserv/reply
-share/dancer-services/memoserv/send
-share/dancer-services/memoserv/undel
-share/dancer-services/nickserv/access/add
-share/dancer-services/nickserv/access/del
-share/dancer-services/nickserv/access/index
-share/dancer-services/nickserv/access/list
-share/dancer-services/nickserv/collide
-share/dancer-services/nickserv/drop
-share/dancer-services/nickserv/droplink
-share/dancer-services/nickserv/flag
-share/dancer-services/nickserv/forbid
-share/dancer-services/nickserv/ghost
-share/dancer-services/nickserv/identify
-share/dancer-services/nickserv/index
-share/dancer-services/nickserv/info
-share/dancer-services/nickserv/link
-share/dancer-services/nickserv/list
-share/dancer-services/nickserv/noexpire
-share/dancer-services/nickserv/recover
-share/dancer-services/nickserv/register
-share/dancer-services/nickserv/release
-share/dancer-services/nickserv/set/automask
-share/dancer-services/nickserv/set/email
-share/dancer-services/nickserv/set/gsm
-share/dancer-services/nickserv/set/hide
-share/dancer-services/nickserv/set/index
-share/dancer-services/nickserv/set/kill
-share/dancer-services/nickserv/set/master
-share/dancer-services/nickserv/set/memos
-share/dancer-services/nickserv/set/notify
-share/dancer-services/nickserv/set/oper
-share/dancer-services/nickserv/set/password
-share/dancer-services/nickserv/set/phone
-share/dancer-services/nickserv/set/private
-share/dancer-services/nickserv/set/secure
-share/dancer-services/nickserv/set/signon
-share/dancer-services/nickserv/set/uin
-share/dancer-services/nickserv/set/unsecure
-share/dancer-services/nickserv/set/url
-share/dancer-services/nickserv/setpass
-share/dancer-services/nickserv/showlink
-share/dancer-services/nickserv/unforbid
-share/dancer-services/nickserv/unlink
-share/dancer-services/operserv/channel
-share/dancer-services/operserv/clones
-share/dancer-services/operserv/dcc/boot
-share/dancer-services/operserv/dcc/index
-share/dancer-services/operserv/dcc/link
-share/dancer-services/operserv/dcc/motd
-share/dancer-services/operserv/dcc/quit
-share/dancer-services/operserv/dcc/unlink
-share/dancer-services/operserv/dcc/who
-share/dancer-services/operserv/die
-share/dancer-services/operserv/dump
-share/dancer-services/operserv/floodoff
-share/dancer-services/operserv/gline
-share/dancer-services/operserv/help
-share/dancer-services/operserv/htm
-share/dancer-services/operserv/hub
-share/dancer-services/operserv/identify
-share/dancer-services/operserv/ignore
-share/dancer-services/operserv/index
-share/dancer-services/operserv/join
-share/dancer-services/operserv/jump
-share/dancer-services/operserv/jupe
-share/dancer-services/operserv/kill
-share/dancer-services/operserv/killchan
-share/dancer-services/operserv/killhost
-share/dancer-services/operserv/kline
-share/dancer-services/operserv/off
-share/dancer-services/operserv/omode
-share/dancer-services/operserv/on
-share/dancer-services/operserv/part
-share/dancer-services/operserv/rehash
-share/dancer-services/operserv/reload
-share/dancer-services/operserv/restart
-share/dancer-services/operserv/save
-share/dancer-services/operserv/secure
-share/dancer-services/operserv/set
-share/dancer-services/operserv/stats
-share/dancer-services/operserv/status
-share/dancer-services/operserv/trace
-share/dancer-services/operserv/umode
-share/dancer-services/operserv/ungline
-share/dancer-services/operserv/unjupe
-share/dancer-services/seenserv/index
-share/dancer-services/seenserv/seen
-share/dancer-services/seenserv/seennick
-share/dancer-services/seenserv/seenstat
-share/dancer-services/seenserv/unseen
-share/dancer-services/statserv/clearstats
-share/dancer-services/statserv/domain
-share/dancer-services/statserv/greplog
-share/dancer-services/statserv/host
-share/dancer-services/statserv/index
-share/dancer-services/statserv/refresh
-share/dancer-services/statserv/server
-share/dancer-services/statserv/showadmins
-share/dancer-services/statserv/showopers
-share/dancer-services/statserv/showstats
-share/dancer-services/statserv/split
-share/dancer-services/statserv/stats
-@dirrm share/dancer-services/statserv
-@dirrm share/dancer-services/seenserv
-@dirrm share/dancer-services/operserv/dcc
-@dirrm share/dancer-services/operserv
-@dirrm share/dancer-services/nickserv/set
-@dirrm share/dancer-services/nickserv/access
-@dirrm share/dancer-services/nickserv
-@dirrm share/dancer-services/memoserv
-@dirrm share/dancer-services/helpserv
-@dirrm share/dancer-services/global
-@dirrm share/dancer-services/chanserv/set
-@dirrm share/dancer-services/chanserv/level
-@dirrm share/dancer-services/chanserv/autorem
-@dirrm share/dancer-services/chanserv/akick
-@dirrm share/dancer-services/chanserv/access
-@dirrm share/dancer-services/chanserv
+share/dancer-services/help/chanserv/access/add
+share/dancer-services/help/chanserv/access/del
+share/dancer-services/help/chanserv/access/index
+share/dancer-services/help/chanserv/access/list
+share/dancer-services/help/chanserv/akick/add
+share/dancer-services/help/chanserv/akick/del
+share/dancer-services/help/chanserv/akick/index
+share/dancer-services/help/chanserv/akick/list
+share/dancer-services/help/chanserv/autorem/add
+share/dancer-services/help/chanserv/autorem/del
+share/dancer-services/help/chanserv/autorem/index
+share/dancer-services/help/chanserv/autorem/list
+share/dancer-services/help/chanserv/clear
+share/dancer-services/help/chanserv/clearnoexp
+share/dancer-services/help/chanserv/drop
+share/dancer-services/help/chanserv/forbid
+share/dancer-services/help/chanserv/forget
+share/dancer-services/help/chanserv/identify
+share/dancer-services/help/chanserv/index
+share/dancer-services/help/chanserv/info
+share/dancer-services/help/chanserv/invite
+share/dancer-services/help/chanserv/level/index
+share/dancer-services/help/chanserv/level/list
+share/dancer-services/help/chanserv/level/reset
+share/dancer-services/help/chanserv/level/set
+share/dancer-services/help/chanserv/list
+share/dancer-services/help/chanserv/noexpire
+share/dancer-services/help/chanserv/op
+share/dancer-services/help/chanserv/register
+share/dancer-services/help/chanserv/resetlevels
+share/dancer-services/help/chanserv/set/email
+share/dancer-services/help/chanserv/set/entrymsg
+share/dancer-services/help/chanserv/set/forget
+share/dancer-services/help/chanserv/set/founder
+share/dancer-services/help/chanserv/set/guard
+share/dancer-services/help/chanserv/set/index
+share/dancer-services/help/chanserv/set/mlock
+share/dancer-services/help/chanserv/set/password
+share/dancer-services/help/chanserv/set/private
+share/dancer-services/help/chanserv/set/restricted
+share/dancer-services/help/chanserv/set/secure
+share/dancer-services/help/chanserv/set/secureops
+share/dancer-services/help/chanserv/set/splitops
+share/dancer-services/help/chanserv/set/successor
+share/dancer-services/help/chanserv/set/topiclock
+share/dancer-services/help/chanserv/set/url
+share/dancer-services/help/chanserv/set/verbose
+share/dancer-services/help/chanserv/setpass
+share/dancer-services/help/chanserv/status
+share/dancer-services/help/chanserv/unban
+share/dancer-services/help/chanserv/unforbid
+share/dancer-services/help/chanserv/voice
+share/dancer-services/help/global/gchannote
+share/dancer-services/help/global/gcmemo
+share/dancer-services/help/global/gmemo
+share/dancer-services/help/global/gnote
+share/dancer-services/help/global/index
+share/dancer-services/help/global/motd
+share/dancer-services/help/helpserv/chanserv
+share/dancer-services/help/helpserv/index
+share/dancer-services/help/helpserv/memoserv
+share/dancer-services/help/helpserv/nickserv
+share/dancer-services/help/helpserv/operserv
+share/dancer-services/help/helpserv/statserv
+share/dancer-services/help/memoserv/del
+share/dancer-services/help/memoserv/forward
+share/dancer-services/help/memoserv/index
+share/dancer-services/help/memoserv/list
+share/dancer-services/help/memoserv/purge
+share/dancer-services/help/memoserv/read
+share/dancer-services/help/memoserv/reply
+share/dancer-services/help/memoserv/send
+share/dancer-services/help/memoserv/undel
+share/dancer-services/help/nickserv/access/add
+share/dancer-services/help/nickserv/access/del
+share/dancer-services/help/nickserv/access/index
+share/dancer-services/help/nickserv/access/list
+share/dancer-services/help/nickserv/collide
+share/dancer-services/help/nickserv/drop
+share/dancer-services/help/nickserv/droplink
+share/dancer-services/help/nickserv/flag
+share/dancer-services/help/nickserv/forbid
+share/dancer-services/help/nickserv/ghost
+share/dancer-services/help/nickserv/identify
+share/dancer-services/help/nickserv/index
+share/dancer-services/help/nickserv/info
+share/dancer-services/help/nickserv/link
+share/dancer-services/help/nickserv/list
+share/dancer-services/help/nickserv/noexpire
+share/dancer-services/help/nickserv/recover
+share/dancer-services/help/nickserv/register
+share/dancer-services/help/nickserv/release
+share/dancer-services/help/nickserv/set/automask
+share/dancer-services/help/nickserv/set/email
+share/dancer-services/help/nickserv/set/gsm
+share/dancer-services/help/nickserv/set/hide
+share/dancer-services/help/nickserv/set/index
+share/dancer-services/help/nickserv/set/kill
+share/dancer-services/help/nickserv/set/master
+share/dancer-services/help/nickserv/set/memos
+share/dancer-services/help/nickserv/set/notify
+share/dancer-services/help/nickserv/set/oper
+share/dancer-services/help/nickserv/set/password
+share/dancer-services/help/nickserv/set/phone
+share/dancer-services/help/nickserv/set/private
+share/dancer-services/help/nickserv/set/secure
+share/dancer-services/help/nickserv/set/signon
+share/dancer-services/help/nickserv/set/uin
+share/dancer-services/help/nickserv/set/unsecure
+share/dancer-services/help/nickserv/set/url
+share/dancer-services/help/nickserv/setpass
+share/dancer-services/help/nickserv/showlink
+share/dancer-services/help/nickserv/unforbid
+share/dancer-services/help/nickserv/unlink
+share/dancer-services/help/operserv/channel
+share/dancer-services/help/operserv/clones
+share/dancer-services/help/operserv/dcc/boot
+share/dancer-services/help/operserv/dcc/index
+share/dancer-services/help/operserv/dcc/link
+share/dancer-services/help/operserv/dcc/motd
+share/dancer-services/help/operserv/dcc/quit
+share/dancer-services/help/operserv/dcc/unlink
+share/dancer-services/help/operserv/dcc/who
+share/dancer-services/help/operserv/die
+share/dancer-services/help/operserv/dump
+share/dancer-services/help/operserv/floodoff
+share/dancer-services/help/operserv/gline
+share/dancer-services/help/operserv/help
+share/dancer-services/help/operserv/htm
+share/dancer-services/help/operserv/hub
+share/dancer-services/help/operserv/identify
+share/dancer-services/help/operserv/ignore
+share/dancer-services/help/operserv/index
+share/dancer-services/help/operserv/join
+share/dancer-services/help/operserv/jump
+share/dancer-services/help/operserv/jupe
+share/dancer-services/help/operserv/kill
+share/dancer-services/help/operserv/killchan
+share/dancer-services/help/operserv/killhost
+share/dancer-services/help/operserv/kline
+share/dancer-services/help/operserv/off
+share/dancer-services/help/operserv/omode
+share/dancer-services/help/operserv/on
+share/dancer-services/help/operserv/part
+share/dancer-services/help/operserv/rehash
+share/dancer-services/help/operserv/reload
+share/dancer-services/help/operserv/restart
+share/dancer-services/help/operserv/save
+share/dancer-services/help/operserv/secure
+share/dancer-services/help/operserv/set
+share/dancer-services/help/operserv/stats
+share/dancer-services/help/operserv/status
+share/dancer-services/help/operserv/trace
+share/dancer-services/help/operserv/umode
+share/dancer-services/help/operserv/ungline
+share/dancer-services/help/operserv/unjupe
+share/dancer-services/help/seenserv/index
+share/dancer-services/help/seenserv/seen
+share/dancer-services/help/seenserv/seennick
+share/dancer-services/help/seenserv/seenstat
+share/dancer-services/help/seenserv/unseen
+share/dancer-services/help/statserv/clearstats
+share/dancer-services/help/statserv/domain
+share/dancer-services/help/statserv/greplog
+share/dancer-services/help/statserv/host
+share/dancer-services/help/statserv/index
+share/dancer-services/help/statserv/refresh
+share/dancer-services/help/statserv/server
+share/dancer-services/help/statserv/showadmins
+share/dancer-services/help/statserv/showopers
+share/dancer-services/help/statserv/showstats
+share/dancer-services/help/statserv/split
+share/dancer-services/help/statserv/stats
+@dirrm share/dancer-services/help/statserv
+@dirrm share/dancer-services/help/seenserv
+@dirrm share/dancer-services/help/operserv/dcc
+@dirrm share/dancer-services/help/operserv
+@dirrm share/dancer-services/help/nickserv/set
+@dirrm share/dancer-services/help/nickserv/access
+@dirrm share/dancer-services/help/nickserv
+@dirrm share/dancer-services/help/memoserv
+@dirrm share/dancer-services/help/helpserv
+@dirrm share/dancer-services/help/global
+@dirrm share/dancer-services/help/chanserv/set
+@dirrm share/dancer-services/help/chanserv/level
+@dirrm share/dancer-services/help/chanserv/autorem
+@dirrm share/dancer-services/help/chanserv/akick
+@dirrm share/dancer-services/help/chanserv/access
+@dirrm share/dancer-services/help/chanserv
+@dirrm share/dancer-services/help
 @dirrm share/dancer-services
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.dancer