[pkgsrc/pkgsrc-2005Q2]: pkgsrc/net/ORBit Pullup ticket 695 - requested by Gra...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6770d2f3a43a
branches:  pkgsrc-2005Q2
changeset: 496007:6770d2f3a43a
user:      salo <salo%pkgsrc.org@localhost>
date:      Sat Aug 20 15:25:39 2005 +0000

description:
Pullup ticket 695 - requested by Grant Beattie
portability fixes for ORBit

Revisions pulled up:
- pkgsrc/net/ORBit/Makefile             1.115, 1.116
- pkgsrc/net/ORBit/distinfo             1.27
- pkgsrc/net/ORBit/patches/patch-ap     1.3

   Module Name:         pkgsrc
   Committed By:        grant
   Date:                Thu Aug 18 05:39:52 UTC 2005

   Modified Files:
        pkgsrc/net/ORBit: Makefile

   Log Message:
   whitespace fix
---
   Module Name:         pkgsrc
   Committed By:        grant
   Date:                Thu Aug 18 05:41:02 UTC 2005

   Modified Files:
        pkgsrc/net/ORBit: Makefile

   Log Message:
   this needs flex (not lex) to build.
---
   Module Name:         pkgsrc
   Committed By:        grant
   Date:                Thu Aug 18 05:46:16 UTC 2005

   Modified Files:
        pkgsrc/net/ORBit: distinfo
        pkgsrc/net/ORBit/patches: patch-ap

   Log Message:
   fix config.h to include <alloca.h> if found (ORBIT_HAVE_ALLOCA_H was
   not being defined, so alloca.h was never included).

   fixes build with sunpro.

diffstat:

 net/ORBit/Makefile         |   5 ++---
 net/ORBit/distinfo         |   4 ++--
 net/ORBit/patches/patch-ap |  14 +++++++++-----
 3 files changed, 13 insertions(+), 10 deletions(-)

diffs (60 lines):

diff -r 74062092c73b -r 6770d2f3a43a net/ORBit/Makefile
--- a/net/ORBit/Makefile        Sat Aug 20 15:05:11 2005 +0000
+++ b/net/ORBit/Makefile        Sat Aug 20 15:25:39 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.114 2005/05/22 20:08:23 jlam Exp $
+# $NetBSD: Makefile,v 1.114.2.1 2005/08/20 15:25:39 salo Exp $
 
 DISTNAME=      ORBit-0.5.17
 CATEGORIES=    net
@@ -11,8 +11,7 @@
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
-
-USE_TOOLS+=            bison gmake lex
+USE_TOOLS+=            bison flex gmake
 USE_LIBTOOL=           YES
 PTHREAD_AUTO_VARS=     YES
 
diff -r 74062092c73b -r 6770d2f3a43a net/ORBit/distinfo
--- a/net/ORBit/distinfo        Sat Aug 20 15:05:11 2005 +0000
+++ b/net/ORBit/distinfo        Sat Aug 20 15:25:39 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2005/04/27 09:06:39 wiz Exp $
+$NetBSD: distinfo,v 1.26.2.1 2005/08/20 15:25:39 salo Exp $
 
 SHA1 (ORBit-0.5.17.tar.bz2) = c8b2daef43b028d65d0ab82f0a88558942be6217
 RMD160 (ORBit-0.5.17.tar.bz2) = 9087d6659adbd0066d76a3eed5cc2799de640df4
@@ -17,4 +17,4 @@
 SHA1 (patch-am) = f52369447d04a382d6e93a6bddaf3962a3ab6677
 SHA1 (patch-an) = fa9bb500ddcd0ec8e64b5ff1edbe0f02f5cb0f39
 SHA1 (patch-ao) = b80bf3da551bacccd23a7a27677be8e985e6b543
-SHA1 (patch-ap) = 46d1dc2c930090d88e6745025cd0cfefc55c7405
+SHA1 (patch-ap) = 83bbb85866a18d26cc88edaf1eada6108898affc
diff -r 74062092c73b -r 6770d2f3a43a net/ORBit/patches/patch-ap
--- a/net/ORBit/patches/patch-ap        Sat Aug 20 15:05:11 2005 +0000
+++ b/net/ORBit/patches/patch-ap        Sat Aug 20 15:25:39 2005 +0000
@@ -1,13 +1,17 @@
-$NetBSD: patch-ap,v 1.2 2005/01/13 09:58:57 adam Exp $
+$NetBSD: patch-ap,v 1.2.4.1 2005/08/20 15:25:39 salo Exp $
 
---- config.h.in.orig   2002-06-06 11:25:14.000000000 +0000
+--- config.h.in.orig   2002-06-06 21:25:14.000000000 +1000
 +++ config.h.in
-@@ -35,7 +35,7 @@
+@@ -33,9 +33,10 @@
+ #undef HAVE_HOSTS_ACCESS
+ #undef HAVE_TCPD_H
  
- #undef ORBIT_HAVE_ALLOCA_H
+-#undef ORBIT_HAVE_ALLOCA_H
++/* Define if you have the <alloca.h> header file. */
++#undef HAVE_ALLOCA_H
  
 -#ifdef ORBIT_HAVE_ALLOCA_H
-+#if ORBIT_HAVE_ALLOCA_H
++#if HAVE_ALLOCA_H
  #include <alloca.h>
  #endif