Date: Sat, 27 Oct 2007 02:08:54 +0100 (BST) From: Lewis <moggie@elasticmind.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/117548: [maintainer-update|patch] irc/ratbox-services: Tidy-up, improved config handling. Message-ID: <20071027010855.016BA26D02A@mail.elasticmind.net> Resent-Message-ID: <200710270110.l9R1A1G2064332@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 117548 >Category: ports >Synopsis: [maintainer-update|patch] irc/ratbox-services: 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: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 amd64 >Description: Update of irc/ratbox-services port to tidy up port files and improve config handling. >How-To-Repeat: >Fix: --- ratbox-services-1.1.2_2.diff begins here --- diff -ruN ratbox-services.orig/Makefile ratbox-services/Makefile --- ratbox-services.orig/Makefile Thu Oct 25 09:51:13 2007 +++ ratbox-services/Makefile Thu Oct 25 09:57:53 2007 @@ -6,12 +6,13 @@ PORTNAME= ratbox-services PORTVERSION= 1.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= irc MASTER_SITES= ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/${PORTNAME}/ \ ftp://ftp.demon.co.uk/pub/mirrors/ircd-ratbox/${PORTNAME}/ \ http://services.ircd-ratbox.org/download/ \ - ftp://ftp.parodius.com/pub/ircd-ratbox/${PORTNAME}/ + ftp://ftp.parodius.com/pub/ircd-ratbox/${PORTNAME}/ \ + http://services.ircd-ratbox.org/download/old/ EXTRACT_SUFX= .tgz PATCH_SITES= http://www.elasticmind.net/freebsd/ports/distfiles/ \ @@ -182,6 +183,11 @@ ${INSTALL_DATA} ${WRKSRC}/INSTALL.sqlite ${DOCSDIR}/INSTALL.sqlite ${INSTALL_DATA} ${WRKSRC}/UPGRADING ${DOCSDIR}/UPGRADING ${INSTALL_DATA} ${WRKSRC}/DBMOVE ${DOCSDIR}/DBMOVE + + @if [ ! -f ${PREFIX}/etc/ratbox-services.conf ]; then \ + ${ECHO} "Installing default configuration file."; \ + ${CP} -p ${PREFIX}/etc/ratbox-services.conf.sample ${PREFIX}/etc/ratbox-services.conf ; \ + fi @${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} diff -ruN ratbox-services.orig/files/pkg-message.in ratbox-services/files/pkg-message.in --- ratbox-services.orig/files/pkg-message.in Thu Oct 25 09:51:13 2007 +++ ratbox-services/files/pkg-message.in Thu Oct 25 10:03:56 2007 @@ -1,8 +1,8 @@ ------------------------------------------------------------------------ ratbox-services has been successfully installed. -You should now copy %%PREFIX%%/etc/ratbox-services.conf.sample to -%%PREFIX%%/etc/ratbox-services.conf, and edit it as per the +A sample configuration file 'ratbox-services.conf' has been created in +'%%PREFIX%%/etc/', you should edit this file as per the ratbox-services documentation. This file is required to start services. You may also need to perform the following steps, if you have not diff -ruN ratbox-services.orig/pkg-descr ratbox-services/pkg-descr --- ratbox-services.orig/pkg-descr Thu Oct 25 09:51:13 2007 +++ ratbox-services/pkg-descr Thu Oct 25 10:16:06 2007 @@ -2,7 +2,7 @@ use with ircd-ratbox. It is highly configurable, with nearly all options being set in a config -that can be rehashed rather than set at compile time. As well supporting +that can be rehashed rather than set at compile time. As well as supporting standard database backends like PostgreSQL, its default is to use the SQLite database backend, which works as a database interface to a normal file, meaning no seperate database software must be running. diff -ruN ratbox-services.orig/pkg-plist ratbox-services/pkg-plist --- ratbox-services.orig/pkg-plist Thu Oct 25 09:51:13 2007 +++ ratbox-services/pkg-plist Thu Oct 25 10:00:40 2007 @@ -16,7 +16,6 @@ %%DOCSDIR%%/INSTALL.sqlite %%DOCSDIR%%/UPGRADING %%DOCSDIR%%/DBMOVE -etc/ratbox-services.conf.sample sbin/ratbox-services include/setup.h include/rserv.h @@ -201,5 +200,8 @@ @dirrm %%DATADIR%% @dirrmtry %%DBDIR%% @dirrmtry %%DOCSDIR%% +@unexec if cmp -s %D/etc/ratbox-services.conf.sample %D/etc/ratbox-services.conf; then rm -f %D/etc/ratbox-services.conf; fi +etc/ratbox-services.conf.sample +@exec if [ ! -f %D/etc/ratbox-services.conf ] ; then cp -p %D/%F %B/ratbox-services.conf; fi @unexec f="/var/log/ratbox-services.log"; if [ ! -s "$f" ]; then rm -f "$f"; fi @unexec f="/var/run/ratbox-services.pid"; if [ ! -s "$f" ]; then rm -f "$f"; fi --- ratbox-services-1.1.2_2.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?20071027010855.016BA26D02A>