Date: Fri, 20 Jun 2008 21:52:56 +0100 (BST) From: Lewis <moggie@elasticmind.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/124799: [maintainer-update|patch] irc/ircd-ratbox-devel: update to ratbox-3 beta5 Message-ID: <20080620205256.10DF826D055@mail.elasticmind.net> Resent-Message-ID: <200806202120.m5KLK4TR043463@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 124799 >Category: ports >Synopsis: [maintainer-update|patch] irc/ircd-ratbox-devel: update to ratbox-3 beta5 >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: Fri Jun 20 21:20:03 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Lewis >Release: FreeBSD 6.2-RELEASE-p11 amd64 >Organization: >Environment: System: FreeBSD 6.2-RELEASE-p11 FreeBSD 6.2-RELEASE-p11 #2: Sat May 17 18:37:26 BST 2008 amd64 Port build tested on tinderbox: 7-STABLE, 6-STABLE, 8, 7.0, 6.3 >Description: Updated ircd-ratbox-devel port to latest beta testing release of ircd-ratbox-3.0.0, sqlite3 dependancy temporarily removed due to sqlite3 detection problem, added USE_LDCONFIG to register shared libs. Changes include: o Add admin only -lock klines, doing KLINE -lock will allow admins to add klines that normal opers cannot remove. o Modify bantool to have a -u option that updates the database schema if upgrading from previous betas, this needs to be run to support the -lock kline changes. o Fix cidr klines so they work again. o Update included sqlite3 to the latest revision. o Allow kline/unkline of a bare host or address, this gets treated as *@host. o Report when an invalid kline is passed, instead of silently ignoring. --- Note for /usr/src/UPDATING --- Upgrading between different beta releases can cause problems when changes to the ban database schema have occurred. The 'bantool' utility now comes with a -u switch that will check and update the ban database as necessary. A 'bantool -u' update is required when upgrading between beta releases and must not be done while the ircd is running. --- End of UPDATING note --- >How-To-Repeat: >Fix: --- ircd-ratbox-devel-3.0.0beta5.diff begins here --- diff -ruN ircd-ratbox-devel.orig/Makefile ircd-ratbox-devel/Makefile --- ircd-ratbox-devel.orig/Makefile 2008-06-20 11:26:05.000000000 +0100 +++ ircd-ratbox-devel/Makefile 2008-06-20 20:12:07.000000000 +0100 @@ -8,7 +8,7 @@ PORTNAME= ircd-ratbox #PORTVERSION= 3.0.0 -DISTVERSION= 3.0.0beta2 +DISTVERSION= 3.0.0beta5 CATEGORIES= irc ipv6 MASTER_SITES= ftp://ftp.ircd-ratbox.org/pub/ircd-ratbox/testing/ \ ftp://ftp.demon.co.uk/pub/mirrors/ircd-ratbox/testing/ \ @@ -25,7 +25,8 @@ USE_BZIP2= yes #MAN8= ircd.8 USE_RC_SUBR= ircd-ratbox.sh -USE_SQLITE= 3 +#USE_SQLITE= 3 +USE_LDCONFIG= ${PREFIX}/lib/ircd-ratbox LOGDIR?= /var/log/${PORTNAME} RUNDIR?= /var/run/${PORTNAME} @@ -38,9 +39,10 @@ CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc/${PORTNAME} \ --with-logdir=/var/log/${PORTNAME} \ --with-moduledir=${PREFIX}/lib/${PORTNAME}/modules \ + --libexecdir=${PREFIX}/libexec \ --with-helpdir=${DATADIR}/help \ --libdir=${PREFIX}/lib/${PORTNAME} \ - --with-sqlite3-path=${LOCALBASE} + --disable-backups PORTDOCS= [^i]*.txt README.* technical/[^i]*.txt Tao-of-IRC.* @@ -123,6 +125,10 @@ @${REINPLACE_CMD} -e "s#%%RUNDIR%%#${RUNDIR}#g" ${WRKSRC}/include/config.h @${REINPLACE_CMD} -e "s#%%DBDIR%%#${DBDIR}#g" ${WRKSRC}/include/config.h +post-build: + @cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE} \ + ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} + pre-su-install: @${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL ${MKDIR} ${PREFIX}/etc/${PORTNAME} @@ -134,9 +140,12 @@ ${MKDIR} ${DOCSDIR} cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif + @cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE} \ + ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install ${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 + ${INSTALL_DATA} ${WRKSRC}/doc/genssl.sh ${PREFIX}/etc/${PORTNAME}/genssl.sh @if [ ! -f ${PREFIX}/etc/${PORTNAME}/ircd.conf ]; then \ ${ECHO} "Installing default configuration file."; \ diff -ruN ircd-ratbox-devel.orig/distinfo ircd-ratbox-devel/distinfo --- ircd-ratbox-devel.orig/distinfo 2008-06-20 11:26:05.000000000 +0100 +++ ircd-ratbox-devel/distinfo 2008-06-20 11:37:34.000000000 +0100 @@ -1,3 +1,3 @@ -MD5 (ircd-ratbox-3.0.0beta2.tar.bz2) = 743b81cc1f12940a0bcb85dc176683b6 -SHA256 (ircd-ratbox-3.0.0beta2.tar.bz2) = 6874c9d23221331f76f54e860a51806c60cd77f78b4c876e515e41bef84b1c24 -SIZE (ircd-ratbox-3.0.0beta2.tar.bz2) = 1850499 +MD5 (ircd-ratbox-3.0.0beta5.tar.bz2) = edb1aad622ad6312144818311ad8d2c8 +SHA256 (ircd-ratbox-3.0.0beta5.tar.bz2) = c5270090e5d034ac8c5a874e52c6ec586e93393dcd9456eb35d3e9fa95517ea2 +SIZE (ircd-ratbox-3.0.0beta5.tar.bz2) = 1966643 diff -ruN ircd-ratbox-devel.orig/files/patch-Makefile.am ircd-ratbox-devel/files/patch-Makefile.am --- ircd-ratbox-devel.orig/files/patch-Makefile.am 2008-06-20 11:26:04.000000000 +0100 +++ ircd-ratbox-devel/files/patch-Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ ---- ./Makefile.am.orig Tue Jan 22 16:15:08 2008 -+++ ./Makefile.am Tue Apr 22 02:20:19 2008 -@@ -24,13 +24,13 @@ - - if !STATIC_MODULES - --SUBDIRS = libratbox libltdl src modules tools doc help bandb ssld resolver ident -+SUBDIRS = libratbox libltdl src modules tools doc help bandb ssld resolver ident contrib - ircd_LDADD = libratbox/src/libratbox.la src/libcore.la $(LIBLTDL) - ircd_LDFLAGS = $(EXTRA_FLAGS) -dlopen self - - else - --SUBDIRS = libratbox libltdl modules src tools doc help bandb ssld resolver ident -+SUBDIRS = libratbox libltdl modules src tools doc help bandb ssld resolver ident contrib - ircd_LDADD = libratbox/src/libratbox.la modules/libmodules.la src/libcore.la modules/static_modules.o $(LIBLTDL) $(DLOPEN) - - diff -ruN ircd-ratbox-devel.orig/files/patch-Makefile.in ircd-ratbox-devel/files/patch-Makefile.in --- ircd-ratbox-devel.orig/files/patch-Makefile.in 2008-06-20 11:26:04.000000000 +0100 +++ ircd-ratbox-devel/files/patch-Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,171 +0,0 @@ ---- ./Makefile.in.orig Fri Mar 7 16:10:01 2008 -+++ ./Makefile.in Tue Apr 22 02:20:19 2008 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10.1 from Makefile.am. -+# Makefile.in generated by automake 1.10 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -14,7 +14,7 @@ - - @SET_MAKE@ - --# $Id: Makefile.in 25099 2008-03-07 16:10:01Z androsyn $ -+# $Id: Makefile.am 25012 2008-01-22 16:15:08Z androsyn $ - # - # okay so i've flattened out the build stuff here. - # this is really for the best since so many things depend -@@ -73,7 +73,7 @@ - ircd_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(ircd_LDFLAGS) \ - $(LDFLAGS) -o $@ --DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include -+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -99,7 +99,7 @@ - ETAGS = etags - CTAGS = ctags - DIST_SUBDIRS = libratbox libltdl src modules tools doc help bandb ssld \ -- resolver ident -+ resolver ident contrib - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) -@@ -133,7 +133,6 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -171,7 +170,6 @@ - MKDIR_P = @MKDIR_P@ - MODULE_DIR = @MODULE_DIR@ - MV = @MV@ --NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -265,8 +263,8 @@ - AM_CFLAGS = $(WARNFLAGS) - ircd_SOURCES = src/main.c - @MINGW_TRUE@EXTRA_FLAGS = -no-undefined -Wl,--enable-runtime-pseudo-reloc -export-symbols-regex '*' --@STATIC_MODULES_FALSE@SUBDIRS = libratbox libltdl src modules tools doc help bandb ssld resolver ident --@STATIC_MODULES_TRUE@SUBDIRS = libratbox libltdl modules src tools doc help bandb ssld resolver ident -+@STATIC_MODULES_FALSE@SUBDIRS = libratbox libltdl src modules tools doc help bandb ssld resolver ident contrib -+@STATIC_MODULES_TRUE@SUBDIRS = libratbox libltdl modules src tools doc help bandb ssld resolver ident contrib - @STATIC_MODULES_FALSE@ircd_LDADD = libratbox/src/libratbox.la src/libcore.la $(LIBLTDL) - @STATIC_MODULES_TRUE@ircd_LDADD = libratbox/src/libratbox.la modules/libmodules.la src/libcore.la modules/static_modules.o $(LIBLTDL) $(DLOPEN) - @STATIC_MODULES_FALSE@ircd_LDFLAGS = $(EXTRA_FLAGS) -dlopen self -@@ -339,8 +337,8 @@ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ -+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - -@@ -486,8 +484,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -512,8 +510,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -523,12 +521,13 @@ - CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -+ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -599,10 +598,6 @@ - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) - --dist-lzma: distdir -- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma -- $(am__remove_distdir) -- - dist-tarZ: distdir - tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) -@@ -629,8 +624,6 @@ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ - *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ -- *.tar.lzma*) \ -- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ - *.tar.Z*) \ - uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ - *.shar.gz*) \ -@@ -790,20 +783,20 @@ - .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags ctags-recursive dist \ -- dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \ -- dist-zip distcheck distclean distclean-compile \ -- distclean-generic distclean-hdr distclean-libtool \ -- distclean-tags distcleancheck distdir distuninstallcheck dvi \ -- dvi-am html html-am info info-am install install-am \ -- install-binPROGRAMS install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-html \ -- install-html-am install-info install-info-am install-man \ -- install-pdf install-pdf-am install-ps install-ps-am \ -- install-strip installcheck installcheck-am installdirs \ -- installdirs-am maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ -- uninstall uninstall-am uninstall-binPROGRAMS -+ dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \ -+ distcheck distclean distclean-compile distclean-generic \ -+ distclean-hdr distclean-libtool distclean-tags distcleancheck \ -+ distdir distuninstallcheck dvi dvi-am html html-am info \ -+ info-am install install-am install-binPROGRAMS install-data \ -+ install-data-am install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip installcheck \ -+ installcheck-am installdirs installdirs-am maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-compile \ -+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ -+ tags tags-recursive uninstall uninstall-am \ -+ uninstall-binPROGRAMS - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff -ruN ircd-ratbox-devel.orig/files/patch-contrib_Makefile.am ircd-ratbox-devel/files/patch-contrib_Makefile.am --- ircd-ratbox-devel.orig/files/patch-contrib_Makefile.am 2008-06-20 11:26:04.000000000 +0100 +++ ircd-ratbox-devel/files/patch-contrib_Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ ---- ./contrib/Makefile.am.orig Fri Mar 7 16:10:01 2008 -+++ ./contrib/Makefile.am Tue Apr 22 02:20:19 2008 -@@ -10,7 +10,6 @@ - AM_CFLAGS=$(WARNFLAGS) - - SRCS = \ --example_module.c \ - m_42.c \ - m_clearchan.c \ - m_flags.c \ diff -ruN ircd-ratbox-devel.orig/files/patch-contrib_Makefile.in ircd-ratbox-devel/files/patch-contrib_Makefile.in --- ircd-ratbox-devel.orig/files/patch-contrib_Makefile.in 2008-06-20 11:26:04.000000000 +0100 +++ ircd-ratbox-devel/files/patch-contrib_Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,37 +0,0 @@ ---- ./contrib/Makefile.in.orig Fri Mar 7 16:10:01 2008 -+++ ./contrib/Makefile.in Tue Apr 22 02:20:19 2008 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10.1 from Makefile.am. -+# Makefile.in generated by automake 1.10 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -66,7 +66,6 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -104,7 +103,6 @@ - MKDIR_P = @MKDIR_P@ - MODULE_DIR = @MODULE_DIR@ - MV = @MV@ --NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -199,7 +197,6 @@ - INCLUDES = -I../include -I../libratbox/include $(INCLTDL) - AM_CFLAGS = $(WARNFLAGS) - SRCS = \ --example_module.c \ - m_42.c \ - m_clearchan.c \ - m_flags.c \ diff -ruN ircd-ratbox-devel.orig/files/patch-doc_Makefile.in ircd-ratbox-devel/files/patch-doc_Makefile.in --- ircd-ratbox-devel.orig/files/patch-doc_Makefile.in 2008-06-20 11:26:04.000000000 +0100 +++ ircd-ratbox-devel/files/patch-doc_Makefile.in 2008-06-20 11:37:34.000000000 +0100 @@ -1,6 +1,6 @@ ---- ./doc/Makefile.in.orig Fri Mar 7 16:30:59 2008 -+++ ./doc/Makefile.in Tue Apr 22 02:20:19 2008 -@@ -43,21 +43,10 @@ +--- ./doc/Makefile.in.orig 2008-04-23 20:59:46.000000000 +0100 ++++ ./doc/Makefile.in 2008-06-18 14:31:34.000000000 +0100 +@@ -43,24 +43,6 @@ fi install: install-mkdirs build @@ -11,15 +11,17 @@ - fi; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(confdir); \ - done - - -@if test ! -f $(DESTDIR)$(confdir)/ircd.motd; then \ - echo "ircd: installing motd file (ircd.motd)"; \ +- +- -@if test ! -f $(DESTDIR)$(confdir)/ircd.motd; then \ +- echo "ircd: installing motd file (ircd.motd)"; \ - $(INSTALL_DATA) ircd.motd $(DESTDIR)$(confdir); \ - fi - +- $(INSTALL_BIN) genssl.sh $(DESTDIR)$(confdir) +- - -@if test -f $(DESTDIR)$(confdir)/links.txt; then \ - $(RM) $(DESTDIR)$(confdir)/links.txt; \ -+ $(INSTALL_DATA) ircd.motd $(DESTDIR)$(confdir)/ircd.motd.sample; \ - fi +- fi all: + build: diff -ruN ircd-ratbox-devel.orig/files/patch-help_Makefile.in ircd-ratbox-devel/files/patch-help_Makefile.in --- ircd-ratbox-devel.orig/files/patch-help_Makefile.in 2008-06-20 11:26:05.000000000 +0100 +++ ircd-ratbox-devel/files/patch-help_Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ ---- ./help/Makefile.in.orig Fri Sep 1 19:20:19 2006 -+++ ./help/Makefile.in Tue Apr 22 02:20:19 2008 -@@ -63,14 +63,6 @@ - rm -f opers/index.tmp - - install: -- -@if test -d $(DESTDIR)$(helpdir)-old; then \ -- rm -rf $(DESTDIR)$(helpdir)-old; \ -- fi -- -@if test -d $(DESTDIR)$(helpdir); then \ -- echo "ircd: backing up old help files"; \ -- mv $(DESTDIR)$(helpdir) $(DESTDIR)$(helpdir)-old; \ -- fi -- - @echo "ircd: setting up help directory structure" - @mkdir -p -m 755 $(DESTDIR)$(helpdir) - @mkdir -p -m 755 $(DESTDIR)$(helpdir)/opers diff -ruN ircd-ratbox-devel.orig/files/patch-libltdl_Makefile.am ircd-ratbox-devel/files/patch-libltdl_Makefile.am --- ircd-ratbox-devel.orig/files/patch-libltdl_Makefile.am 2008-06-20 11:26:05.000000000 +0100 +++ ircd-ratbox-devel/files/patch-libltdl_Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ ---- ./libltdl/Makefile.am.orig Tue Sep 4 23:06:44 2007 -+++ ./libltdl/Makefile.am Tue Apr 22 02:20:19 2008 -@@ -1,7 +1,7 @@ - ## Process this file with automake to produce Makefile.in - - AUTOMAKE_OPTIONS = no-dependencies foreign -- -+CONVENIENCE_LTDL=1 - if INSTALL_LTDL - include_HEADERS = ltdl.h - lib_LTLIBRARIES = libltdl.la -@@ -30,3 +30,5 @@ - $(libltdl_la_OBJECTS) $(libltdlc_la_OBJECTS): libtool - libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck -+ -+install-includeHEADERS: diff -ruN ircd-ratbox-devel.orig/files/patch-libltdl_aclocal.m4 ircd-ratbox-devel/files/patch-libltdl_aclocal.m4 --- ircd-ratbox-devel.orig/files/patch-libltdl_aclocal.m4 2008-06-20 11:26:05.000000000 +0100 +++ ircd-ratbox-devel/files/patch-libltdl_aclocal.m4 1970-01-01 01:00:00.000000000 +0100 @@ -1,109 +0,0 @@ ---- ./libltdl/aclocal.m4.orig Tue Sep 4 23:06:44 2007 -+++ ./libltdl/aclocal.m4 Tue Apr 22 02:20:19 2008 -@@ -1,7 +1,7 @@ --# generated automatically by aclocal 1.10 -*- Autoconf -*- -+# generated automatically by aclocal 1.10.1 -*- Autoconf -*- - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --# 2005, 2006 Free Software Foundation, Inc. -+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -11,12 +11,15 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --m4_if(m4_PACKAGE_VERSION, [2.61],, --[m4_fatal([this file was generated for autoconf 2.61. --You have another version of autoconf. If you want to use that, --you should regenerate the build system entirely.], [63])]) -+m4_ifndef([AC_AUTOCONF_VERSION], -+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -+m4_if(AC_AUTOCONF_VERSION, [2.61],, -+[m4_warning([this file was generated for autoconf 2.61. -+You have another version of autoconf. It may work, but is not guaranteed to. -+If you have problems, you may need to regenerate the build system entirely. -+To do so, use the procedure documented by the package, typically `autoreconf'.])]) - --# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. -+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -31,7 +34,7 @@ - [am__api_version='1.10' - dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to - dnl require some minimum version. Point them to the right macro. --m4_if([$1], [1.10], [], -+m4_if([$1], [1.10.1], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl - ]) - -@@ -47,8 +50,10 @@ - # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. - # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. - AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], --[AM_AUTOMAKE_VERSION([1.10])dnl --_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) -+[AM_AUTOMAKE_VERSION([1.10.1])dnl -+m4_ifndef([AC_AUTOCONF_VERSION], -+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) - - # AM_AUX_DIR_EXPAND -*- Autoconf -*- - -@@ -320,7 +325,7 @@ - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. -- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then -+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue -@@ -380,13 +385,13 @@ - # Do all the work for Automake. -*- Autoconf -*- - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, --# 2005, 2006 Free Software Foundation, Inc. -+# 2005, 2006, 2008 Free Software Foundation, Inc. - # - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. - --# serial 12 -+# serial 13 - - # This macro actually does too much. Some checks are only needed if - # your package does certain things. But this isn't really a big deal. -@@ -491,16 +496,17 @@ - # our stamp files there. - AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], - [# Compute $1's index in $config_headers. -+_am_arg=$1 - _am_stamp_count=1 - for _am_header in $config_headers :; do - case $_am_header in -- $1 | $1:* ) -+ $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac - done --echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) -+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) - - # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. - # -@@ -772,7 +778,7 @@ - - # _AM_SUBST_NOTMAKE(VARIABLE) - # --------------------------- --# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. -+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. - # This macro is traced by Automake. - AC_DEFUN([_AM_SUBST_NOTMAKE]) - diff -ruN ircd-ratbox-devel.orig/files/patch-libltdl_configure ircd-ratbox-devel/files/patch-libltdl_configure --- ircd-ratbox-devel.orig/files/patch-libltdl_configure 2008-06-20 11:26:05.000000000 +0100 +++ ircd-ratbox-devel/files/patch-libltdl_configure 1970-01-01 01:00:00.000000000 +0100 @@ -1,41 +0,0 @@ ---- ./libltdl/configure.orig Tue Sep 4 23:06:44 2007 -+++ ./libltdl/configure Tue Apr 22 02:20:19 2008 -@@ -23654,21 +23654,22 @@ - fi - rm -f "$tmp/out12" - # Compute $ac_file's index in $config_headers. -+_am_arg=$ac_file - _am_stamp_count=1 - for _am_header in $config_headers :; do - case $_am_header in -- $ac_file | $ac_file:* ) -+ $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac - done --echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || --$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X$ac_file : 'X\(//\)[^/]' \| \ -- X$ac_file : 'X\(//\)$' \| \ -- X$ac_file : 'X\(/\)' \| . 2>/dev/null || --echo X$ac_file | -+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || -+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$_am_arg" : 'X\(//\)[^/]' \| \ -+ X"$_am_arg" : 'X\(//\)$' \| \ -+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -+echo X"$_am_arg" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q -@@ -23705,7 +23706,7 @@ - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. -- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then -+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || - $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ diff -ruN ircd-ratbox-devel.orig/files/patch-modules_Makefile.am ircd-ratbox-devel/files/patch-modules_Makefile.am --- ircd-ratbox-devel.orig/files/patch-modules_Makefile.am 2008-06-20 11:26:05.000000000 +0100 +++ ircd-ratbox-devel/files/patch-modules_Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ ---- ./modules/Makefile.am.orig Wed Feb 6 16:45:19 2008 -+++ ./modules/Makefile.am Tue Apr 22 02:20:19 2008 -@@ -327,15 +327,9 @@ - move-old-modules: - # move the old module directory out of the way, stale modules cause massive - # amounts of problems. -- -@if test -d $(DESTDIR)$(moduledir)-old; then \ -- $(RM) -rf $(DESTDIR)$(moduledir)-old; \ -- fi -- -@if test -d $(DESTDIR)$(moduledir); then \ -- echo "ircd: backing up modules"; \ -- $(MV) $(DESTDIR)$(moduledir) $(DESTDIR)$(moduledir)-old; \ -- $(MKDIR_P) $(DESTDIR)$(moduledir); \ -+ -@if test ! -d $(DESTDIR)$(moduledir); then \ -+ mkdir $(DESTDIR)$(moduledir); \ - fi -- - - else # !STATIC_MODULES - diff -ruN ircd-ratbox-devel.orig/files/patch-modules_Makefile.in ircd-ratbox-devel/files/patch-modules_Makefile.in --- ircd-ratbox-devel.orig/files/patch-modules_Makefile.in 2008-06-20 11:26:05.000000000 +0100 +++ ircd-ratbox-devel/files/patch-modules_Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,180 +0,0 @@ ---- ./modules/Makefile.in.orig Fri Mar 7 16:10:01 2008 -+++ ./modules/Makefile.in Tue Apr 22 02:20:19 2008 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10.1 from Makefile.am. -+# Makefile.in generated by automake 1.10 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -666,7 +666,7 @@ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(m_xline_la_LDFLAGS) $(LDFLAGS) -o $@ - @STATIC_MODULES_FALSE@am_m_xline_la_rpath = -rpath $(modulesdir) --DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include -+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -781,7 +781,6 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -819,7 +818,6 @@ - MKDIR_P = @MKDIR_P@ - MODULE_DIR = @MODULE_DIR@ - MV = @MV@ --NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -1296,8 +1294,8 @@ - @STATIC_MODULES_TRUE@ @list='$(core_LTLIBRARIES)'; for p in $$list; do \ - @STATIC_MODULES_TRUE@ if test -f $$p; then \ - @STATIC_MODULES_TRUE@ f=$(am__strip_dir) \ --@STATIC_MODULES_TRUE@ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(coreLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(coredir)/$$f'"; \ --@STATIC_MODULES_TRUE@ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(coreLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(coredir)/$$f"; \ -+@STATIC_MODULES_TRUE@ echo " $(LIBTOOL) --mode=install $(coreLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(coredir)/$$f'"; \ -+@STATIC_MODULES_TRUE@ $(LIBTOOL) --mode=install $(coreLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(coredir)/$$f"; \ - @STATIC_MODULES_TRUE@ else :; fi; \ - @STATIC_MODULES_TRUE@ done - -@@ -1305,8 +1303,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(core_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(coredir)/$$p'"; \ -- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(coredir)/$$p"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(coredir)/$$p'"; \ -+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(coredir)/$$p"; \ - done - - clean-coreLTLIBRARIES: -@@ -1323,8 +1321,8 @@ - @list='$(libmodules_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libmodulesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libmodulesdir)/$$f'"; \ -- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libmodulesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libmodulesdir)/$$f"; \ -+ echo " $(LIBTOOL) --mode=install $(libmodulesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libmodulesdir)/$$f'"; \ -+ $(LIBTOOL) --mode=install $(libmodulesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libmodulesdir)/$$f"; \ - else :; fi; \ - done - -@@ -1332,8 +1330,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(libmodules_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libmodulesdir)/$$p'"; \ -- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libmodulesdir)/$$p"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libmodulesdir)/$$p'"; \ -+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libmodulesdir)/$$p"; \ - done - - clean-libmodulesLTLIBRARIES: -@@ -1350,8 +1348,8 @@ - @STATIC_MODULES_TRUE@ @list='$(modules_LTLIBRARIES)'; for p in $$list; do \ - @STATIC_MODULES_TRUE@ if test -f $$p; then \ - @STATIC_MODULES_TRUE@ f=$(am__strip_dir) \ --@STATIC_MODULES_TRUE@ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(modulesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(modulesdir)/$$f'"; \ --@STATIC_MODULES_TRUE@ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(modulesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(modulesdir)/$$f"; \ -+@STATIC_MODULES_TRUE@ echo " $(LIBTOOL) --mode=install $(modulesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(modulesdir)/$$f'"; \ -+@STATIC_MODULES_TRUE@ $(LIBTOOL) --mode=install $(modulesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(modulesdir)/$$f"; \ - @STATIC_MODULES_TRUE@ else :; fi; \ - @STATIC_MODULES_TRUE@ done - -@@ -1359,8 +1357,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(modules_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(modulesdir)/$$p'"; \ -- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(modulesdir)/$$p"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(modulesdir)/$$p'"; \ -+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(modulesdir)/$$p"; \ - done - - clean-modulesLTLIBRARIES: -@@ -1377,8 +1375,8 @@ - @list='$(services_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ -- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(servicesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(servicesdir)/$$f'"; \ -- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(servicesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(servicesdir)/$$f"; \ -+ echo " $(LIBTOOL) --mode=install $(servicesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(servicesdir)/$$f'"; \ -+ $(LIBTOOL) --mode=install $(servicesLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(servicesdir)/$$f"; \ - else :; fi; \ - done - -@@ -1386,8 +1384,8 @@ - @$(NORMAL_UNINSTALL) - @list='$(services_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ -- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(servicesdir)/$$p'"; \ -- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(servicesdir)/$$p"; \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(servicesdir)/$$p'"; \ -+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(servicesdir)/$$p"; \ - done - - clean-servicesLTLIBRARIES: -@@ -1684,8 +1682,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -1697,8 +1695,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -1708,12 +1706,13 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -+ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -1891,13 +1890,8 @@ - @STATIC_MODULES_FALSE@move-old-modules: - # move the old module directory out of the way, stale modules cause massive - # amounts of problems. --@STATIC_MODULES_FALSE@ -@if test -d $(DESTDIR)$(moduledir)-old; then \ --@STATIC_MODULES_FALSE@ $(RM) -rf $(DESTDIR)$(moduledir)-old; \ --@STATIC_MODULES_FALSE@ fi --@STATIC_MODULES_FALSE@ -@if test -d $(DESTDIR)$(moduledir); then \ --@STATIC_MODULES_FALSE@ echo "ircd: backing up modules"; \ --@STATIC_MODULES_FALSE@ $(MV) $(DESTDIR)$(moduledir) $(DESTDIR)$(moduledir)-old; \ --@STATIC_MODULES_FALSE@ $(MKDIR_P) $(DESTDIR)$(moduledir); \ -+@STATIC_MODULES_FALSE@ -@if test ! -d $(DESTDIR)$(moduledir); then \ -+@STATIC_MODULES_FALSE@ mkdir $(DESTDIR)$(moduledir); \ - @STATIC_MODULES_FALSE@ fi - @STATIC_MODULES_TRUE@static_modules.c: static_modules.c.SH - @STATIC_MODULES_TRUE@ $(SHELL) static_modules.c.SH $(MSRCS) $(CORE_SRCS) $(SERVICES_SRCS) diff -ruN ircd-ratbox-devel.orig/files/patch-tools_Makefile.am ircd-ratbox-devel/files/patch-tools_Makefile.am --- ircd-ratbox-devel.orig/files/patch-tools_Makefile.am 2008-06-20 11:26:05.000000000 +0100 +++ ircd-ratbox-devel/files/patch-tools_Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- ./tools/Makefile.am.orig Sun Mar 16 14:12:14 2008 -+++ ./tools/Makefile.am Tue Apr 22 02:20:19 2008 -@@ -9,7 +9,3 @@ - mkpasswd_SOURCES = mkpasswd.c - - mkpasswd_LDADD = ../libratbox/src/libratbox.la -- -- --install-exec-hook: -- $(INSTALL) genssl.sh $(DESTDIR)$(bindir) -\ No newline at end of file diff -ruN ircd-ratbox-devel.orig/files/patch-tools_Makefile.in ircd-ratbox-devel/files/patch-tools_Makefile.in --- ircd-ratbox-devel.orig/files/patch-tools_Makefile.in 2008-06-20 11:26:05.000000000 +0100 +++ ircd-ratbox-devel/files/patch-tools_Makefile.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,140 +0,0 @@ ---- ./tools/Makefile.in.orig Sun Mar 16 14:12:14 2008 -+++ ./tools/Makefile.in Tue Apr 22 02:20:19 2008 -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.10.1 from Makefile.am. -+# Makefile.in generated by automake 1.10 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -14,7 +14,7 @@ - - @SET_MAKE@ - --# $Id: Makefile.in 25125 2008-03-16 14:12:14Z androsyn $ -+# $Id: Makefile.am 25125 2008-03-16 14:12:14Z androsyn $ - - VPATH = @srcdir@ - pkgdatadir = $(datadir)/@PACKAGE@ -@@ -51,7 +51,7 @@ - am_mkpasswd_OBJECTS = mkpasswd.$(OBJEXT) - mkpasswd_OBJECTS = $(am_mkpasswd_OBJECTS) - mkpasswd_DEPENDENCIES = ../libratbox/src/libratbox.la --DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include -+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include@am__isrc@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -90,7 +90,6 @@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ --DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -128,7 +127,6 @@ - MKDIR_P = @MKDIR_P@ - MODULE_DIR = @MODULE_DIR@ - MV = @MV@ --NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -260,8 +258,8 @@ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ -- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ -+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ -+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - -@@ -323,8 +321,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ - mkid -fID $$unique - tags: TAGS - -@@ -336,8 +334,8 @@ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -@@ -347,12 +345,13 @@ - CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ -+ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ -- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -- END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique -@@ -447,8 +446,6 @@ - install-dvi: install-dvi-am - - install-exec-am: install-binPROGRAMS -- @$(NORMAL_INSTALL) -- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook - - install-html: install-html-am - -@@ -482,25 +479,22 @@ - - uninstall-am: uninstall-binPROGRAMS - --.MAKE: install-am install-exec-am install-strip -+.MAKE: install-am install-strip - - .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ -- install-dvi-am install-exec install-exec-am install-exec-hook \ -- install-html install-html-am install-info install-info-am \ -- install-man install-pdf install-pdf-am install-ps \ -- install-ps-am install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -- uninstall-am uninstall-binPROGRAMS -- -+ install-dvi-am install-exec install-exec-am install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags uninstall uninstall-am \ -+ uninstall-binPROGRAMS - --install-exec-hook: -- $(INSTALL) genssl.sh $(DESTDIR)$(bindir) - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: 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 2008-06-20 11:26:04.000000000 +0100 +++ ircd-ratbox-devel/files/pkg-message.in 2008-06-20 21:02:13.000000000 +0100 @@ -17,5 +17,11 @@ %%PREFIX%%/etc/rc.d/ircd-ratbox conftest +An update of the ban.db database may be necessary when upgrading between +ircd versions. You must perform this update manually using 'bantool -u' +while no ircd is running and before starting the newer version. + + %%PREFIX%%/bin/bantool -u + Be sure to check out 'ratbox-services' if you need a services package. ------------------------------------------------------------------------ diff -ruN ircd-ratbox-devel.orig/pkg-plist ircd-ratbox-devel/pkg-plist --- ircd-ratbox-devel.orig/pkg-plist 2008-06-20 11:26:05.000000000 +0100 +++ ircd-ratbox-devel/pkg-plist 2008-06-20 11:37:34.000000000 +0100 @@ -1,10 +1,11 @@ -bin/bandb -bin/bantool -bin/ident bin/ircd -bin/mkpasswd -bin/resolver -bin/ssld +bin/ratbox-mkpasswd +bin/bantool +bin/ratbox-sqlite3 +libexec/ircd-ratbox/bandb +libexec/ircd-ratbox/ident +libexec/ircd-ratbox/resolver +libexec/ircd-ratbox/ssld %%DATADIR%%/help/opers/accept %%DATADIR%%/help/opers/admin %%DATADIR%%/help/opers/away @@ -192,6 +193,7 @@ lib/ircd-ratbox/modules/autoload/m_whois.so lib/ircd-ratbox/modules/autoload/m_whowas.so lib/ircd-ratbox/modules/autoload/m_xline.so +lib/ircd-ratbox/modules/contrib/example_module.so lib/ircd-ratbox/modules/contrib/m_42.so lib/ircd-ratbox/modules/contrib/m_clearchan.so lib/ircd-ratbox/modules/contrib/m_flags.so @@ -221,6 +223,7 @@ lib/ircd-ratbox/modules/m_quit.so lib/ircd-ratbox/modules/m_server.so lib/ircd-ratbox/modules/m_squit.so +@dirrm libexec/ircd-ratbox @dirrm lib/ircd-ratbox/modules/autoload @dirrm lib/ircd-ratbox/modules/contrib @dirrm lib/ircd-ratbox/modules @@ -229,6 +232,7 @@ @dirrm %%DATADIR%%/help/opers @dirrm %%DATADIR%%/help @dirrm %%DATADIR%% +etc/ircd-ratbox/genssl.sh etc/ircd-ratbox/ircd-efnet.conf.sample @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 --- ircd-ratbox-devel-3.0.0beta5.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?20080620205256.10DF826D055>