update irrd to version 2.3.9

fixes PR pkg/36813, PR pkg/38002, and the still relevant parts of pkg/36811
(IPv6 is no longer optional)

14 files changed, 337 insertions, 111 deletions

diff --git a/net/irrd/MESSAGE b/net/irrd/MESSAGE
new file mode 100644
index 00000000000..2b5a76bbb96
--- /dev/null
+++ b/net/irrd/MESSAGE
@@ -0,0 +1,6 @@
+===========================================================================
+
+The useful user documentation is ${PREFIX}/share/doc/irrd/irrd-user.pdf
+                              or ${PREFIX}/share/doc/irrd/irrd-user.sgml
+
+===========================================================================
diff --git a/net/irrd/Makefile b/net/irrd/Makefile
index b96b18508e9..48c7faffa88 100644
--- a/net/irrd/Makefile
+++ b/net/irrd/Makefile
@@ -1,55 +1,79 @@
-# $NetBSD: Makefile,v 1.41 2009/08/03 14:20:14 joerg Exp $
+# $NetBSD: Makefile,v 1.42 2010/02/23 20:37:05 spz Exp $
 
-DISTNAME=	irrd2.2.8
-PKGNAME=	irrd-2.2.8
-PKGREVISION=	2
-CATEGORIES=	net
-MASTER_SITES=	http://www.irrd.net/
-EXTRACT_SUFX=	.tgz
+DISTNAME=		irrd2.3.9
+PKGNAME=		irrd-2.3.9
+CATEGORIES=		net
+MASTER_SITES=		http://www.irrd.net/
+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
+LICENSE=		original-bsd
 
-MAKE_JOBS_SAFE=	no
+MAKE_JOBS_SAFE=		no
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-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_TOOLS+=		automake flex perl:run yacc
+USE_TOOLS+=		automake autoconf flex perl:run yacc
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.irrd
-PKG_SUPPORTED_OPTIONS=	inet6
+PKG_SYSCONFSUBDIR=	irrd
+EGDIR=			${PREFIX}/share/examples/irrd
+DOCDIR=			${PREFIX}/share/doc/irrd
+CONF_FILES+=		${EGDIR}/irrd.conf ${PKG_SYSCONFDIR}/irrd.conf
 
-.include "../../mk/bsd.options.mk"
+IRRD_USER=		irrd
+IRRD_GROUP=		irrd
 
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-thread
+PKG_GROUPS=		${IRRD_USER}
+PKG_USERS=		${IRRD_USER:Q}:${IRRD_GROUP:Q}
+PKG_GECOS.${IRRD_USER}=	IRRd user
+RCD_SCRIPTS+=		irrd
 
-#PTHREAD_AUTO_VARS=	yes
+GNU_CONFIGURE=		yes
+#CONFIGURE_ARGS+=	--enable-thread
 #PTHREAD_OPTS+=		require
-#.include "../../mk/pthread.buildlink3.mk"
 
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=	--enable-ipv6
-.else
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
+PTHREAD_AUTO_VARS=	yes
+.include "../../mk/pthread.buildlink3.mk"
 
 REPLACE_PERL+=		programs/irrdcacher/irrdcacher
 REPLACE_PERL+=		programs/irrdcacher/ripe2rpsl
 
-INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
+FILES_SUBST+=		VARBASE=${VARBASE:Q}
+FILES_SUBST+=		DOCDIR=${DOCDIR:Q}
+FILES_SUBST+=		IRRD_USER=${IRRD_USER:Q}
+FILES_SUBST+=		IRRD_GROUP=${IRRD_GROUP:Q}
+
+INSTALLATION_DIRS+=	${PKGMANDIR}/man8
+INSTALLATION_DIRS+=	sbin
+INSTALLATION_DIRS+=	${EGDIR}
+INSTALLATION_DIRS+=	${DOCDIR}
+
+OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/pgp ${IRRD_USER} ${IRRD_GROUP} 750
+OWN_DIRS_PERMS+=	${VARBASE}/irrd/db ${IRRD_USER} ${IRRD_GROUP} 755
+OWN_DIRS_PERMS+=	${VARBASE}/irrd/log ${IRRD_USER} ${IRRD_GROUP} 755
 
 pre-configure:
-	cd ${WRKSRC} && aclocal && autoheader && autoconf
+	cd ${WRKSRC} && ${RM} acconfig.h && autoreconf
+
+SUBST_CLASSES+=		confpaths
+SUBST_FILES.confpaths=	../samples/irrd.conf.sample
+SUBST_SED.confpaths=	-e 's,/var/spool/irr_database,'${VARBASE}'/irrd/db,'
+SUBST_SED.confpaths+=	-e 's,/var/log/irrd,'${VARBASE}'/irrd/log/irrd.log,'
+SUBST_STAGE.confpaths=	post-patch
 
 post-install:
-	cd ${WRKSRC}/programs/IRRd && ${MAKE} install-man
+	${INSTALL_DATA} ${WRKSRC}/../samples/irrd.conf.sample ${DESTDIR}${EGDIR}/irrd.conf
+	${INSTALL_DATA} ${WRKSRC}/../irrd-user.pdf ${DESTDIR}${DOCDIR}/irrd-user.pdf
+	${INSTALL_DATA} ${WRKSRC}/../irrd-user.sgml ${DESTDIR}${DOCDIR}/irrd-user.sgml
+	cd ${WRKSRC}/programs/IRRd && ${MAKE} DESTDIR=${DESTDIR} install-man
 	cd ${WRKSRC}/programs/irrdcacher && \
-	${INSTALL_SCRIPT} irrdcacher ${PREFIX}/sbin && \
-	${INSTALL_SCRIPT} ripe2rpsl ${PREFIX}/sbin
+	${INSTALL_SCRIPT} irrdcacher ${DESTDIR}${PREFIX}/sbin && \
+	${INSTALL_SCRIPT} ripe2rpsl ${DESTDIR}${PREFIX}/sbin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/irrd/PLIST b/net/irrd/PLIST
index 995ce282184..039c0831d54 100644
--- a/net/irrd/PLIST
+++ b/net/irrd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2006/05/29 16:14:25 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/02/23 20:37:05 spz Exp $
 man/man8/irrd.8
 sbin/irr_notify
 sbin/irrd
@@ -6,3 +6,7 @@ sbin/irr_rpsl_check
 sbin/irr_rpsl_submit
 sbin/irrdcacher
 sbin/ripe2rpsl
+share/examples/irrd/irrd.conf
+share/examples/rc.d/irrd
+share/doc/irrd/irrd-user.pdf
+share/doc/irrd/irrd-user.sgml
diff --git a/net/irrd/distinfo b/net/irrd/distinfo
index 8abe2c5f13f..0067e5b1191 100644
--- a/net/irrd/distinfo
+++ b/net/irrd/distinfo
@@ -1,9 +1,13 @@
-$NetBSD: distinfo,v 1.12 2009/04/07 17:58:19 hasso Exp $
+$NetBSD: distinfo,v 1.13 2010/02/23 20:37:05 spz Exp $
 
-SHA1 (irrd2.2.8.tgz) = cfaf5fb6e4abdd2bce8de0233231dd2514c5d111
-RMD160 (irrd2.2.8.tgz) = 74688380c6cdcc8ddaa5ebf8705c10922f02fb8b
-Size (irrd2.2.8.tgz) = 693852 bytes
-SHA1 (patch-aa) = 3059131bad8df2071ae64ea5e9d0c6f858a7ae2e
-SHA1 (patch-ab) = d9172a35b907dbaac24ef7b72fcce05310d674bd
-SHA1 (patch-ac) = 5ea304aad5a2b3a2e835e63ac58ebbb83f12a5c3
+SHA1 (irrd2.3.9.tgz) = 73281b1f73bfa2267535d70906ff35c266083ec2
+RMD160 (irrd2.3.9.tgz) = de212320204cde0d05abf848e952f8f1bf06503d
+Size (irrd2.3.9.tgz) = 777722 bytes
+SHA1 (patch-aa) = 5b7c5c9c2183c19b188a98017f526bf71904b1d5
 SHA1 (patch-ad) = 313a1d44c4623123f7c2a37ff2740887fa32bdb2
+SHA1 (patch-ae) = c012cd8e34f9b492bc03593b3598de030c04849b
+SHA1 (patch-af) = aa14907291184040f16561e01ecb9775bcecd702
+SHA1 (patch-ag) = 9b23300fcaf1b1a48547fff2501f1e81ba86ed0c
+SHA1 (patch-ah) = 74a5e88dd79385ebb7bb3cb7a3cd6da46d26fd54
+SHA1 (patch-ai) = d256698195bc90727c54ddb3f55c14e0e4f0437f
+SHA1 (patch-aj) = c357f5da9f127978263b22220ea11e3e650eaaf0
diff --git a/net/irrd/files/irrd.sh b/net/irrd/files/irrd.sh
new file mode 100644
index 00000000000..71069dfb797
--- /dev/null
+++ b/net/irrd/files/irrd.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# PROVIDE: irrd
+# REQUIRE: DAEMON
+
+name="irrd"
+
+if [ -f /etc/rc.subr ]; then
+	. /etc/rc.subr
+else
+	if [ -f @PREFIX@/etc/rc.subr ]; then
+		. @PREFIX@/etc/rc.subr
+	fi
+fi
+
+: ${irrd_conf:="@PKG_SYSCONFDIR@/irrd.conf"}
+
+rcvar=${name}
+required_files="${irrd_conf}"
+command="@PREFIX@/sbin/irrd"
+command_args="-f ${irrd_conf} -l @IRRD_USER@ -g @IRRD_GROUP@"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/net/irrd/patches/patch-aa b/net/irrd/patches/patch-aa
index 6475d9d76e2..08299212917 100644
--- a/net/irrd/patches/patch-aa
+++ b/net/irrd/patches/patch-aa
@@ -1,16 +1,17 @@
-$NetBSD: patch-aa,v 1.7 2004/12/31 23:01:33 kim Exp $
+$NetBSD: patch-aa,v 1.8 2010/02/23 20:37:06 spz Exp $
 
---- configure.in.orig	2003-11-17 15:29:46.000000000 -0500
-+++ configure.in	2004-12-31 17:55:25.000000000 -0500
-@@ -10,27 +10,23 @@
+--- configure.in.orig	2006-09-12 17:40:57.000000000 +0000
++++ configure.in
+@@ -11,23 +11,23 @@ dnl initializing defaults
  dnl I've seen a report that pthread support is shaky in FreeBSD 2.x releases
  case "${host_os}" in
      freebsd2* )
 -	disable_thread=yes
 +	enable_thread=no
      ;;
-     solaris*|linux*|freebsd* )
+-    solaris*|linux*|freebsd* )
 -	disable_thread=no
++    solaris*|linux*|freebsd*|dragonfly*|netbsd* )
 +	enable_thread=yes
      ;;
      * ) 
@@ -22,50 +23,73 @@ $NetBSD: patch-aa,v 1.7 2004/12/31 23:01:33 kim Exp $
  AC_ARG_ENABLE(thread,
  [  --disable-thread        disable thread always],
 -[disable_thread=yes],)
--
--AC_ARG_ENABLE(thread,
--[  --enable-thread         enable thread (on non-solaris platform)],
++[enable_thread=no],)
+ 
+ AC_ARG_ENABLE(thread,
+ [  --enable-thread         enable thread (on non-solaris platform)],
 -[disable_thread=no],)
-+)
++[enable_thread=yes],)
  
  AC_ARG_ENABLE(wall,
  [  --disable-wall          disable -Wall option always],
--[disable_wall=yes],)
-+)
+@@ -52,7 +52,7 @@ MODULES=""
+ 
+ EXTRA_INCLUDE_DIRS=""
+ EXTRA_LIBS=""
+-CPPFLAGS="-DFUNCPROTO -I../../include"
++CPPFLAGS="$CPPFLAGS -DFUNCPROTO -I../../include"
+ dnl defining FUNCPROTO ensures that struct library uses portotype
+ dnl we don't expect non-ANSI (K&R) C compilers to be used
+ dnl Some compiles may define __STDC__ by itself which makes it enable, 
+@@ -83,7 +83,7 @@ fi
+ QUANTIFY="quantify"
+ PURIFY="purify"
  
- pwd=`pwd`
- pwd=`basename $pwd`
-@@ -65,7 +61,7 @@
- dnl fi
+-AC_DEFUN(AC_FILE_EXIST, [
++AC_DEFUN([AC_FILE_EXIST], [
+ if test -f "$1" >/dev/null 2>&1; then
+   ifelse([$2], , :, [$2])
+   ifelse([$3], , , [else $3])
+@@ -109,28 +109,34 @@ dnl	fi
+ esac
  
- AC_MSG_CHECKING(for -Wall option)
--if test "$disable_wall" = yes; then
-+if test "$enable_wall" != yes; then
-    if test "$GCC" != "yes"; then
- dnl shut up SUN WorkShop Compilers
-        CFLAGS="$CFLAGS -w"
-@@ -115,12 +111,18 @@
+ case "${host_os}" in
+-    solaris* )
+-	CRYPT_LIB="-lcrypt"
+-    ;;
+     bsdi* )
          LIBS="$LIBS -lipc"
      ;;
-     freebsd*|netbsd*|openbsd* )
+-    freebsd*|netbsd*|openbsd* )
 -        if test "$disable_thread" != yes; then
-+        if test "$enable_thread" = yes; then
- 		LDFLAGS="$LDFLAGS -pthread"
-                 THREAD_CFLAGS="-D_THREAD_SAFE -pthread"
-         fi
- 	CRYPT_LIB="-lcrypt"
+-		LDFLAGS="$LDFLAGS -pthread"
+-                THREAD_CFLAGS="-D_THREAD_SAFE -pthread"
+-        fi
+-	CRYPT_LIB="-lcrypt"
 -        ac_pthrlib="c_r"
+-    ;;
+-    linux* )
++    solaris*|freebsd*|dragonfly*|netbsd*|openbsd*|linux* )
+ 	CRYPT_LIB="-lcrypt"
 +	case "${host_os}" in
-+	    netbsd* )
-+	    ;;
-+	    * )
++	    freebsd*|dragonfly*|openbsd* )
++		if test "$enable_thread" = yes; then
++		    LDFLAGS="$LDFLAGS $(PTHREAD_LDFLAGS)"
++		    THREAD_CFLAGS="$(PTHREAD_CFLAGS)"
++		    LIBS="$LIBS $(PTHREAD_LIBS)"
++		fi
 +		ac_pthrlib="c_r"
 +	    ;;
++	    netbsd* )
++		if test "$enable_thread" = yes; then
++		    LDFLAGS="$LDFLAGS $(PTHREAD_LDFLAGS)"
++		    THREAD_CFLAGS="$(PTHREAD_CFLAGS)"
++		    LIBS="$LIBS $(PTHREAD_LIBS)"
++		fi
++	    ;;
 +	esac
      ;;
-     linux* )
- 	CRYPT_LIB="-lcrypt"
-@@ -129,7 +131,7 @@
+     osf* )
  	if test $CC = "cc" ; then
             CPPFLAGS="$CPPFLAGS -taso -pthread"
          fi
@@ -74,7 +98,7 @@ $NetBSD: patch-aa,v 1.7 2004/12/31 23:01:33 kim Exp $
  		LDFLAGS="$LDFLAGS -lc_r"
                  THREAD_CFLAGS="-D_THREAD_SAFE"
  	fi
-@@ -152,7 +154,7 @@
+@@ -153,7 +159,7 @@ fi
  AC_SUBST(MAKEDEPCLEAN)
  
  dnl Checks for pthread libraries. (linux has pthread.h only, so ...)
@@ -83,3 +107,98 @@ $NetBSD: patch-aa,v 1.7 2004/12/31 23:01:33 kim Exp $
    AC_MSG_CHECKING(for thread support)
    AC_MSG_RESULT(disabled)
  else
+@@ -167,7 +173,7 @@ fi
+ AC_MSG_CHECKING(for thread support)
+ if test "$pthread" = yes; then
+   AC_MSG_RESULT(yes)
+-  AC_DEFINE(HAVE_LIBPTHREAD)
++  AC_DEFINE([HAVE_LIBPTHREAD],[],[Define if you have pthread library (-lpthread)])
+   CFLAGS="$CFLAGS $THREAD_CFLAGS"
+   CPPFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $CPPFLAGS"
+   QUANTIFY="$QUANTIFY -threads=yes -max-threads=80"
+@@ -176,7 +182,7 @@ if test "$pthread" = yes; then
+   LIBS="$LIBS $THREADLIBS"
+ dnl at least FreeBSD 3.1 doesn't have this
+   AC_CHECK_LIB($ac_pthrlib, pthread_attr_setscope, 
+-	       AC_DEFINE(HAVE_PTHREAD_ATTR_SETSCOPE))
++	       AC_DEFINE([HAVE_PTHREAD_ATTR_SETSCOPE],[],[Define if you have pthread_attr_setscope]))
+   AC_CHECK_FUNCS(thr_setconcurrency)
+ else
+   AC_MSG_RESULT(no)
+@@ -231,13 +237,13 @@ AC_PATH_PROG(SENDMAIL_PATH,sendmail,no,$
+ if test $SENDMAIL_PATH = no; then
+     SENDMAIL_PATH=""
+ else
+-    AC_DEFINE(HAVE_SENDMAIL)
++    AC_DEFINE([HAVE_SENDMAIL],[],[Define if you have any sendmail program])
+ fi
+ AC_PATH_PROG(MAIL_PATH,mail,no)
+ if test $MAIL_PATH = no; then
+     MAIL_PATH=""
+ else
+-    AC_DEFINE(HAVE_MAIL)
++    AC_DEFINE([HAVE_MAIL],[],[Define if you have the mail program])
+ fi
+ 
+ dnl Prefer GPG, second choice PGP version 5
+@@ -287,7 +293,7 @@ else
+ 	PGPS_PATH=""
+ 	PGPV_PATH=""
+ 	PGPDIR=gpg
+-	AC_DEFINE(PGP)
++	AC_DEFINE([PGP],[],[Define if you have any pgp program])
+ fi
+ AC_SUBST(PGP)
+ AC_SUBST(PGPDIR)
+@@ -300,19 +306,19 @@ AC_PATH_PROG(GZIP_PATH,gzip,no)
+ if test $GZIP_PATH = no; then
+     GZIP_PATH=""
+ else
+-    AC_DEFINE(HAVE_GZIP)
++    AC_DEFINE([HAVE_GZIP],[],[Define if you have gzip])
+ fi
+ AC_PATH_PROG(IRRDCACHER_PATH,irrdcacher,no)
+ if test $IRRDCACHER_PATH = no; then
+     IRRDCACHER_PATH=""
+ else
+-    AC_DEFINE(HAVE_IRRDCACHER)
++    AC_DEFINE([HAVE_IRRDCACHER],[],[Define if you have irrdcacher])
+ fi
+ AC_PATH_PROG(WGET_PATH,wget,no)
+ if test $WGET_PATH = no; then
+     WGET_PATH=""
+ else
+-    AC_DEFINE(HAVE_WGET)
++    AC_DEFINE([HAVE_WGET],[],[Define if you have wget])
+ fi
+ AC_SUBST(SENDMAIL_PATH)
+ AC_SUBST(MAIL_PATH)
+@@ -340,11 +346,11 @@ AC_STRUCT_TM
+ dnl u_char, u_int, u_short, and u_long
+ AC_MSG_CHECKING([u_char, u_int, u_short, and u_long])
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>]], [[
+-  u_char c; u_int i; u_short s; u_long l;]])],[AC_DEFINE(HAVE_U_TYPES) AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)]);
++  u_char c; u_int i; u_short s; u_long l;]])],[AC_DEFINE([HAVE_U_TYPES],[],[Define if you have u_char, u_int, u_short, and u_long]) AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)]);
+ 
+ dnl Check for in6_addr structure definition
+ AC_EGREP_HEADER(struct in6_addr, netinet/in.h,
+-                  AC_DEFINE(HAVE_STRUCT_IN6_ADDR))
++                  AC_DEFINE([HAVE_STRUCT_IN6_ADDR],[],[Define if you have struct in6_addr]))
+ 
+ dnl Checks for library functions.
+ AC_CHECK_FUNCS(localtime_r strtok_r gethostbyname_r gethostbyaddr_r)
+@@ -358,12 +364,12 @@ AC_CHECK_FUNCS(mkdtemp)
+ AC_CHECK_FUNCS(snprintf)
+ AC_CHECK_FUNCS(dirname basename)
+ 
+-AC_DEFUN(AC_TYPE_SOCKLEN_T,
++AC_DEFUN([AC_TYPE_SOCKLEN_T],
+ [AC_CACHE_CHECK(for socklen_t in sys/socket.h, ac_cv_type_socklen_t,
+ [AC_EGREP_HEADER(socklen_t, sys/socket.h,
+   ac_cv_type_socklen_t=yes, ac_cv_type_socklen_t=no)])
+ if test $ac_cv_type_socklen_t = no; then
+-  AC_DEFINE(socklen_t, int)
++  AC_DEFINE([socklen_t], [int], [define socklen_t if necessary])
+ fi
+ ])
+ 
diff --git a/net/irrd/patches/patch-ab b/net/irrd/patches/patch-ab
deleted file mode 100644
index 9d5ddac0bc1..00000000000
--- a/net/irrd/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2006/03/22 22:14:43 joerg Exp $
-
---- programs/irr_rpsl_submit/Makefile.orig	2006-03-22 22:09:20.000000000 +0000
-+++ programs/irr_rpsl_submit/Makefile
-@@ -11,6 +11,10 @@ RPSLOBJS   = call_pipeline.o auth.o pgpc
- 
- all:  $(GOAL) 
- 
-+.if ${OPSYS} == "DragonFly"
-+LDFLAGS+=	-lcrypt
-+.endif
-+
- irr_rpsl_submit: $(RPSLOBJS)
- 	@echo "Linking: $(LD) $(LDFLAGS) $(RPSLOBJS) -o $@ $(IRRD_OPS_LIBS)"
- 	$(LD) $(LDFLAGS) $(RPSLOBJS) -o $@ $(SYS_LIBS) $(CRYPT_LIB)  -L../../lib/
diff --git a/net/irrd/patches/patch-ac b/net/irrd/patches/patch-ac
deleted file mode 100644
index ceda934bfe2..00000000000
--- a/net/irrd/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/07/05 21:39:42 wiz Exp $
-
---- programs/irr_rpsl_check/syntax_attrs.c.orig	2004-08-26 14:04:09.000000000 +0000
-+++ programs/irr_rpsl_check/syntax_attrs.c
-@@ -19,7 +19,7 @@
- extern char *attr_name[];
- extern regex_t re[];
- extern char *countries[];
--static const char tmpfntmpl[] = "/var/tmp/irrsyntax.XXXXXX";
-+static const char localtmpfntmpl[] = "/var/tmp/irrsyntax.XXXXXX";
- 
- int xx_set_syntax (char *target, char *s) {
-   char *p;
-@@ -713,7 +713,7 @@ char *hexid_check (parse_info_t *o) {
-   }
- 
-   /* create a file and put the key certificate into it */
--  strcpy (pgpinfn, tmpfntmpl);
-+  strcpy (pgpinfn, localtmpfntmpl);
-   fd = mkstemp (pgpinfn);
-   if ((pgpin = fdopen (fd, "w")) == NULL) {
-     error_msg_queue (o, 
diff --git a/net/irrd/patches/patch-ae b/net/irrd/patches/patch-ae
new file mode 100644
index 00000000000..946fb1ee27b
--- /dev/null
+++ b/net/irrd/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.3 2010/02/23 20:37:06 spz Exp $
+
+--- Make.include.in.orig	2001-12-03 20:07:33.000000000 +0000
++++ Make.include.in
+@@ -33,7 +33,7 @@ MAKEDEPCLEAN= 	@MAKEDEPCLEAN@
+ 
+ prefix=		@prefix@
+ exec_prefix=	@exec_prefix@
+-DESTDIR=	@sbindir@
++sbindir=	@sbindir@
+ MANDIR=		@mandir@
+ 
+ MRTLIB= 	../../lib/libmrt.a
diff --git a/net/irrd/patches/patch-af b/net/irrd/patches/patch-af
new file mode 100644
index 00000000000..4c67dfd706f
--- /dev/null
+++ b/net/irrd/patches/patch-af
@@ -0,0 +1,17 @@
+$NetBSD: patch-af,v 1.3 2010/02/23 20:37:06 spz Exp $
+
+--- programs/IRRd/Makefile.orig	2005-11-16 20:05:41.000000000 +0000
++++ programs/IRRd/Makefile
+@@ -27,10 +27,10 @@ $(GOAL).lint:
+ 	lint $(CPPFLAGS) `echo $(OBJS) | sed -e 's,\.o,.c,g'`
+ 
+ install: $(GOAL)
+-	$(INSTALL) -m 755 $(GOAL) $(DESTDIR)/$(GOAL)
++	$(INSTALL) -m 755 $(GOAL) $(DESTDIR)$(sbindir)/$(GOAL)
+ 
+ install-man: irrd.8
+-	$(INSTALL) -m 644 irrd.8 $(MANDIR)/man8/irrd.8
++	$(INSTALL) -m 644 irrd.8 $(DESTDIR)$(MANDIR)/man8/irrd.8
+ 
+ clean:
+ 	$(RM) *.o core *.core *~* *.quanitfy *.purify $(GOAL)
diff --git a/net/irrd/patches/patch-ag b/net/irrd/patches/patch-ag
new file mode 100644
index 00000000000..6bf21ca9516
--- /dev/null
+++ b/net/irrd/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.3 2010/02/23 20:37:06 spz Exp $
+
+--- programs/irr_notify/Makefile.orig	2001-08-09 20:42:26.000000000 +0000
++++ programs/irr_notify/Makefile
+@@ -28,7 +28,7 @@ libnfy.a: $(LIBOBJS)
+ 	$(RANLIB) $@
+ 
+ install: $(GOAL)
+-	$(INSTALL) -m 755 -o root -g bin $(GOAL) $(DESTDIR)/$(GOAL)
++	$(INSTALL) $(GOAL) $(DESTDIR)$(sbindir)/$(GOAL)
+ 
+ clean:
+ 	$(RM) *.a *.o core *.core *~*  *.purify $(GOAL)
diff --git a/net/irrd/patches/patch-ah b/net/irrd/patches/patch-ah
new file mode 100644
index 00000000000..f765e60c0d9
--- /dev/null
+++ b/net/irrd/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.3 2010/02/23 20:37:06 spz Exp $
+
+--- programs/irr_rpsl_check/Makefile.orig	2002-11-27 17:38:22.000000000 +0000
++++ programs/irr_rpsl_check/Makefile
+@@ -38,7 +38,7 @@ librpslchk.a: $(LIBOBJS)
+ #	@ar cr $@ $(LIBOBJS)
+ 
+ install: $(GOAL)
+-	$(INSTALL) -m 755 $(GOAL) $(DESTDIR)/$(GOAL)
++	$(INSTALL) -m 755 $(GOAL) $(DESTDIR)$(sbindir)/$(GOAL)
+ 
+ clean:
+ 	$(RM) *.output *.a *.o core *.core *~* *tab.* lex.yy.c *.purify $(GOAL)
diff --git a/net/irrd/patches/patch-ai b/net/irrd/patches/patch-ai
new file mode 100644
index 00000000000..7b294937fb8
--- /dev/null
+++ b/net/irrd/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.3 2010/02/23 20:37:06 spz Exp $
+
+--- programs/irr_rpsl_submit/Makefile.orig	2003-04-01 19:21:52.000000000 +0000
++++ programs/irr_rpsl_submit/Makefile
+@@ -19,7 +19,7 @@ lint:
+ 	lint `echo $(RPSLOBJS) | sed -e 's,\.o,.c,g'`
+ 
+ install: $(GOAL)
+-	$(INSTALL) -m 755 $(GOAL) $(DESTDIR)/
++	$(INSTALL) -m 755 $(GOAL) $(DESTDIR)$(sbindir)/$(GOAL)
+ 
+ 
+ clean:
diff --git a/net/irrd/patches/patch-aj b/net/irrd/patches/patch-aj
new file mode 100644
index 00000000000..0a70b2bdcf4
--- /dev/null
+++ b/net/irrd/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.3 2010/02/23 20:37:06 spz Exp $
+
+--- include/stack.h.orig	2000-02-29 22:28:43.000000000 +0000
++++ include/stack.h
+@@ -99,7 +99,7 @@ extern void            STACK_DefaultPrin
+ #define Get_STACK_Size(s)         (s->size)
+ 
+ /*  Fast Macro Push and Pop for static sized stacks _only_ */
+-#define PushM(s, d)          (s->array[s->top++] = (STACK_TYPE)d)
++#define PushM(s, d)          (void)(s->array[s->top++] = (STACK_TYPE)d)
+ #define PopM(s)              (s->array[--s->top])
+ 
+ #ifdef STACK_DEBUG  /*  Debugging ON  */