From 63269731fe6bec25e7da612800d0683029cc048d Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Tue, 9 Jan 2007 10:21:51 +0000
Subject: Don't limit extern "C" to certain Sun compiler. It is never wrong to
 do that for C headers in C++ programs, but GCC does it by default for system
 include directories.

---
 sysutils/fam/distinfo         |  4 ++--
 sysutils/fam/patches/patch-as | 10 +++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'sysutils/fam')

diff --git a/sysutils/fam/distinfo b/sysutils/fam/distinfo
index fb4808ea104..102a4989e5f 100644
--- a/sysutils/fam/distinfo
+++ b/sysutils/fam/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2006/08/26 15:30:57 joerg Exp $
+$NetBSD: distinfo,v 1.25 2007/01/09 10:21:51 joerg Exp $
 
 SHA1 (fam-2.7.0.tar.gz) = 6c2316f02acf89a41c42ffc3d7fd9cf5eada83a8
 RMD160 (fam-2.7.0.tar.gz) = 1895b578d6a141c36d5bee4e3fbbc2a298a91430
@@ -21,7 +21,7 @@ SHA1 (patch-ao) = 161160f121e9338e807bfe0c5df6cf14457fec62
 SHA1 (patch-ap) = d53d72b082fe057df35a69e09e94706f3d0d020e
 SHA1 (patch-aq) = a54ba100b779fa13b35c962ba734ee11e093cb28
 SHA1 (patch-ar) = 37a8fe2e70d4cbc669a0c853b3404d8c0354235a
-SHA1 (patch-as) = ff23d2425587e08cac1344884d3557c7761adcef
+SHA1 (patch-as) = d82bd15cfa04e52513e2b052f4e429d2133635f1
 SHA1 (patch-at) = 209f89cefac326e6c1b99bec4622ba0d6eabe1e4
 SHA1 (patch-au) = 6bd507eb448b3fd126042759a3b6f70335401c5b
 SHA1 (patch-av) = e79813d88ec48a886688539da34150c5bd229a0a
diff --git a/sysutils/fam/patches/patch-as b/sysutils/fam/patches/patch-as
index 806b7c94147..64fe10e89c3 100644
--- a/sysutils/fam/patches/patch-as
+++ b/sysutils/fam/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.5 2004/12/09 18:45:32 minskim Exp $
+$NetBSD: patch-as,v 1.6 2007/01/09 10:21:51 joerg Exp $
 
---- src/RPC_TCP_Connector.c++.orig	2003-01-18 08:18:12.000000000 -0600
+--- src/RPC_TCP_Connector.c++.orig	2003-01-18 14:18:12.000000000 +0000
 +++ src/RPC_TCP_Connector.c++
-@@ -21,11 +21,23 @@
+@@ -21,11 +21,19 @@
  //  Temple Place - Suite 330, Boston MA 02111-1307, USA.
  
  #include "RPC_TCP_Connector.h"
@@ -11,14 +11,10 @@ $NetBSD: patch-as,v 1.5 2004/12/09 18:45:32 minskim Exp $
 +#define PORTMAP
  
  #include <errno.h>
-+#ifdef __SUNPRO_CC
 +extern "C" {
-+#endif
  #include <rpc/rpc.h>
  #include <rpc/pmap_prot.h>
-+#ifdef __SUNPRO_CC
 +}
-+#endif
  #include <sys/ioctl.h>
 +#ifdef HAVE_SYS_FILIO_H
 +#include <sys/filio.h>
-- 
cgit v1.2.3