From a06c2624d537622d45519a8524041d11e8cfeb90 Mon Sep 17 00:00:00 2001 From: he Date: Thu, 17 Oct 2019 14:05:49 +0000 Subject: Update irrtoolset5 to version 5.1.2. Pkgsrc changes: * Project moved to github, follow suit. * Use the pre-configure target to run the required autotools * Remove ancient GCC_REQD+=3.0 * Add use of more autotools * Fix up PLIST with share/doc/irrtoolset/ files. Upstream changes: New Features * initial support for IOS XR in rtconfig * IOS support for peer templates (-cisco_peer_templates) * support of community.delete on Cisco IOS * implement importPeerGroup for JUNOS Bug Fixes * better asn32 support on JUNOS * fix JUNOS output so it can be deployed using "load replace" (-junos_replace) * several toolchain bugfixes (bison 2.x, gcc) * workaround for compiler optimisation bug in gcc6 * permit community values starting with 0: * updates for autotools Other Notes * Solaris no longer formally supported * delete bugs/, contrib/ and tests/ directories * added Travis CI support We'd like to thank ISC for their continued support and the small but important army of contributors who made this release possible. --- net/irrtoolset5/Makefile | 21 ++++++++--------- net/irrtoolset5/PLIST | 6 ++++- net/irrtoolset5/distinfo | 13 +++++------ net/irrtoolset5/patches/patch-src_rpsl_Makefile.am | 14 ++++++++++++ net/irrtoolset5/patches/patch-src_rpsl_Makefile.in | 13 ----------- net/irrtoolset5/patches/patch-src_rpsl_object.cc | 26 ---------------------- 6 files changed, 36 insertions(+), 57 deletions(-) create mode 100644 net/irrtoolset5/patches/patch-src_rpsl_Makefile.am delete mode 100644 net/irrtoolset5/patches/patch-src_rpsl_Makefile.in delete mode 100644 net/irrtoolset5/patches/patch-src_rpsl_object.cc diff --git a/net/irrtoolset5/Makefile b/net/irrtoolset5/Makefile index 61f1019eb43..5917a910ed9 100644 --- a/net/irrtoolset5/Makefile +++ b/net/irrtoolset5/Makefile @@ -1,13 +1,14 @@ -# $NetBSD: Makefile,v 1.10 2017/08/16 20:45:42 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2019/10/17 14:05:49 he Exp $ -VERSION= 5.0.1 +VERSION= 5.1.2 DISTNAME= irrtoolset-${VERSION} CATEGORIES= net -MASTER_SITES= ftp://ftp.isc.org/isc/IRRToolSet/IRRToolSet-${VERSION}/ +MASTER_SITES= ${MASTER_SITE_GITHUB:=irrtoolset/} OWNER= spz@NetBSD.org -#HOMEPAGE= http://irrtoolset.isc.org/ +HOMEPAGE= https://github.com/irrtoolset/irrtoolset/ COMMENT= The Internet Routing Registry Toolset - client to IRRd +GITHUB_TAG= release-${VERSION} LICENSE= gnu-gpl-v2 AND mit AND modified-bsd CONFLICTS= IRRToolSet-4.* @@ -21,16 +22,16 @@ MAKE_JOBS_SAFE= NO USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_LANGUAGES= c c++ -USE_TOOLS+= bison flex -GCC_REQD+= 3.0 +USE_TOOLS+= aclocal automake autoconf bison flex CONFIG_GUESS_OVERRIDE= config.guess CONFIG_SUB_OVERRIDE= config.sub -.if ${OPSYS} == "NetBSD" -CONFIGURE_ENV+= LEX="${PREFIX}/bin/flex" -.include "../../devel/flex/buildlink3.mk" -.endif +pre-configure: + cd ${WRKSRC} && aclocal + cd ${WRKSRC} && autoreconf --install + cd ${WRKSRC} && automake --add-missing + cd ${WRKSRC} && autoconf -v -i -f .include "../../mk/readline.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/irrtoolset5/PLIST b/net/irrtoolset5/PLIST index ec14f50e8db..e248855ebf3 100644 --- a/net/irrtoolset5/PLIST +++ b/net/irrtoolset5/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2010/01/30 16:14:16 spz Exp $ +@comment $NetBSD: PLIST,v 1.2 2019/10/17 14:05:49 he Exp $ bin/peval bin/rpslcheck bin/rtconfig @@ -6,3 +6,7 @@ man/man1/irrtoolset-errors.1 man/man1/peval.1 man/man1/rpslcheck.1 man/man1/rtconfig.1 +share/doc/irrtoolset/AUTHORS +share/doc/irrtoolset/COPYING +share/doc/irrtoolset/NEWS +share/doc/irrtoolset/README.md diff --git a/net/irrtoolset5/distinfo b/net/irrtoolset5/distinfo index 1d2892de02e..6a70449b073 100644 --- a/net/irrtoolset5/distinfo +++ b/net/irrtoolset5/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.5 2015/11/04 00:35:05 agc Exp $ +$NetBSD: distinfo,v 1.6 2019/10/17 14:05:49 he Exp $ -SHA1 (irrtoolset-5.0.1.tar.gz) = 19510275f5f64608e4a683c744c14f8e900ea19e -RMD160 (irrtoolset-5.0.1.tar.gz) = 667c22e0658bdc4b544031e7fe33dffc7cc1a2c8 -SHA512 (irrtoolset-5.0.1.tar.gz) = 03cdcadb31c029175a7015b7d6cc52237f8625a57a8ebb0a65a9690e552b8055825d78501864bb2852416229beb2bcbf39b14ce9db256b0cbd39fd3d4bc8b493 -Size (irrtoolset-5.0.1.tar.gz) = 639889 bytes -SHA1 (patch-src_rpsl_Makefile.in) = b3c03bf83c351009526805d48777345e513ebff0 -SHA1 (patch-src_rpsl_object.cc) = 596ca9266151fd0bbbc161ba594f93dc236a9678 +SHA1 (irrtoolset-5.1.2.tar.gz) = bca3cee298279448e837cc6f9b8a38896504228a +RMD160 (irrtoolset-5.1.2.tar.gz) = 0fbe9a948f0b03eb0dd393cf4ec0308e095ed0d8 +SHA512 (irrtoolset-5.1.2.tar.gz) = 4d9c8d6b1ec924b74693409c7bd9ed960daccfe32f8b4293430d729c47b860617cb8ee937aa970e762f61db5087f0f6780877f8f4c3a4ab148859f41ce7fa9c9 +Size (irrtoolset-5.1.2.tar.gz) = 274599 bytes +SHA1 (patch-src_rpsl_Makefile.am) = c18913d05e82be1e10f981b7d6001748d9859203 diff --git a/net/irrtoolset5/patches/patch-src_rpsl_Makefile.am b/net/irrtoolset5/patches/patch-src_rpsl_Makefile.am new file mode 100644 index 00000000000..c7492f0484c --- /dev/null +++ b/net/irrtoolset5/patches/patch-src_rpsl_Makefile.am @@ -0,0 +1,14 @@ +$NetBSD: patch-src_rpsl_Makefile.am,v 1.1 2019/10/17 14:05:49 he Exp $ + +Add an extra dependency on the yacc output. + +--- src/rpsl/Makefile.am.orig 2019-10-14 10:07:11.000000000 +0000 ++++ src/rpsl/Makefile.am +@@ -38,6 +38,7 @@ MAINTAINERCLEANFILES = $(nodist_librpsl_ + CLEANFILES = *~ *.bak *.y.cc *.l.cc *.y.hh + + schema_rpsl.cc: rpsl.y.cc ++object.cc: rpsl.y.cc + + # FIXME: dependency on lex / yacc sources + object_log.l.cc: diff --git a/net/irrtoolset5/patches/patch-src_rpsl_Makefile.in b/net/irrtoolset5/patches/patch-src_rpsl_Makefile.in deleted file mode 100644 index 1fde0b8be13..00000000000 --- a/net/irrtoolset5/patches/patch-src_rpsl_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_rpsl_Makefile.in,v 1.1 2013/08/31 08:44:49 joerg Exp $ - ---- src/rpsl/Makefile.in.orig 2013-08-30 22:54:56.000000000 +0000 -+++ src/rpsl/Makefile.in -@@ -37,6 +37,8 @@ - # - # Author(s): Nick Hilliard - -+object.cc: rpsl.y.cc -+ - VPATH = @srcdir@ - am__make_dryrun = \ - { \ diff --git a/net/irrtoolset5/patches/patch-src_rpsl_object.cc b/net/irrtoolset5/patches/patch-src_rpsl_object.cc deleted file mode 100644 index 15efc86714a..00000000000 --- a/net/irrtoolset5/patches/patch-src_rpsl_object.cc +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-src_rpsl_object.cc,v 1.1 2013/08/31 08:44:49 joerg Exp $ - ---- src/rpsl/object.cc.orig 2013-08-30 22:49:31.000000000 +0000 -+++ src/rpsl/object.cc -@@ -53,11 +53,11 @@ - #include - - #include "object.hh" -+#include "rpsl.y.hh" - #include "schema.hh" - - using namespace std; - --extern int rpslparse(void *); - extern void rpsl_scan_object(Object *); - - Object::~Object() { -@@ -128,7 +128,7 @@ bool Object::read(Buffer &buf, istream & - - void Object::parse() { - rpsl_scan_object(this); -- rpslparse(this); -+ rpslparse(); - validate(); - - if (type) { -- cgit v1.2.3