[pkgsrc/trunk]: pkgsrc/cad/gwave fix this package when building with sunpro c...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3dd035ad8a9a
branches:  trunk
changeset: 524295:3dd035ad8a9a
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Tue Jan 23 02:49:23 2007 +0000

description:
fix this package when building with sunpro compilers

diffstat:

 cad/gwave/distinfo         |   4 ++--
 cad/gwave/patches/patch-ae |  20 ++++++++++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diffs (62 lines):

diff -r b33754a9b250 -r 3dd035ad8a9a cad/gwave/distinfo
--- a/cad/gwave/distinfo        Tue Jan 23 01:27:00 2007 +0000
+++ b/cad/gwave/distinfo        Tue Jan 23 02:49:23 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2005/12/06 18:25:55 joerg Exp $
+$NetBSD: distinfo,v 1.9 2007/01/23 02:49:23 dmcmahill Exp $
 
 SHA1 (gwave-20030804.tar.gz) = 22983d0b6b646467eab584a6de0aef86d5148186
 RMD160 (gwave-20030804.tar.gz) = fd772026b1e62b7ddb7fa24e83bc5cb7678dc86d
@@ -7,7 +7,7 @@
 SHA1 (patch-ab) = cedd28158b2a467c93536ddd5a39dec8dd7d7c64
 SHA1 (patch-ac) = 7f535a13925577fa6a3acda2a1ab61eda4a2aad2
 SHA1 (patch-ad) = 2378a782cb99a2aebed0e058a88b4343604f38e8
-SHA1 (patch-ae) = e4023dc78ef7032a127e4d72507ac6f128aa3aec
+SHA1 (patch-ae) = a3e192f11a6bc8529a9c36f165f29d8944c9930c
 SHA1 (patch-af) = 8c3a5811711e521df2835208f7f1d4f421579cd1
 SHA1 (patch-ag) = b112064e3abdee36c66df027412580e18f90f686
 SHA1 (patch-ah) = 1f66028878250d183d532c36a1602b44f2d6d476
diff -r b33754a9b250 -r 3dd035ad8a9a cad/gwave/patches/patch-ae
--- a/cad/gwave/patches/patch-ae        Tue Jan 23 01:27:00 2007 +0000
+++ b/cad/gwave/patches/patch-ae        Tue Jan 23 02:49:23 2007 +0000
@@ -1,8 +1,20 @@
-$NetBSD: patch-ae,v 1.1 2003/11/05 22:31:43 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.2 2007/01/23 02:49:23 dmcmahill Exp $
+
+- fix multiline strings which newer gcc's don't like
+- fix __inline__ which sunpro doesn't like
 
 --- src/scwm_guile.c.orig      2002-03-27 23:07:03.000000000 -0500
 +++ src/scwm_guile.c
-@@ -45,12 +45,12 @@
+@@ -42,15 +42,21 @@
+ #include "dmalloc.h"
+ #endif
+ 
++#ifndef __GNUC__
++#ifndef __inline__
++#define __inline__ 
++#endif
++#endif
++
  extern char *prog_name;
  
  XSCM_HOOK(error_hook, "error-hook", 5, (SCM a, SCM b, SCM c, SCM d, SCM e),
@@ -21,7 +33,7 @@
  
  struct scwm_body_apply_data {
    SCM proc;
-@@ -209,12 +209,12 @@ scwm_safe_call7 (SCM proc, SCM arg1, SCM
+@@ -209,12 +215,12 @@ scwm_safe_call7 (SCM proc, SCM arg1, SCM
  /* FIXDOC: We need a way to cross-reference concepts in docs. */
  
  XSCM_CONCEPT("Hooks",
@@ -40,7 +52,7 @@
  
  static SCM run_hook_proc;
  
-@@ -395,11 +395,11 @@ scwm_handle_error (void *ARG_IGNORE(data
+@@ -395,11 +401,11 @@ scwm_handle_error (void *ARG_IGNORE(data
  
  XSCM_DEFINE(safe_load, "safe-load", 1, 0, 0,
             (SCM fname),