From moggie@elasticmind.net  Sat Oct 27 01:02:26 2007
Return-Path: <moggie@elasticmind.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5918A16A41A
	for <freebsd-gnats-submit@freebsd.org>; Sat, 27 Oct 2007 01:02:26 +0000 (UTC)
	(envelope-from moggie@elasticmind.net)
Received: from mail.elasticmind.net (mail.elasticmind.net [85.113.90.11])
	by mx1.freebsd.org (Postfix) with ESMTP id BBE2913C481
	for <freebsd-gnats-submit@freebsd.org>; Sat, 27 Oct 2007 01:02:25 +0000 (UTC)
	(envelope-from moggie@elasticmind.net)
Received: by mail.elasticmind.net (Postfix, from userid 1001)
	id 16AF626D02A; Sat, 27 Oct 2007 01:53:33 +0100 (BST)
Message-Id: <20071027005333.16AF626D02A@mail.elasticmind.net>
Date: Sat, 27 Oct 2007 01:53:33 +0100 (BST)
From: Lewis <moggie@elasticmind.net>
Reply-To: Lewis <moggie@elasticmind.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer-update|patch] irc/ircd-ratbox-devel: Tidy-up, improved config handling.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         117547
>Category:       ports
>Synopsis:       [maintainer-update|patch] irc/ircd-ratbox-devel: Tidy-up, improved config handling.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 27 01:10:00 UTC 2007
>Closed-Date:    Sat Oct 27 22:18:21 UTC 2007
>Last-Modified:  Sat Oct 27 22:20:04 UTC 2007
>Originator:     Lewis Bond
>Release:        FreeBSD 6.2-RELEASE-p6 amd64
>Organization:
>Environment:
System: FreeBSD 6.2-RELEASE-p6 FreeBSD 6.2-RELEASE-p6 #0: Wed Jul 18 00:36:42 BST 2007 amd64


	
>Description:
Update of irc/ircd-ratbox port to tidy up port files and improve config handling.
	
>How-To-Repeat:
	
>Fix:

	

--- ircd-ratbox-devel-2.2.6_1.diff begins here ---
diff -ruN ircd-ratbox-devel.orig/Makefile ircd-ratbox-devel/Makefile
--- ircd-ratbox-devel.orig/Makefile	Sat Oct 27 01:13:25 2007
+++ ircd-ratbox-devel/Makefile	Sat Oct 27 01:09:43 2007
@@ -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]*
 
@@ -137,6 +139,16 @@
 	${INSTALL_DATA} ${WRKSRC}/doc/ircd.motd ${PREFIX}/etc/${PORTNAME}/ircd.motd.sample
 	${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 -ruN ircd-ratbox-devel.orig/files/pkg-message.in ircd-ratbox-devel/files/pkg-message.in
--- ircd-ratbox-devel.orig/files/pkg-message.in	Sat Oct 27 01:13:25 2007
+++ ircd-ratbox-devel/files/pkg-message.in	Sat Oct 27 01:09:43 2007
@@ -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 -ruN ircd-ratbox-devel.orig/pkg-plist ircd-ratbox-devel/pkg-plist
--- ircd-ratbox-devel.orig/pkg-plist	Sat Oct 27 01:13:25 2007
+++ ircd-ratbox-devel/pkg-plist	Sat Oct 27 01:09:43 2007
@@ -7,8 +7,6 @@
 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 @@
 @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%%
--- ircd-ratbox-devel-2.2.6_1.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Sat Oct 27 22:18:20 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117547 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/117547: commit references a PR
Date: Sat, 27 Oct 2007 22:18:18 +0000 (UTC)

 miwi        2007-10-27 22:18:13 UTC
 
   FreeBSD ports repository
 
   Modified files:
     irc/ratbox-services  Makefile pkg-descr pkg-plist 
     irc/ratbox-services/files pkg-message.in 
   Log:
   - Tidy-up
   - Improved config handling
   
   PR:             117547
   Submitted by:   Lewis <moggie@elasticmind.net> (maintainer)
   
   Revision  Changes    Path
   1.6       +8 -2      ports/irc/ratbox-services/Makefile
   1.3       +2 -2      ports/irc/ratbox-services/files/pkg-message.in
   1.3       +1 -1      ports/irc/ratbox-services/pkg-descr
   1.4       +3 -1      ports/irc/ratbox-services/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
