- Update to 3.2.6

PR:		ports/107458
Submitted by:	Gerrit Beine<gerrit.beine@gmx.de> (maintainer)

4 files changed, 87 insertions, 36 deletions

diff --git a/irc/unreal/Makefile b/irc/unreal/Makefile
index 1b5e18bdf204..8f679c078e23 100644
--- a/irc/unreal/Makefile
+++ b/irc/unreal/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	Unreal
-PORTVERSION=	3.2.5
-PORTREVISION=	1
+PORTVERSION=	3.2.6
 CATEGORIES=	irc ipv6
 MASTER_SITES=	http://www.ilmarinen.us/unreal/ \
 		http://unrealircd.alert-net.com/ \
@@ -135,19 +134,20 @@ post-patch:
 do-install:
 	${INSTALL} -m 0700 ${WRKSRC}/src/ircd ${PREFIX}/libexec/ircd
 	${MKDIR} ${MODULESDIR}
-	${MKDIR} ${CONFIGDIR}
-	${MKDIR} ${CONFIGDIR}/aliases
+	${MKDIR} ${CONFIGDIR} || true
+	${MKDIR} ${CONFIGDIR}/aliases || true
+	${MKDIR} ${EXAMPLESDIR}/aliases
 	${MKDIR} ${DATADIR}/networks
 	${MKDIR} ${RUNDIR}/tmp
 	${MKDIR} ${LOGDIR}
 	${TOUCH} ${CONFIGDIR}/ircd.motd
 	${TOUCH} ${CONFIGDIR}/ircd.rules
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/badwords.*.conf ${CONFIGDIR}
-	${INSTALL_DATA} ${WRKSRC}/help.conf ${CONFIGDIR}
-	${INSTALL_DATA} ${WRKSRC}/spamfilter.conf ${CONFIGDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/example.conf ${CONFIGDIR}/unrealircd.conf
-	${INSTALL_DATA} ${WRKSRC}/aliases/*.conf ${CONFIGDIR}/aliases
+	${INSTALL_DATA} ${WRKSRC}/badwords.*.conf ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/help.conf ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/spamfilter.conf ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/example.conf ${EXAMPLESDIR}/unrealircd.conf
+	${INSTALL_DATA} ${WRKSRC}/aliases/*.conf ${EXAMPLESDIR}/aliases
 	${INSTALL_DATA} ${WRKSRC}/networks/*.network ${DATADIR}/networks
 	${INSTALL_DATA} ${WRKSRC}/networks/networks.ndx ${DATADIR}/networks
 	${INSTALL_SCRIPT} ${WRKSRC}/networks/makenet ${DATADIR}/networks
@@ -160,6 +160,21 @@ do-install:
 .endif
 
 post-install:
+	@[ -f ${CONFIGDIR}/aliases/aliases.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/aliases/aliases.conf ${CONFIGDIR}/aliases
+	@[ -f ${CONFIGDIR}/aliases/anope.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/aliases/anope.conf ${CONFIGDIR}/aliases
+	@[ -f ${CONFIGDIR}/aliases/auspice.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/aliases/auspice.conf ${CONFIGDIR}/aliases
+	@[ -f ${CONFIGDIR}/aliases/cygnus.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/aliases/cygnus.conf ${CONFIGDIR}/aliases
+	@[ -f ${CONFIGDIR}/aliases/epona.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/aliases/epona.conf ${CONFIGDIR}/aliases
+	@[ -f ${CONFIGDIR}/aliases/generic.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/aliases/generic.conf ${CONFIGDIR}/aliases
+	@[ -f ${CONFIGDIR}/aliases/genericstats.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/aliases/genericstats.conf ${CONFIGDIR}/aliases
+	@[ -f ${CONFIGDIR}/aliases/ircservices.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/aliases/ircservices.conf ${CONFIGDIR}/aliases
+	@[ -f ${CONFIGDIR}/aliases/operstats.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/aliases/operstats.conf ${CONFIGDIR}/aliases
+	@[ -f ${CONFIGDIR}/badwords.channel.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/badwords.channel.conf ${CONFIGDIR}
+	@[ -f ${CONFIGDIR}/badworks.message.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/badwords.message.conf ${CONFIGDIR}
+	@[ -f ${CONFIGDIR}/badwords.quit.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/badwords.quit.conf ${CONFIGDIR}
+	@[ -f ${CONFIGDIR}/help.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/help.conf ${CONFIGDIR}
+	@[ -f ${CONFIGDIR}/spamfilter.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/spamfilter.conf ${CONFIGDIR}
+	@[ -f ${CONFIGDIR}/unrealircd.conf ] || ${INSTALL_DATA} ${EXAMPLESDIR}/unrealircd.conf ${CONFIGDIR}
 .if defined(WITH_SQLMOD)
 	@${CP} ${WRKSRC}/SQLMod/sample.conf ${CONFIGDIR}/m_sqlmod.conf
 	@${CP} ${WRKSRC}/SQLMod/Changes ${DOCSDIR}/Changes.sqlmod
diff --git a/irc/unreal/distinfo b/irc/unreal/distinfo
index dc387c069dd1..a16efa0a840b 100644
--- a/irc/unreal/distinfo
+++ b/irc/unreal/distinfo
@@ -1,3 +1,3 @@
-MD5 (Unreal3.2.5.tar.gz) = 9f63e1f6c14fc9208a31a44ef83ae331
-SHA256 (Unreal3.2.5.tar.gz) = bce0f20aacbbe9f9d53b1e123a58435af669b1f9f1ece9947a16581d2fb5d118
-SIZE (Unreal3.2.5.tar.gz) = 2546977
+MD5 (Unreal3.2.6.tar.gz) = 611ad9a3c524204b0d382409a09abf6c
+SHA256 (Unreal3.2.6.tar.gz) = 8ff7e15af2c2d588685cf140540dbf457c9222aa9b6a8f3fc8bd6db9c963a631
+SIZE (Unreal3.2.6.tar.gz) = 2629046
diff --git a/irc/unreal/files/patch-configure b/irc/unreal/files/patch-configure
index 4465ac722f8f..d107f1c45a13 100644
--- a/irc/unreal/files/patch-configure
+++ b/irc/unreal/files/patch-configure
@@ -1,10 +1,11 @@
---- configure.orig	Tue Dec  5 15:55:45 2006
-+++ configure	Tue Dec  5 15:59:10 2006
-@@ -12701,34 +12701,6 @@
- cd $cur_dir
+--- configure.orig	Fri Dec 22 22:10:28 2006
++++ configure	Wed Jan  3 09:59:42 2007
+@@ -12700,35 +12700,6 @@
  
+ cd $cur_dir
  
--cares_version="1.3.0"
+-
+-cares_version="1.3.2"
 -echo "$as_me:$LINENO: result: extracting c-ares resolver library" >&5
 -echo "${ECHO_T}extracting c-ares resolver library" >&6
 -cur_dir=`pwd`
diff --git a/irc/unreal/pkg-plist b/irc/unreal/pkg-plist
index 5933cc899bd4..ea114fc85f1f 100644
--- a/irc/unreal/pkg-plist
+++ b/irc/unreal/pkg-plist
@@ -1,3 +1,52 @@
+@exec mkdir -p %D/etc/Unreal 2> /dev/null
+@exec mkdir -p %D/etc/Unreal/aliases 2> /dev/null
+@unexec if cmp -s %D/etc/Unreal/aliases/aliases.conf %D/%%EXAMPLESDIR%%/aliases/aliases.conf; then rm -f %D/etc/Unreal/aliases/aliases.conf; fi
+%%EXAMPLESDIR%%/aliases/aliases.conf
+@exec [ -f %D/etc/Unreal/aliases/aliases.conf ] || cp %D/%%EXAMPLESDIR%%/aliases/aliases.conf %D/etc/Unreal/aliases/aliases.conf
+@unexec if cmp -s %D/etc/Unreal/aliases/anope.conf %D/%%EXAMPLESDIR%%/aliases/anope.conf; then rm -f %D/etc/Unreal/aliases/anope.conf; fi
+%%EXAMPLESDIR%%/aliases/anope.conf
+@exec [ -f %D/etc/Unreal/aliases/anope.conf ] || cp %D/%%EXAMPLESDIR%%/aliases/anope.conf %D/etc/Unreal/aliases/anope.conf
+@unexec if cmp -s %D/etc/Unreal/aliases/auspice.conf %D/%%EXAMPLESDIR%%/aliases/auspice.conf; then rm -f %D/etc/Unreal/aliases/auspice.conf; fi
+%%EXAMPLESDIR%%/aliases/auspice.conf
+@exec [ -f %D/etc/Unreal/aliases/aliases.conf ] || cp %D/%%EXAMPLESDIR%%/aliases/aliases.conf %D/etc/Unreal/aliases/aliases.conf
+@unexec if cmp -s %D/etc/Unreal/aliases/cygnus.conf %D/%%EXAMPLESDIR%%/aliases/cygnus.conf; then rm -f %D/etc/Unreal/aliases/cygnus.conf; fi
+%%EXAMPLESDIR%%/aliases/cygnus.conf
+@exec [ -f %D/etc/Unreal/aliases/cygnus.conf ] || cp %D/%%EXAMPLESDIR%%/aliases/cygnus.conf %D/etc/Unreal/aliases/cygnus.conf
+@unexec if cmp -s %D/etc/Unreal/aliases/epona.conf %D/%%EXAMPLESDIR%%/aliases/epona.conf; then rm -f %D/etc/Unreal/aliases/epona.conf; fi
+%%EXAMPLESDIR%%/aliases/epona.conf
+@exec [ -f %D/etc/Unreal/aliases/epona.conf ] || cp %D/%%EXAMPLESDIR%%/aliases/epona.conf %D/etc/Unreal/aliases/epona.conf
+@unexec if cmp -s %D/etc/Unreal/aliases/generic.conf %D/%%EXAMPLESDIR%%/aliases/generic.conf; then rm -f %D/etc/Unreal/aliases/generic.conf; fi
+%%EXAMPLESDIR%%/aliases/generic.conf
+@exec [ -f %D/etc/Unreal/aliases/generic.conf ] || cp %D/%%EXAMPLESDIR%%/aliases/generic.conf %D/etc/Unreal/aliases/generic.conf
+@unexec if cmp -s %D/etc/Unreal/aliases/genericstats.conf %D/%%EXAMPLESDIR%%/aliases/genericstats.conf; then rm -f %D/etc/Unreal/aliases/genericstats.conf; fi
+%%EXAMPLESDIR%%/aliases/genericstats.conf
+@exec [ -f %D/etc/Unreal/aliases/genericstats.conf ] || cp %D/%%EXAMPLESDIR%%/aliases/genericstats.conf %D/etc/Unreal/aliases/genericstats.conf
+@unexec if cmp -s %D/etc/Unreal/aliases/ircservices.conf %D/%%EXAMPLESDIR%%/aliases/ircservices.conf; then rm -f %D/etc/Unreal/aliases/ircservices.conf; fi
+%%EXAMPLESDIR%%/aliases/ircservices.conf
+@exec [ -f %D/etc/Unreal/aliases/ircservices.conf ] || cp %D/%%EXAMPLESDIR%%/aliases/ircservices.conf %D/etc/Unreal/aliases/ircservices.conf
+@unexec if cmp -s %D/etc/Unreal/aliases/operstats.conf %D/%%EXAMPLESDIR%%/aliases/operstats.conf; then rm -f %D/etc/Unreal/aliases/operstats.conf; fi
+%%EXAMPLESDIR%%/aliases/operstats.conf
+@exec [ -f %D/etc/Unreal/aliases/operstats.conf ] || cp %D/%%EXAMPLESDIR%%/aliases/operstats.conf %D/etc/Unreal/aliases/operstats.conf
+@unexec if cmp -s %D/etc/Unreal/badwords.channel.conf %D/%%EXAMPLESDIR%%/badwords.channel.conf; then rm -f %D/etc/Unreal/badwords.channel.conf; fi
+%%EXAMPLESDIR%%/badwords.channel.conf
+@exec [ -f %D/etc/Unreal/badwords.channel.conf ] || cp %D/%%EXAMPLESDIR%%/badwords.channel.conf %D/etc/Unreal/badwords.channel.conf
+@unexec if cmp -s %D/etc/Unreal/badwords.message.conf %D/%%EXAMPLESDIR%%/badwords.message.conf; then rm -f %D/etc/Unreal/badwords.message.conf; fi
+%%EXAMPLESDIR%%/badwords.message.conf
+@exec [ -f %D/etc/Unreal/badwords.message.conf ] || cp %D/%%EXAMPLESDIR%%/badwords.message.conf %D/etc/Unreal/badwords.message.conf
+@unexec if cmp -s %D/etc/Unreal/badwords.quit.conf %D/%%EXAMPLESDIR%%/badwords.quit.conf; then rm -f %D/etc/Unreal/badwords.quit.conf; fi
+%%EXAMPLESDIR%%/badwords.quit.conf
+@exec [ -f %D/etc/Unreal/badwords.quit.conf ] || cp %D/%%EXAMPLESDIR%%/badwords.quit.conf %D/etc/Unreal/badwords.quit.conf
+@unexec if cmp -s %D/etc/Unreal/help.conf %D/%%EXAMPLESDIR%%/help.conf; then rm -f %D/etc/Unreal/help.conf; fi
+%%EXAMPLESDIR%%/help.conf
+@exec [ -f %D/etc/Unreal/help.conf ] || cp %D/%%EXAMPLESDIR%%/help.conf %D/etc/Unreal/help.conf
+@unexec if cmp -s %D/etc/Unreal/spamfilter.conf %D/%%EXAMPLESDIR%%/spamfilter.conf; then rm -f %D/etc/Unreal/spamfilter.conf; fi
+%%EXAMPLESDIR%%/spamfilter.conf
+@exec [ -f %D/etc/Unreal/spamfilter.conf ] || cp %D/%%EXAMPLESDIR%%/spamfilter.conf %D/etc/Unreal/spamfilter.conf
+@unexec if cmp -s %D/etc/Unreal/unrealircd.conf %D/%%EXAMPLESDIR%%/unrealircd.conf; then rm -f %D/etc/Unreal/unrealircd.conf; fi
+%%EXAMPLESDIR%%/unrealircd.conf
+@exec [ -f %D/etc/Unreal/unrealircd.conf ] || cp %D/%%EXAMPLESDIR%%/unrealircd.conf %D/etc/Unreal/unrealircd.conf
+etc/Unreal/ircd.motd
+etc/Unreal/ircd.rules
 libexec/ircd
 %%DATADIR%%/LICENSE
 %%DATADIR%%/networks/awesomechristians.network
@@ -35,23 +84,6 @@ libexec/ircd
 %%DATADIR%%/networks/zirc.network
 %%DATADIR%%/networks/makenet
 %%DATADIR%%/networks/networks.ndx
-etc/Unreal/aliases/aliases.conf
-etc/Unreal/aliases/anope.conf
-etc/Unreal/aliases/auspice.conf
-etc/Unreal/aliases/cygnus.conf
-etc/Unreal/aliases/epona.conf
-etc/Unreal/aliases/generic.conf
-etc/Unreal/aliases/genericstats.conf
-etc/Unreal/aliases/ircservices.conf
-etc/Unreal/aliases/operstats.conf
-etc/Unreal/unrealircd.conf
-etc/Unreal/badwords.channel.conf
-etc/Unreal/badwords.message.conf
-etc/Unreal/badwords.quit.conf
-etc/Unreal/help.conf
-etc/Unreal/ircd.motd
-etc/Unreal/ircd.rules
-etc/Unreal/spamfilter.conf
 lib/Unreal/cloak.so
 lib/Unreal/commands.so
 lib/Unreal/m_addline.so
@@ -92,6 +124,7 @@ lib/Unreal/m_mkpasswd.so
 lib/Unreal/m_mode.so
 lib/Unreal/m_motd.so
 lib/Unreal/m_nachat.so
+lib/Unreal/m_names.so
 lib/Unreal/m_netinfo.so
 lib/Unreal/m_nick.so
 lib/Unreal/m_oper.so
@@ -167,6 +200,8 @@ lib/Unreal/m_whowas.so
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/networks
 @dirrm %%DATADIR%%
+@dirrm %%EXAMPLESDIR%%/aliases
+@dirrm %%EXAMPLESDIR%%
 @dirrm lib/Unreal
-@dirrm etc/Unreal/aliases
-@dirrm etc/Unreal
+@dirrmtry etc/Unreal/aliases
+@dirrmtry etc/Unreal