Date: Sat, 27 Oct 2007 02:15:29 +0100 (BST) From: Lewis <moggie@elasticmind.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/117549: [maintainer-update|patch] irc/ircd-ratbox: Fixed CONFLICTS param, Tidy-up, config handling. Message-ID: <20071027011529.6E63426D02A@mail.elasticmind.net> Resent-Message-ID: <200710270120.l9R1K1sH064596@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 117549 >Category: ports >Synopsis: [maintainer-update|patch] irc/ircd-ratbox: Fixed CONFLICTS param, Tidy-up, 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:20:01 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 >Description: Update of irc/ircd-ratbox port to fix CONFLICTS parameter, tidy up port files and improve config handling. >How-To-Repeat: >Fix: --- ircd-ratbox-2.2.6_1.diff begins here --- diff -ruN ircd-ratbox.orig/Makefile ircd-ratbox/Makefile --- ircd-ratbox.orig/Makefile Wed Oct 24 20:42:58 2007 +++ ircd-ratbox/Makefile Wed Oct 24 22:45:48 2007 @@ -8,17 +8,19 @@ 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/ EXTRACT_SUFX= .tgz MAINTAINER= moggie@elasticmind.net COMMENT= An advanced, stable IRC daemon, used on many EFnet servers -CONFLICTS= ircd-ratbox-[0-9]* +CONFLICTS= ircd-ratbox-devel-[0-9]* MAN8= ircd.8 USE_RC_SUBR= ircd-ratbox.sh @@ -136,6 +138,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.orig/files/pkg-message.in ircd-ratbox/files/pkg-message.in --- ircd-ratbox.orig/files/pkg-message.in Wed Oct 24 20:42:58 2007 +++ ircd-ratbox/files/pkg-message.in Thu Oct 25 09:38:22 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.orig/pkg-plist ircd-ratbox/pkg-plist --- ircd-ratbox.orig/pkg-plist Wed Oct 24 20:42:58 2007 +++ ircd-ratbox/pkg-plist Thu Oct 25 09:34:11 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-2.2.6_1.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071027011529.6E63426D02A>