pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/irrtoolset-nox11 - update DESCR to match reality



details:   https://anonhg.NetBSD.org/pkgsrc/rev/01d849b8bdda
branches:  trunk
changeset: 539562:01d849b8bdda
user:      spz <spz%pkgsrc.org@localhost>
date:      Sat Mar 08 11:00:34 2008 +0000

description:
- update DESCR to match reality
- add patch to src/gnug++/int.defs.h for Solaris compatibility
  (by Ian Dickinson, iand%eng.pipex.net@localhost)
- move Errors manpage to a less general name (suggested by Ian Dickinson)
- add patch to src/RtConfig/f_cisco.cc by Hagen Boehm <hboehm%NIC.DTAG.DE@localhost>
  (fixes up the string that gets output instead of a copy of said string)
- improve src/Makefile.in some more

diffstat:

 net/irrtoolset-nox11/DESCR            |    8 +-
 net/irrtoolset-nox11/Makefile         |    4 +-
 net/irrtoolset-nox11/PLIST            |    4 +-
 net/irrtoolset-nox11/distinfo         |   13 +-
 net/irrtoolset-nox11/patches/patch-co |   30 +-
 net/irrtoolset-nox11/patches/patch-cs |   54 ++-
 net/irrtoolset-nox11/patches/patch-dm |   28 +-
 net/irrtoolset-nox11/patches/patch-do |  622 ++++++++++++++++++++++++++++++++++
 net/irrtoolset-nox11/patches/patch-dp |   22 +
 net/irrtoolset-nox11/patches/patch-dq |  622 ++++++++++++++++++++++++++++++++++
 net/irrtoolset-nox11/patches/patch-dr |   13 +
 net/irrtoolset-nox11/patches/patch-ds |   13 +
 12 files changed, 1394 insertions(+), 39 deletions(-)

diffs (truncated from 1548 to 300 lines):

diff -r daa433c7e516 -r 01d849b8bdda net/irrtoolset-nox11/DESCR
--- a/net/irrtoolset-nox11/DESCR        Sat Mar 08 08:58:00 2008 +0000
+++ b/net/irrtoolset-nox11/DESCR        Sat Mar 08 11:00:34 2008 +0000
@@ -5,9 +5,9 @@
 network engineers, by providing tools for automated router configuration,
 routing policies analysis, and maintenance.
 
-This package contains the programs RtConfig, CIDRAdvisor, peval, prtraceroute,
-prpath and rpslcheck (aka prcheck). It doesn't try to build aoe and roe,
-which want TCL/TK (and X).
+This package contains the programs RtConfig, peval and rpslcheck.
+It doesn't try to build aoe and roe, which want TCL/TK (and X), nor
+CIDRAdvisor, prpath and prtraceroute, which are currently broken.
 
 IRRToolSet started life as RAToolSet from ISI.edu, was then kept by RIPE NCC
-for a while, and lately transferred to ISC.
+for a while, and is currently maintained at ISC.
diff -r daa433c7e516 -r 01d849b8bdda net/irrtoolset-nox11/Makefile
--- a/net/irrtoolset-nox11/Makefile     Sat Mar 08 08:58:00 2008 +0000
+++ b/net/irrtoolset-nox11/Makefile     Sat Mar 08 11:00:34 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2008/01/14 12:39:54 spz Exp $
+# $NetBSD: Makefile,v 1.18 2008/03/08 11:00:35 spz Exp $
 #
 
 DISTNAME=              IRRToolSet-4.8.5
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=            net
 MASTER_SITES=  ftp://ftp.isc.org/isc/IRRToolSet/IRRToolSet-4.8.5/
 
diff -r daa433c7e516 -r 01d849b8bdda net/irrtoolset-nox11/PLIST
--- a/net/irrtoolset-nox11/PLIST        Sat Mar 08 08:58:00 2008 +0000
+++ b/net/irrtoolset-nox11/PLIST        Sat Mar 08 11:00:34 2008 +0000
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/02/28 12:37:29 spz Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/03/08 11:00:35 spz Exp $
 bin/RtConfig
 bin/peval
 bin/rpslcheck
 man/man1/CIDRAdvisor.1
-man/man1/Errors.1
+man/man1/IRRToolSet-Errors.1
 man/man1/RtConfig.1
 man/man1/aoe.1
 man/man1/peval.1
diff -r daa433c7e516 -r 01d849b8bdda net/irrtoolset-nox11/distinfo
--- a/net/irrtoolset-nox11/distinfo     Sat Mar 08 08:58:00 2008 +0000
+++ b/net/irrtoolset-nox11/distinfo     Sat Mar 08 11:00:34 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2008/01/14 12:39:54 spz Exp $
+$NetBSD: distinfo,v 1.17 2008/03/08 11:00:35 spz Exp $
 
 SHA1 (IRRToolSet-4.8.5.tar.gz) = 0a22daef3c5c04b5bce929e420233885c44662ec
 RMD160 (IRRToolSet-4.8.5.tar.gz) = 3f6a291a1c33c2725325ebc51ab8306e7a1e743b
@@ -27,11 +27,11 @@
 SHA1 (patch-bu) = ea10d9cafc9032bd9f50ea6b81cab58779f6890e
 SHA1 (patch-cc) = 3c9395751b58cff9cfc808c91b04a6548f2daf38
 SHA1 (patch-cd) = 8ddbb605d40988378875de80390b09203c61212e
-SHA1 (patch-co) = 763958aa8d82f98d26091ea1f82bdce40026c943
+SHA1 (patch-co) = 4f0ec7f20e1d0db1221fbe9463d7daf7e4babe56
 SHA1 (patch-cp) = 0a43934c17d418e29588ef2ffb77ea1957133fc2
 SHA1 (patch-cq) = 20ea8d36fe141481ed0b1cca3843ec7a16ff8720
 SHA1 (patch-cr) = 8d90446f2760ed3dfd13cf7666b6978251ce6a68
-SHA1 (patch-cs) = 433a1286d7483139d59ed25ac458b4a159fb17e3
+SHA1 (patch-cs) = 3ee12f885b44b15b2de7d7e95fda830654482443
 SHA1 (patch-ct) = 52dd5f46a91bf313627b9975f186aede822dc7eb
 SHA1 (patch-cu) = 712496a2856bf03f7e60d3867e30d3f738829861
 SHA1 (patch-cv) = 678a36afcd35d1a24242157a23127ff5ad6dd8c4
@@ -51,4 +51,9 @@
 SHA1 (patch-dj) = 25258cbb8e544f0eda9ed6ac4f9f61825266bfdd
 SHA1 (patch-dk) = a1632fa3030ee483c99af5ef039e494295af0b7f
 SHA1 (patch-dl) = 85ab29170a0ce1f82f3058bd58b00c779684fbca
-SHA1 (patch-dm) = 7d65970aea11d00dd1867aa07c3ee970d26b3b73
+SHA1 (patch-dm) = 8b881b07a7101a1bc745dda79d7ec87df52e344b
+SHA1 (patch-do) = 8f85b97d5067e08a07fe95cb5a7eae84e9f459e3
+SHA1 (patch-dp) = 3ab3098687a4c2999b20b9910399099a073a28e5
+SHA1 (patch-dq) = 6004e46320b790ac4e1bc4488e3eb327af84299b
+SHA1 (patch-dr) = 1cd08511085634bb465e8a900ff8428262597ffc
+SHA1 (patch-ds) = 1dbe3e743991a28a8e80d48be1bd5d1b890a6f42
diff -r daa433c7e516 -r 01d849b8bdda net/irrtoolset-nox11/patches/patch-co
--- a/net/irrtoolset-nox11/patches/patch-co     Sat Mar 08 08:58:00 2008 +0000
+++ b/net/irrtoolset-nox11/patches/patch-co     Sat Mar 08 11:00:34 2008 +0000
@@ -1,25 +1,31 @@
-$NetBSD: patch-co,v 1.1 2007/05/22 12:17:56 spz Exp $
+$NetBSD: patch-co,v 1.2 2008/03/08 11:00:35 spz Exp $
 
 --- ./src/gnug++/int.defs.h.orig       2007-02-09 22:30:25.000000000 +0100
 +++ ./src/gnug++/int.defs.h
-@@ -56,10 +56,15 @@ Foundation, 675 Mass Ave, Cambridge, MA 
+@@ -16,7 +16,13 @@ License along with this library; if not,
+ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+ 
++#if defined( HAVE_STDINT_H )
+ #include <stdint.h>
++#elif defined( HAVE_INTTYPES_H )
++#include <inttypes.h>
++#else
++#include <sys/types.h>
++#endif
+ 
+ #ifndef _intdefs_h
+ #define _intdefs_h 1
+@@ -55,11 +61,6 @@ Foundation, 675 Mass Ave, Cambridge, MA 
+ 
  #define HASHTABLE_TOO_CROWDED(COUNT, SIZE) ((SIZE) - ((SIZE) >> 3) <= (COUNT))
  
- // Allow portable address arithmetic
+-// Allow portable address arithmetic
 -#if __WORDSIZE == 64
 -typedef uint64_t addr_t;
 -#else
 -typedef uint32_t addr_t;
 -#endif
-+//#if __WORDSIZE == 64
-+//typedef uint64_t addr_t;
-+//#else
-+//typedef uint32_t addr_t;
-+//#endif
-+
-+// the previous might work if __WORDSIZE was portably defined. It's not.
-+// also, since all it ever gets used to is pointer arithmetic, char* is
-+// what is ought to be (and its name ought to be caddr_t really)
 +typedef char* addr_t;
  
  #endif
diff -r daa433c7e516 -r 01d849b8bdda net/irrtoolset-nox11/patches/patch-cs
--- a/net/irrtoolset-nox11/patches/patch-cs     Sat Mar 08 08:58:00 2008 +0000
+++ b/net/irrtoolset-nox11/patches/patch-cs     Sat Mar 08 11:00:34 2008 +0000
@@ -1,14 +1,58 @@
-$NetBSD: patch-cs,v 1.1 2007/05/22 12:18:01 spz Exp $
+$NetBSD: patch-cs,v 1.2 2008/03/08 11:00:35 spz Exp $
 
---- ./src/RtConfig/f_cisco.cc.orig     2007-01-23 01:45:16.000000000 +0100
-+++ ./src/RtConfig/f_cisco.cc
-@@ -777,7 +777,8 @@ void CiscoConfig::printRE(ostream &s, 
+--- src/RtConfig/f_cisco.cc.orig       2007-01-23 01:45:16.000000000 +0100
++++ src/RtConfig/f_cisco.cc
+@@ -746,39 +746,39 @@ void CiscoConfig::printRE(ostream &s, 
+ 
+    //int lineLen = strlen(out.str());
+    int lineLen = out.str().length();
++   const char *p = out.str().c_str();
++
+    if (lineLen < 240 && ! hasTilda) {
+-      const char *p = out.str().c_str();
+       for (char *q = strchr(p, '@'); q; q = strchr(q, '@'))
+        *q = '(';
+-      s << out.str();
++      s << p;
+    } else { // need to split into multiple lines
+       if (hasTilda) {
+-       const char *p = out.str().c_str();
+        for (char *q = strchr(p, '@'); q; q = strchr(q, '@'))
+           *q = '(';
+        for (char *q = strchr(p, '&'); q; q = strchr(q, '&'))
+           *q = '@';
+       }
+ 
+-      char *p = strdup(out.str().c_str());
+-      char *q, *r2;
++      char *q, *q2;
+       char *r = NULL;
+       int size = 0;
+-      for (p = strchr(p, '@'); p; p = strchr(p, '@')) {
+-       q = strchr(p, ')');
+-       if (q - p > size) {
+-          r = p;
+-          size = q - p;
++      for (q = strchr(p, '@'); q; q = strchr(q, '@')) {
++       q2 = strchr(q, ')');
++       if (q2 - q > size) {
++          r = q;
++          size = q2 - q;
+        }
+-       *p = '(';
+-       p = q;
++       *q = '(';
++       q = q2;
+       }
+       if (!r) {
         s << out.str();
         cerr << "Warning: ip as-path access-list is too long for cisco to handle" << endl;
        } else {
 -       int inc = hasTilda ? 1 : (240 - lineLen + size) >? 5;
+-       p = strdup(out.str().c_str());
++         char *r2;
 +       int inc = hasTilda ? 1 : 
 +              ( ( (240 - lineLen + size) > 5 ) ? (240 - lineLen + size) : 5 );
-        p = strdup(out.str().c_str());
         q = strchr(r, ')') + 1;
         *r = 0;
+        r++;
diff -r daa433c7e516 -r 01d849b8bdda net/irrtoolset-nox11/patches/patch-dm
--- a/net/irrtoolset-nox11/patches/patch-dm     Sat Mar 08 08:58:00 2008 +0000
+++ b/net/irrtoolset-nox11/patches/patch-dm     Sat Mar 08 11:00:34 2008 +0000
@@ -1,20 +1,28 @@
-$NetBSD: patch-dm,v 1.1 2008/01/04 20:23:45 spz Exp $
+$NetBSD: patch-dm,v 1.2 2008/03/08 11:00:35 spz Exp $
 
 --- src/Makefile.in.orig       2006-06-08 17:16:26.000000000 +0200
 +++ src/Makefile.in
-@@ -81,11 +81,11 @@ depend:
+@@ -34,10 +34,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA    = @INSTALL_DATA@
  
- install:
-       @for i in $(prefix) $(bindir) $(mandir) $(man1dir) $(man3dir) ; do \
--              test -d $$i || mkdir -p $$i; \
-+              test -d ${DESTDIR}$$i || mkdir -p ${DESTDIR}$$i; \
+ # The default location for installation.
+-prefix      = @prefix@
++prefix      = $(DESTDIR)@prefix@
+ exec_prefix = @exec_prefix@
+ bindir      = @bindir@
+-mandir      = @mandir@
++mandir      = $(DESTDIR)@mandir@
+ man1dir     = $(mandir)/man1
+ man3dir     = $(mandir)/man3
+ 
+@@ -84,8 +84,8 @@ install:
+               test -d $$i || mkdir -p $$i; \
        done
--      for i in $(TOOLDIRS); do $(INSTALL_PROGRAM) $$i/$$i $(bindir); done
+       for i in $(TOOLDIRS); do $(INSTALL_PROGRAM) $$i/$$i $(bindir); done
 -      for i in ../man/man1/*; do $(INSTALL_DATA) $$i $(man1dir); done
 -      for i in ../man/man3/*; do $(INSTALL_DATA) $$i $(man3dir); done
-+      for i in $(TOOLDIRS); do $(INSTALL_PROGRAM) $$i/$$i ${DESTDIR}$(bindir); done
-+      for i in ../man/man1/*; do $(INSTALL_DATA) $$i ${DESTDIR}$(man1dir); done
-+      for i in ../man/man3/*; do $(INSTALL_DATA) $$i ${DESTDIR}$(man3dir); done
++      for i in ../man/man1/*.1; do $(INSTALL_DATA) $$i $(man1dir); done
++      for i in ../man/man3/*.3; do $(INSTALL_DATA) $$i $(man3dir); done
  
  tags:
        @find `pwd` -name \*.hh -or -name \*.cc -or -name \*.c -or -name \*.h -or -name \*.y -or -name \*.l | xargs etags -t
diff -r daa433c7e516 -r 01d849b8bdda net/irrtoolset-nox11/patches/patch-do
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/irrtoolset-nox11/patches/patch-do     Sat Mar 08 11:00:34 2008 +0000
@@ -0,0 +1,622 @@
+$NetBSD: patch-do,v 1.1 2008/03/08 11:00:35 spz Exp $
+
+--- man/man1/Errors.1.orig     2002-07-02 14:41:49.000000000 +0200
++++ man/man1/Errors.1
+@@ -1,617 +0,0 @@
+-.\"// Copyright (c) 2001,2002                        RIPE NCC
+-.\"//
+-.\"// All Rights Reserved
+-.\"//
+-.\"// Permission to use, copy, modify, and distribute this software and its
+-.\"// documentation for any purpose and without fee is hereby granted,
+-.\"// provided that the above copyright notice appear in all copies and that
+-.\"// both that copyright notice and this permission notice appear in
+-.\"// supporting documentation, and that the name of the author not be
+-.\"// used in advertising or publicity pertaining to distribution of the
+-.\"// software without specific, written prior permission.
+-.\"//
+-.\"// THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+-.\"// ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS; IN NO EVENT SHALL
+-.\"// AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+-.\"// DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+-.\"// AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+-.\"// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+-.\"//
+-.\"// 
+-.\"//  Copyright (c) 1994 by the University of Southern California
+-.\"//  and/or the International Business Machines Corporation.
+-.\"//  All rights reserved.
+-.\"//
+-.\"//  Permission to use, copy, modify, and distribute this software and
+-.\"//  its documentation in source and binary forms for lawful
+-.\"//  non-commercial purposes and without fee is hereby granted, provided
+-.\"//  that the above copyright notice appear in all copies and that both
+-.\"//  the copyright notice and this permission notice appear in supporting
+-.\"//  documentation, and that any documentation, advertising materials,
+-.\"//  and other materials related to such distribution and use acknowledge
+-.\"//  that the software was developed by the University of Southern
+-.\"//  California, Information Sciences Institute and/or the International
+-.\"//  Business Machines Corporation.  The name of the USC or IBM may not
+-.\"//  be used to endorse or promote products derived from this software
+-.\"//  without specific prior written permission.
+-.\"//
+-.\"//  NEITHER THE UNIVERSITY OF SOUTHERN CALIFORNIA NOR INTERNATIONAL
+-.\"//  BUSINESS MACHINES CORPORATION MAKES ANY REPRESENTATIONS ABOUT
+-.\"//  THE SUITABILITY OF THIS SOFTWARE FOR ANY PURPOSE.  THIS SOFTWARE IS
+-.\"//  PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES,
+-.\"//  INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+-.\"//  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, TITLE, AND 
+-.\"//  NON-INFRINGEMENT.
+-.\"//
+-.\"//  IN NO EVENT SHALL USC, IBM, OR ANY OTHER CONTRIBUTOR BE LIABLE FOR ANY
+-.\"//  SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES, WHETHER IN CONTRACT,
+-.\"//  TORT, OR OTHER FORM OF ACTION, ARISING OUT OF OR IN CONNECTION WITH,
+-.\"//  THE USE OR PERFORMANCE OF THIS SOFTWARE.
+-.\"//
+-.\"//  Questions concerning this software should be directed to 
+-.\"//  info-ra%isi.edu@localhost.
+-.\"//
+-.\"//  Author(s): Cengiz Alaettinoglu <cengiz%isi.edu@localhost>
+-.\"



Home | Main Index | Thread Index | Old Index