FreeBSD Bugzilla – Attachment 82153 Details for
Bug 117548
[maintainer-update|patch] irc/ratbox-services: Tidy-up, improved config handling.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
ratbox-services-1.1.2_2.diff
ratbox-services-1.1.2_2.diff (text/plain), 3.45 KB, created by
moggie
on 2007-10-27 02:10:01 UTC
(
hide
)
Description:
ratbox-services-1.1.2_2.diff
Filename:
MIME Type:
Creator:
moggie
Created:
2007-10-27 02:10:01 UTC
Size:
3.45 KB
patch
obsolete
>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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 117548
: 82153