update to 3.2.9

from the announcement:
There have been 212 changes since previous release which is almost the
Same as previous THREE stable releases combined.
The changes consist of the usual amount of bugfixes, however also a
substantial amount of new features have been added.

pkgsrc note: This removes the dependencies on fixed (old) versions
of tre and c-ares.

5 files changed, 14 insertions, 129 deletions

diff --git a/chat/unrealircd/Makefile b/chat/unrealircd/Makefile
index 8fe2a6dd140..3edbf21866a 100644
--- a/chat/unrealircd/Makefile
+++ b/chat/unrealircd/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2012/02/16 16:08:15 hans Exp $
+# $NetBSD: Makefile,v 1.33 2012/04/25 15:55:42 drochner Exp $
 
-DISTNAME=	Unreal3.2.8.1
-PKGNAME=	unrealircd-3.2.8.1
-PKGREVISION=	1
+DISTNAME=	Unreal3.2.9
+PKGNAME=	unrealircd-3.2.9
 CATEGORIES=	chat
 MASTER_SITES=	http://unrealircd.com/downloads/
 
@@ -16,23 +15,15 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	pkg-config gmake
-TRE_NEEDED=	0.7.5
-CARES_NEEDED=	1.6.0
 
 CHECK_PORTABILITY_SKIP=	update
 
 WRKSRC=		${WRKDIR}/Unreal3.2
 
-BUILDLINK_API_DEPENDS.tre+=		tre>=${TRE_NEEDED}
-BUILDLINK_API_DEPENDS.libcares+=	libcares-${CARES_NEEDED}
-
 .include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ENV+=		tre_version=${TRE_NEEDED:Q}
-CONFIGURE_ENV+=		TREINCDIR=-I${BUILDLINK_PREFIX.tre}/include
-CONFIGURE_ENV+=		cares_version=${CARES_NEEDED:Q}
-CONFIGURE_ENV+=		CARESINCDIR='${BUILDLINK_PREFIX.libcares}/include'
-CONFIGURE_ENV+=		CARESLIBDIR='-L${BUILDLINK_PREFIX.libcares}/lib'
+CONFIGURE_ARGS+=	--with-system-cares
+CONFIGURE_ARGS+=	--with-system-tre
 
 CONFIGURE_ARGS+=	--with-dpath=${UIRCD_HOME:Q}
 CONFIGURE_ARGS+=	--with-spath=${PREFIX:Q}/sbin/ircd
diff --git a/chat/unrealircd/PLIST b/chat/unrealircd/PLIST
index 6fe32998bc6..994d3b369da 100644
--- a/chat/unrealircd/PLIST
+++ b/chat/unrealircd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2010/07/25 13:18:52 obache Exp $
+@comment $NetBSD: PLIST,v 1.9 2012/04/25 15:55:42 drochner Exp $
 sbin/ircd
 share/doc/unrealircd/Authors
 share/doc/unrealircd/LICENSE
@@ -23,6 +23,7 @@ share/examples/unrealircd/example.ru.conf
 share/examples/unrealircd/example.tr.conf
 share/unrealircd/aliases/aliases.conf
 share/unrealircd/aliases/anope.conf
+share/unrealircd/aliases/atheme.conf
 share/unrealircd/aliases/auspice.conf
 share/unrealircd/aliases/cygnus.conf
 share/unrealircd/aliases/epona.conf
@@ -64,6 +65,7 @@ share/unrealircd/modules/m_help.so
 share/unrealircd/modules/m_htm.so
 share/unrealircd/modules/m_invite.so
 share/unrealircd/modules/m_ison.so
+share/unrealircd/modules/m_issecure.so
 share/unrealircd/modules/m_join.so
 share/unrealircd/modules/m_kick.so
 share/unrealircd/modules/m_kill.so
@@ -82,6 +84,7 @@ share/unrealircd/modules/m_nachat.so
 share/unrealircd/modules/m_names.so
 share/unrealircd/modules/m_netinfo.so
 share/unrealircd/modules/m_nick.so
+share/unrealircd/modules/m_nopost.so
 share/unrealircd/modules/m_oper.so
 share/unrealircd/modules/m_opermotd.so
 share/unrealircd/modules/m_part.so
@@ -106,6 +109,7 @@ share/unrealircd/modules/m_silence.so
 share/unrealircd/modules/m_sjoin.so
 share/unrealircd/modules/m_sqline.so
 share/unrealircd/modules/m_squit.so
+share/unrealircd/modules/m_starttls.so
 share/unrealircd/modules/m_stats.so
 share/unrealircd/modules/m_svsfline.so
 share/unrealircd/modules/m_svsjoin.so
diff --git a/chat/unrealircd/distinfo b/chat/unrealircd/distinfo
index 4872e1a611a..26494998531 100644
--- a/chat/unrealircd/distinfo
+++ b/chat/unrealircd/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.12 2010/07/25 13:18:52 obache Exp $
+$NetBSD: distinfo,v 1.13 2012/04/25 15:55:42 drochner Exp $
 
-SHA1 (Unreal3.2.8.1.tar.gz) = 363c3c995bb38cf601f409610ce1937a0002c419
-RMD160 (Unreal3.2.8.1.tar.gz) = c8e76239e33ba170743f2ddae6bc24782064f105
-Size (Unreal3.2.8.1.tar.gz) = 2866456 bytes
-SHA1 (patch-aa) = f175b1a235e3c802943fd38015dda44c8872cfff
+SHA1 (Unreal3.2.9.tar.gz) = 0bb9d84ce6e4a395fda86e7d6250b7016cfeb913
+RMD160 (Unreal3.2.9.tar.gz) = fb910f2a87ee4fdfd5a2d293303b0085b7657352
+Size (Unreal3.2.9.tar.gz) = 3064571 bytes
 SHA1 (patch-ab) = b66ae1990e25479abe9087a9308a2185692fcba2
 SHA1 (patch-ac) = 4c3e7219d03e93c2a3e8f735c350d919efdf8fbb
-SHA1 (patch-ad) = 3bef7c197efb59def9e77114ad9356ef2f23fa26
 SHA1 (patch-ae) = dc5f4d080d1027e229f9817d1d4f1e501124f7ba
 SHA1 (patch-af) = 28d622375362bc77ec44ea6a3b1f3a0d05c60ce5
diff --git a/chat/unrealircd/patches/patch-aa b/chat/unrealircd/patches/patch-aa
deleted file mode 100644
index 39b99779a69..00000000000
--- a/chat/unrealircd/patches/patch-aa
+++ /dev/null
@@ -1,92 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2010/07/25 13:18:52 obache Exp $
-
---- configure.orig	2009-03-01 18:37:55.000000000 +0000
-+++ configure
-@@ -12957,70 +12957,12 @@ IRCDLIBS="$IRCDLIBS -lresolv "
- ;;
- esac
- 
--tre_version="0.7.5"
--{ echo "$as_me:$LINENO: result: extracting TRE regex library" >&5
--echo "${ECHO_T}extracting TRE regex library" >&6; }
--cur_dir=`pwd`
--cd extras
--rm -rf tre-$tre_version
--if test "x$ac_cv_path_GUNZIP" = "x" ; then
--	tar xfz tre.tar.gz
--else
--	cp tre.tar.gz tre.tar.gz.bak
--	gunzip -f tre.tar.gz
--	cp tre.tar.gz.bak tre.tar.gz
--	tar xf tre.tar
--fi
--{ echo "$as_me:$LINENO: result: configuring TRE regex library" >&5
--echo "${ECHO_T}configuring TRE regex library" >&6; }
--cd tre-$tre_version
--./configure --disable-agrep --disable-shared --disable-system-abi --disable-wchar --disable-multibyte --prefix=$cur_dir/extras/regexp || exit 1
--{ echo "$as_me:$LINENO: result: compiling TRE regex library" >&5
--echo "${ECHO_T}compiling TRE regex library" >&6; }
--$ac_cv_prog_MAKER || exit 1
--{ echo "$as_me:$LINENO: result: installing TRE regex library" >&5
--echo "${ECHO_T}installing TRE regex library" >&6; }
--$ac_cv_prog_MAKER install || exit 1
--TREINCDIR="$cur_dir/extras/regexp/include"
--
- if test "x$ac_cv_path_PKGCONFIG" = "x" ; then
- 	TRELIBS="-L../extras/regexp/lib -ltre"
- else
--	TRELIBS=`$ac_cv_path_PKGCONFIG --libs tre.pc`
-+	TRELIBS=`$ac_cv_path_PKGCONFIG --libs tre`
- fi
- 
--cd $cur_dir
--
--
--cares_version="1.6.0"
--{ echo "$as_me:$LINENO: result: extracting c-ares resolver library" >&5
--echo "${ECHO_T}extracting c-ares resolver library" >&6; }
--cur_dir=`pwd`
--cd extras
--rm -rf c-ares-$cares_version
--if test "x$ac_cv_path_GUNZIP" = "x" ; then
--	tar xfz c-ares.tar.gz
--else
--	cp c-ares.tar.gz c-ares.tar.gz.bak
--	gunzip -f c-ares.tar.gz
--	cp c-ares.tar.gz.bak c-ares.tar.gz
--	tar xf c-ares.tar
--fi
--{ echo "$as_me:$LINENO: result: configuring c-ares library" >&5
--echo "${ECHO_T}configuring c-ares library" >&6; }
--cd c-ares-$cares_version
--./configure --prefix=$cur_dir/extras/c-ares || exit 1
--{ echo "$as_me:$LINENO: result: compiling c-ares resolver library" >&5
--echo "${ECHO_T}compiling c-ares resolver library" >&6; }
--$ac_cv_prog_MAKER || exit 1
--{ echo "$as_me:$LINENO: result: installing c-ares resolver library" >&5
--echo "${ECHO_T}installing c-ares resolver library" >&6; }
--$ac_cv_prog_MAKER install || exit 1
--CARESINCDIR="$cur_dir/extras/c-ares/include"
--
--CARESLIBDIR="-L../extras/c-ares/lib"
--
--
- CARESLIBSALT="-lcares"
- case `uname -s` in
- *FreeBSD*)
-@@ -13034,14 +12976,12 @@ esac
- if test "x$ac_cv_path_PKGCONFIG" = "x" ; then
- 	CARESLIBS="$CARESLIBSALT"
- else
--	CARESLIBS="`$ac_cv_path_PKGCONFIG --static --libs libcares.pc`"
-+	CARESLIBS="`$ac_cv_path_PKGCONFIG --libs libcares`"
- 	if test "x$CARESLIBS" = "x" ; then
- 		CARESLIBS="$CARESLIBSALT"
- 	fi
- fi
- 
--cd $cur_dir
--
- 
- ac_config_files="$ac_config_files Makefile src/modules/Makefile unreal ircdcron/ircdchk"
- 
diff --git a/chat/unrealircd/patches/patch-ad b/chat/unrealircd/patches/patch-ad
deleted file mode 100644
index 56e8205ebbb..00000000000
--- a/chat/unrealircd/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/12/16 15:52:03 joerg Exp $
-
---- include/sys.h.orig	2005-03-13 21:02:46.000000000 +0000
-+++ include/sys.h
-@@ -43,11 +43,7 @@
- #ifdef ISC202
- #include <net/errno.h>
- #else
--# ifndef _WIN32
--#include <sys/errno.h>
--# else
- #include <errno.h>
--# endif
- #endif
- #include "setup.h"
- #include <stdio.h>