- Update to 3.0.4

- Fix post-install permissions check

PR:		ports/134972
Submitted by:	Lewis <moggie AT elasticmind.net> (maintainer)
Approved by:	miwi (mentor, implicit)

3 files changed, 13 insertions, 10 deletions

diff --git a/irc/ircd-ratbox-devel/Makefile b/irc/ircd-ratbox-devel/Makefile
index f509c32e7e41..6b990469eb65 100644
--- a/irc/ircd-ratbox-devel/Makefile
+++ b/irc/ircd-ratbox-devel/Makefile
@@ -7,7 +7,7 @@
 # ex: ts=8
 
 PORTNAME=	ircd-ratbox
-PORTVERSION=	3.0.2
+PORTVERSION=	3.0.4
 CATEGORIES=	irc ipv6
 MASTER_SITES=	ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/testing/	\
 		ftp://ftp.demon.co.uk/pub/mirrors/ircd-ratbox/testing/	\
@@ -188,9 +188,9 @@ post-build:
 
 pre-su-install:
 	@${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-	${MKDIR}  ${PREFIX}/etc/${PORTNAME}
-	${MKDIR}  ${DATADIR}/help
-	${MKDIR}  ${PREFIX}/lib/${PORTNAME}/modules
+	${MKDIR} ${PREFIX}/etc/${PORTNAME}
+	${MKDIR} ${DATADIR}/help
+	${MKDIR} ${PREFIX}/lib/${PORTNAME}/modules
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/irc/ircd-ratbox-devel/distinfo b/irc/ircd-ratbox-devel/distinfo
index 8b0e0675a8e5..3346b1f0182b 100644
--- a/irc/ircd-ratbox-devel/distinfo
+++ b/irc/ircd-ratbox-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (ircd-ratbox-3.0.2.tar.bz2) = 277c952ed96cbd8e1c11a813e64b7eed
-SHA256 (ircd-ratbox-3.0.2.tar.bz2) = d2f5b93f59ad46d483e646bf0bac3bcb69b14b4ad21ff9e20b1f76060b288067
-SIZE (ircd-ratbox-3.0.2.tar.bz2) = 1974438
+MD5 (ircd-ratbox-3.0.4.tar.bz2) = 6e2377a3bb9c016a1a15b0bb2965f6e1
+SHA256 (ircd-ratbox-3.0.4.tar.bz2) = e45444b5e8956faf1f43e509844fba7da539b4f97422c34d0d97345a4745e385
+SIZE (ircd-ratbox-3.0.4.tar.bz2) = 1979817
diff --git a/irc/ircd-ratbox-devel/files/pkg-install.in b/irc/ircd-ratbox-devel/files/pkg-install.in
index 37fe4782f367..5b8b8375ec02 100644
--- a/irc/ircd-ratbox-devel/files/pkg-install.in
+++ b/irc/ircd-ratbox-devel/files/pkg-install.in
@@ -107,12 +107,15 @@ mkdir -p %%DBDIR%%		\
 && chmod 750 %%DBDIR%%
 
 # Secure permissions if we think this is a fresh install
-
-if [ ! -f %%PREFIX%%/etc/ircd-ratbox/ircd.conf ]; then
+conffile="%%PREFIX%%/etc/ircd-ratbox/ircd.conf"
+samplefile="%%PREFIX%%/etc/ircd-ratbox/ircd.conf.sample"
+if cmp -s $conffile $samplefile; then
 	echo "Setting permissions for config dir and files."
-	chown -R ircd:ircd %%PREFIX%%/etc/ircd-ratbox/
+	chown -R root:ircd %%PREFIX%%/etc/ircd-ratbox/
 	chmod 750 %%PREFIX%%/etc/ircd-ratbox/
 	chmod 640 %%PREFIX%%/etc/ircd-ratbox/*
+else
+	echo "Modified ircd.conf file found, skipping perms setting."
 fi
 
 #-----------------------------------------------------------------------