Upgrade to irrd-2.2.3:

- RPSLng and IPv6 support

4 files changed, 58 insertions, 49 deletions

diff --git a/net/irrd/Makefile b/net/irrd/Makefile
index 0dc54de9a13..672be4a63e1 100644
--- a/net/irrd/Makefile
+++ b/net/irrd/Makefile
@@ -1,35 +1,44 @@
-# $NetBSD: Makefile,v 1.24 2004/12/31 21:38:52 kristerw Exp $
+# $NetBSD: Makefile,v 1.25 2004/12/31 22:31:51 kim Exp $
 
-DISTNAME=	irrd2.1.5
-PKGNAME=	irrd-2.1.5
-PKGREVISION=	2
-CATEGORIES=	net
-MASTER_SITES=	http://www.irrd.net/ \
-		ftp://ftp.merit.edu/radb/irrd/ \
-		ftp://ftp.merit.edu/radb/irrd/old_releases/
-EXTRACT_SUFX=	.tgz
+DISTNAME=		irrd2.2.3
+PKGNAME=		irrd-2.2.3
+CATEGORIES=		net
+MASTER_SITES=		http://www.irrd.net/ \
+			ftp://ftp.merit.edu/radb/irrd/ \
+			ftp://ftp.merit.edu/radb/irrd/old_releases/
+EXTRACT_SUFX=		.tgz
 
-MAINTAINER=	kim@tac.nyc.ny.us
-HOMEPAGE=	http://www.irrd.net/
-COMMENT=	Internet Routing Registry Daemon
+MAINTAINER=		kim@tac.nyc.ny.us
+HOMEPAGE=		http://www.irrd.net/
+COMMENT=		Internet Routing Registry Daemon
 
-DEPENDS+=	gnupg-[0-9]*:../../security/gnupg
-DEPENDS+=	wget-[0-9]*:../../net/wget
+DEPENDS+=		gnupg-[0-9]*:../../security/gnupg
+DEPENDS+=		wget-[0-9]*:../../net/wget
 
-USE_PERL5=	# defined
+USE_BUILDLINK3=		YES
+USE_PERL5=		# defined
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-gdbm
-CONFIGURE_ARGS+=--disable-thread
-CONFIGURE_ENV+=	YACC=bison
+WRKSRC=			${WRKDIR}/${DISTNAME}/src
 
-BUILD_DEFS+=	USE_INET6
+PTHREAD_AUTO_VARS=	yes
+PTHREAD_OPTS+=		require
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-CFLAGS+=	-g
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-thread
+CONFIGURE_ENV+=		EGREP=${EGREP}
+CONFIGURE_ENV+=		YACC=${YACC}
 
-IRRD_CACHER=	irrdcacher ripe2rpsl update_source
+BUILD_DEFS+=		USE_INET6
+
+CPPFLAGS+=		-I${LOCALBASE}/include
+CFLAGS+=		-g
+
+IRRD_CACHER=		irrdcacher ripe2rpsl
+
+.include "../../mk/automake.mk"
+
+pre-configure:
+	cd ${WRKSRC} && ${ACLOCAL} && ${AUTOHEADER} && ${AUTOCONF}
 
 post-build:
 	@cd ${WRKSRC}/programs/irrdcacher ; \
@@ -37,7 +46,7 @@ post-build:
 	for i in ${IRRD_CACHER} ; \
 	do \
 	    ${MV} $$i $$i.bak ; \
-	    ${SED} -e 's%/usr/bin/perl%${PERL5}%' < $$i.bak > $$i ; \
+	    ${SED} -e 's,/usr/bin/perl,${PERL5},' < $$i.bak > $$i ; \
 	done
 
 post-install:
@@ -58,4 +67,5 @@ post-install:
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/irrd/PLIST b/net/irrd/PLIST
index ff9ef667264..438933d48af 100644
--- a/net/irrd/PLIST
+++ b/net/irrd/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2002/09/01 15:30:11 kim Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/12/31 22:31:51 kim Exp $
 man/man8/irrd.8
-sbin/irr_check
 sbin/irr_notify
+sbin/irr_rpsl_check
 sbin/irr_rpsl_submit
 sbin/irrd
 sbin/irrdcacher
 sbin/ripe2rpsl
-sbin/update_source
diff --git a/net/irrd/distinfo b/net/irrd/distinfo
index e69901004cb..74ca7a2e1bf 100644
--- a/net/irrd/distinfo
+++ b/net/irrd/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2004/12/31 21:38:52 kristerw Exp $
+$NetBSD: distinfo,v 1.6 2004/12/31 22:31:51 kim Exp $
 
-SHA1 (irrd2.1.5.tgz) = eae93456058b5449d1a11ff88f609167a116bac8
-Size (irrd2.1.5.tgz) = 761652 bytes
-SHA1 (patch-aa) = e5a3a00c781af7d072de9f43ccf9a6c66c85f65d
+SHA1 (irrd2.2.3.tgz) = 5f1ceb19c630146f5325d475bdf2e04eb5ef187c
+Size (irrd2.2.3.tgz) = 689216 bytes
+SHA1 (patch-aa) = 2a2b77842047d870e926cea86010adda7b4ad2af
diff --git a/net/irrd/patches/patch-aa b/net/irrd/patches/patch-aa
index f77d980914c..ab27090263e 100644
--- a/net/irrd/patches/patch-aa
+++ b/net/irrd/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.5 2004/12/31 21:38:52 kristerw Exp $
-
---- configure.orig	Fri Dec 31 21:48:06 2004
-+++ configure	Fri Dec 31 21:48:59 2004
-@@ -1036,12 +1036,6 @@
-   disable_thread=yes
- fi;
- 
--# Check whether --enable-thread or --disable-thread was given.
--if test "${enable_thread+set}" = set; then
--  enableval="$enable_thread"
--  disable_thread=no
--fi;
--
- # Check whether --enable-wall or --disable-wall was given.
- if test "${enable_wall+set}" = set; then
-   enableval="$enable_wall"
+--- configure.in.orig	2003-11-17 15:29:46.000000000 -0500
++++ configure.in	2004-12-31 17:19:53.000000000 -0500
+@@ -120,7 +120,13 @@
+                 THREAD_CFLAGS="-D_THREAD_SAFE -pthread"
+         fi
+ 	CRYPT_LIB="-lcrypt"
+-        ac_pthrlib="c_r"
++	case "${host_os}" in
++	    netbsd* )
++	    ;;
++	    * )
++		ac_pthrlib="c_r"
++	    ;;
++	esac
+     ;;
+     linux* )
+ 	CRYPT_LIB="-lcrypt"