From 66332bd6ad90456b55b21441983c21690ae0646e Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Tue, 9 Mar 2010 22:43:15 +0000
Subject: [PATCH] - Update to 1.2.2

PR:		143953
Submitted by:	moggie <"moggie atelasticmind.net"@elasticmind.net> (maintainer)
---
 irc/ratbox-services/Makefile             |  3 +--
 irc/ratbox-services/distinfo             |  6 +++---
 irc/ratbox-services/files/pkg-install.in | 12 ++++++++----
 irc/ratbox-services/files/pkg-message.in |  8 ++++----
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/irc/ratbox-services/Makefile b/irc/ratbox-services/Makefile
index 02edf38cc5ad..ae2c35499f46 100644
--- a/irc/ratbox-services/Makefile
+++ b/irc/ratbox-services/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	ratbox-services
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.2.2
 CATEGORIES=	irc
 MASTER_SITES=	ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/${PORTNAME}/	\
 		ftp://ftp.demon.co.uk/pub/mirrors/ircd-ratbox/${PORTNAME}/ \
diff --git a/irc/ratbox-services/distinfo b/irc/ratbox-services/distinfo
index 1887aec85250..dbc61c89caff 100644
--- a/irc/ratbox-services/distinfo
+++ b/irc/ratbox-services/distinfo
@@ -1,3 +1,3 @@
-MD5 (ratbox-services-1.2.1.tgz) = 2db526a3d42bfdccf150666ffb335283
-SHA256 (ratbox-services-1.2.1.tgz) = 1753ecfe40938ea4f3761bb6131f5b88674c96d03db44bab1e5282909faf6b03
-SIZE (ratbox-services-1.2.1.tgz) = 2000652
+MD5 (ratbox-services-1.2.2.tgz) = b7524738f0e7ff4a3ae9f2015231a87a
+SHA256 (ratbox-services-1.2.2.tgz) = 587ad0eecd130b2fb214384fa37beb43de5e31b40ed56371fbf25c1263d715bd
+SIZE (ratbox-services-1.2.2.tgz) = 2010045
diff --git a/irc/ratbox-services/files/pkg-install.in b/irc/ratbox-services/files/pkg-install.in
index f7a260249d5f..7003b0b790fa 100644
--- a/irc/ratbox-services/files/pkg-install.in
+++ b/irc/ratbox-services/files/pkg-install.in
@@ -106,10 +106,14 @@ mkdir -p %%DBDIR%%				\
 && chmod 750 %%DBDIR%%
 
 # Secure permissions if we think this is a fresh install
-
-if [ ! -f ${PKG_PREFIX}/ratbox-services.conf ]; then
-	chown ircservices:ircservices ${PKG_PREFIX}/etc/ratbox-services.conf.sample
-	chmod 640 ${PKG_PREFIX}/etc/ratbox-services.conf.sample
+conffile="%%PREFIX%%/etc/ratbox-services.conf"
+samplefile="%%PREFIX%%/etc/ratbox-services.conf.sample"
+if cmp -s $conffile $samplefile; then
+        echo "Setting permissions for config file."
+        chown ircservices:ircservices $conffile
+        chmod 640 $conffile
+else
+        echo "Modified ratbox-services.conf file found, skipping perms setting."
 fi
 
 cd %%DATADIR%%	\
diff --git a/irc/ratbox-services/files/pkg-message.in b/irc/ratbox-services/files/pkg-message.in
index f51cba7780a5..532d32426a78 100644
--- a/irc/ratbox-services/files/pkg-message.in
+++ b/irc/ratbox-services/files/pkg-message.in
@@ -46,12 +46,12 @@ server can be started by running:
 
 Important UPGRADE Note:
 -----------------------
-Upgrading to this current release will require modifications to the
-services configuration file and database so everything doesn't break.
-You must check the example configuration file and read the UPDATING docs
+Upgrading from 1.1.x to this current release will require modifications to
+the services configuration file and database so everything doesn't break.
+You must check the example configuration file and read the UPGRADING docs
 for information on how to do this before starting services.
 
-	%%DOCSDIR%%/UPDATING
+	%%DOCSDIR%%/UPGRADING
 
 Common database update tools and scripts referenced in ratbox-services
 documentation can be found in: