Change remoteinc to depend on net/libcares as opposed to wip/c-ares

Fix patch-aa so libcares is properly detected
Fix options.mk so that libcurl is properly detected
Use PKG_OPTIONS_OPTIONAL_GROUPS as suggesed by wiz@ in private email
Use PKG_OPTIONS_REQUIRED_GROUPS for hub/leaf choice
Bump to nb1

4 files changed, 27 insertions, 20 deletions

diff --git a/chat/unrealircd/Makefile b/chat/unrealircd/Makefile
index 20927df5e24..5334bde0697 100644
--- a/chat/unrealircd/Makefile
+++ b/chat/unrealircd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2005/11/29 21:11:55 adrianp Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/01 18:09:37 adrianp Exp $
 
 DISTNAME=	Unreal3.2.3
 PKGNAME=	unrealircd-3.2.3
+PKGREVISION=	1
 CATEGORIES=	chat
 MASTER_SITES=	http://unreal.atlanti-ka.org/
 
@@ -72,9 +73,9 @@ RCD_SCRIPTS=	unrealircd
 
 MESSAGE_SRC+=	${WRKDIR}/.MESSAGE_SRC
 MESSAGE_SUBST+=	UIRCD_HOME=${UIRCD_HOME}
-FILES_SUBST+=	UIRCD_HOME=${UIRCD_HOME}
-FILES_SUBST+=	UIRCD_USER=${UIRCD_USER}
-FILES_SUBST+=	UIRCD_GROUP=${UIRCD_GROUP}
+FILES_SUBST+=	UIRCD_HOME=${UIRCD_HOME:Q}
+FILES_SUBST+=	UIRCD_USER=${UIRCD_USER:Q}
+FILES_SUBST+=	UIRCD_GROUP=${UIRCD_GROUP:Q}
 
 SUBST_CLASSES+=		homedir
 SUBST_STAGE.homedir=	post-patch
diff --git a/chat/unrealircd/distinfo b/chat/unrealircd/distinfo
index de9e6ec724e..180924de7c8 100644
--- a/chat/unrealircd/distinfo
+++ b/chat/unrealircd/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/11/29 19:17:03 adrianp Exp $
+$NetBSD: distinfo,v 1.2 2005/12/01 18:09:37 adrianp Exp $
 
 SHA1 (Unreal3.2.3.tar.gz) = 5820906434f0c9e2cd027882e85900a919a2065d
 RMD160 (Unreal3.2.3.tar.gz) = e304e58457847fd371216d2e68293f7daad08dd5
 Size (Unreal3.2.3.tar.gz) = 1881275 bytes
-SHA1 (patch-aa) = 78a5796a00d9285e982bd46b58523b7b59ef70e1
+SHA1 (patch-aa) = 70dbd3e7c40f8be5e8e5f759845d9100770c269a
 SHA1 (patch-ab) = b66ae1990e25479abe9087a9308a2185692fcba2
diff --git a/chat/unrealircd/options.mk b/chat/unrealircd/options.mk
index be1d5a7682b..9888694895e 100644
--- a/chat/unrealircd/options.mk
+++ b/chat/unrealircd/options.mk
@@ -1,6 +1,11 @@
-# $NetBSD: options.mk,v 1.2 2005/11/29 21:11:55 adrianp Exp $
+# $NetBSD: options.mk,v 1.3 2005/12/01 18:09:37 adrianp Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.unrealircd
+
+PKG_OPTIONS_REQUIRED_GROUPS= role
+PKG_OPTIONS_OPTIONAL_GROUPS= role
+PKG_OPTIONS_GROUP.role= leaf hub
+
 PKG_SUPPORTED_OPTIONS=	inet6 nospoof hub leaf ziplinks remoteinc ssl chroot
 PKG_SUPPORTED_OPTIONS+=	prefixaq showlistmodes topicisnuhost shunnotices
 PKG_SUPPORTED_OPTIONS+=	no-operoverride disableusermod operoverride-verify
@@ -9,14 +14,6 @@ PKG_SUGGESTED_OPTIONS=	hub showlistmodes
 .include "../../mk/bsd.options.mk"
 
 ###
-### Can't be both a leaf and a hub IRC server
-###
-.if !empty(PKG_OPTIONS:Mhub) && !empty(PKG_OPTIONS:Mleaf)
-PKG_FAIL_REASON+=	"The server cannot be both a hub and a leaf." \
-			"Please change ${PKG_OPTIONS_VAR} to one or the other."
-.endif
-
-###
 ### Enable IPv6 support
 ###
 .if !empty(PKG_OPTIONS:Minet6)
@@ -63,9 +60,9 @@ CONFIGURE_ARGS+=		--enable-ziplinks
 ### Compile in support for remote include files.
 ###
 .if !empty(PKG_OPTIONS:Mremoteinc)
-CONFIGURE_ARGS+=		--enable-libcurl
+CONFIGURE_ARGS+=		--enable-libcurl=${PREFIX}
 .	include "../../www/curl/buildlink3.mk"
-.	include "../../wip/c-ares/buildlink3.mk"
+.	include "../../net/libcares/buildlink3.mk"
 .endif
 
 ###
@@ -81,7 +78,7 @@ CFLAGS+=	-DCHROOTDIR
 ###
 ### Enable prefixes for chanadmin and chanowner.
 ### This will give +a the & prefix and ~ for +q (just like +o is @)
-### Supported by the major clients: 
+### Supported by the major clients:
 ###	mIRC, xchat, epic, eggdrop, Klient, PJIRC, etc.
 ### with the notable exceptions of:
 ###	irssi, KVIrc and CGI:IRC.
diff --git a/chat/unrealircd/patches/patch-aa b/chat/unrealircd/patches/patch-aa
index 88e00d5c41f..d2fd6468ac6 100644
--- a/chat/unrealircd/patches/patch-aa
+++ b/chat/unrealircd/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/11/29 19:17:03 adrianp Exp $
+$NetBSD: patch-aa,v 1.2 2005/12/01 18:09:37 adrianp Exp $
 
---- configure.orig	2005-03-25 09:51:47.000000000 +0000
+--- configure.orig	2005-03-13 21:02:17.000000000 +0000
 +++ configure
+@@ -10221,7 +10221,7 @@ if test "${enable_libcurl+set}" = set; t
+ 		CURLLIBS=`$enableval/bin/curl-config --libs`
+ 
+ 				if test "x`echo $CURLLIBS |grep .*ares.*`" = x ; then
+-			CURLLIBS="$CURLLIBS -lares"
++			CURLLIBS="$CURLLIBS -lcares"
+ 		fi
+ 		IRCDLIBS="$IRCDLIBS $CURLLIBS"
+ 		URL="url.o"
 @@ -10614,39 +10614,6 @@ IRCDLIBS="$IRCDLIBS -lresolv "
  ;;
  esac