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)

1 files changed, 55 insertions, 31 deletions

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"