- Fixed CONFLICTS

- Tidy-up
- Improve config handling.

PR:		117549
Submitted by:	Lewis <moggie@elasticmind.net> (maintainer)

3 files changed, 27 insertions, 9 deletions

diff --git a/irc/ircd-ratbox-devel/Makefile b/irc/ircd-ratbox-devel/Makefile
index 68049714a6bb..07c2d753b6d1 100644
--- a/irc/ircd-ratbox-devel/Makefile
+++ b/irc/ircd-ratbox-devel/Makefile
@@ -8,16 +8,18 @@
 
 PORTNAME=	ircd-ratbox
 PORTVERSION=	2.2.6
+PORTREVISION=	1
 CATEGORIES=	irc ipv6
 MASTER_SITES=	ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/		\
 		ftp://ftp.demon.co.uk/pub/mirrors/ircd-ratbox/		\
 		http://www.ircd-ratbox.org/download/			\
-		ftp://ftp.parodius.com/pub/ircd-ratbox/
+		ftp://ftp.parodius.com/pub/ircd-ratbox/			\
+		http://www.ircd-ratbox.org/download/old/
 PKGNAMESUFFIX=	-devel
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	moggie@elasticmind.net
-COMMENT=	An advanced, stable IRC daemon, used on many EFnet servers ('testing' release)
+COMMENT=	Advanced, stable IRC daemon, used widely on EFnet ('testing' release)
 
 CONFLICTS=	ircd-ratbox-[0-9]*
 
@@ -138,6 +140,16 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/example.conf ${PREFIX}/etc/${PORTNAME}/ircd.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/doc/example.efnet.conf ${PREFIX}/etc/${PORTNAME}/ircd-efnet.conf.sample
 
+	@if [ ! -f ${PREFIX}/etc/${PORTNAME}/ircd.conf ]; then \
+		${ECHO} "Installing default configuration file."; \
+		${CP} -p ${PREFIX}/etc/${PORTNAME}/ircd.conf.sample ${PREFIX}/etc/${PORTNAME}/ircd.conf ; \
+	fi
+
+	@if [ ! -f ${PREFIX}/etc/${PORTNAME}/ircd.motd ]; then \
+		${ECHO} "Installing default motd file."; \
+		${CP} -p ${PREFIX}/etc/${PORTNAME}/ircd.motd.sample ${PREFIX}/etc/${PORTNAME}/ircd.motd ; \
+	fi
+
 	@${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/irc/ircd-ratbox-devel/files/pkg-message.in b/irc/ircd-ratbox-devel/files/pkg-message.in
index 7f942cabc92a..9b7506da1667 100644
--- a/irc/ircd-ratbox-devel/files/pkg-message.in
+++ b/irc/ircd-ratbox-devel/files/pkg-message.in
@@ -1,9 +1,11 @@
 ------------------------------------------------------------------------
 ircd-ratbox has been successfully installed.
 
-You should now copy %%PREFIX%%/etc/ircd-ratbox/ircd.conf.sample to
-%%PREFIX%%/etc/ircd-ratbox/ircd.conf, and edit it as per the ratbox
-documentation. This file is required to start the server.
+Sample 'ircd.conf' and 'ircd.motd' files have been created in the
+ircd-ratbox configuration directory. A sample configuration file is
+included for EFNet-like configurations that can be used instead. You
+should now edit these files as per the ratbox documentation.
+A configured ircd.conf file is required to start the server.
 
 Once you have added ircd_ratbox_enable="YES" to /etc/rc.conf, the
 server can be started by running:
diff --git a/irc/ircd-ratbox-devel/pkg-plist b/irc/ircd-ratbox-devel/pkg-plist
index 5aa61ac316cc..19f94e7b079f 100644
--- a/irc/ircd-ratbox-devel/pkg-plist
+++ b/irc/ircd-ratbox-devel/pkg-plist
@@ -7,8 +7,6 @@ bin/viconf
 bin/viklines
 bin/vimotd
 etc/ircd-ratbox/ircd-efnet.conf.sample
-etc/ircd-ratbox/ircd.conf.sample
-etc/ircd-ratbox/ircd.motd.sample
 lib/ircd-ratbox/modules/autoload/m_accept.so
 lib/ircd-ratbox/modules/autoload/m_admin.so
 lib/ircd-ratbox/modules/autoload/m_away.so
@@ -232,6 +230,12 @@ lib/ircd-ratbox/modules/m_squit.so
 @unexec f="%D/etc/ircd-ratbox/kline.conf"; if [ ! -s "$f" ]; then rm -f "$f"; fi
 @unexec f="%D/etc/ircd-ratbox/resv.conf";  if [ ! -s "$f" ]; then rm -f "$f"; fi
 @unexec f="%D/etc/ircd-ratbox/xline.conf"; if [ ! -s "$f" ]; then rm -f "$f"; fi
+@unexec if cmp -s %D/etc/ircd-ratbox/ircd.conf.sample %D/etc/ircd-ratbox/ircd.conf; then rm -f %D/etc/ircd-ratbox/ircd.conf; fi
+etc/ircd-ratbox/ircd.conf.sample
+@exec if [ ! -f %D/etc/ircd-ratbox/ircd.conf ] ; then cp -p %D/%F %B/ircd.conf; fi
+@unexec if cmp -s %D/etc/ircd-ratbox/ircd.motd.sample %D/etc/ircd-ratbox/ircd.motd; then rm -f %D/etc/ircd-ratbox/ircd.motd; fi
+etc/ircd-ratbox/ircd.motd.sample
+@exec if [ ! -f %D/etc/ircd-ratbox/ircd.motd ] ; then cp -p %D/%F %B/ircd.motd; fi
 @dirrmtry etc/ircd-ratbox
-@unexec rmdir %%LOGDIR%% 2>/dev/null || true
-@unexec rmdir %%RUNDIR%% 2>/dev/null || true
+@dirrmtry %%LOGDIR%%
+@dirrmtry %%RUNDIR%%