From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Oct 27 01:10:01 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7DB6316A41B for ; Sat, 27 Oct 2007 01:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 5E3D613C4BD for ; Sat, 27 Oct 2007 01:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l9R1A1dW064319 for ; Sat, 27 Oct 2007 01:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l9R1A1oj064318; Sat, 27 Oct 2007 01:10:01 GMT (envelope-from gnats) Resent-Date: Sat, 27 Oct 2007 01:10:01 GMT Resent-Message-Id: <200710270110.l9R1A1oj064318@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Lewis Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5918A16A41A for ; 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 ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/117547: [maintainer-update|patch] irc/ircd-ratbox-devel: Tidy-up, improved config handling. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Lewis List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Oct 2007 01:10:01 -0000 >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: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Oct 27 01:10:00 UTC 2007 >Closed-Date: >Last-Modified: >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: >Unformatted: