[pkgsrc/pkgsrc-2012Q1]: pkgsrc/devel/guile-gnome Pullup ticket #3772 - reques...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/37535473e9c6
branches:  pkgsrc-2012Q1
changeset: 602081:37535473e9c6
user:      tron <tron%pkgsrc.org@localhost>
date:      Sun May 06 01:06:25 2012 +0000

description:
Pullup ticket #3772 - requested by dholland
devel/guile-gnome: build fix

Revisions pulled up:
- devel/guile-gnome/distinfo                                    1.6
- devel/guile-gnome/patches/patch-corba_gnome_corba_Makefile.in 1.1
- devel/guile-gnome/patches/patch-glib_gnome_gobject_Makefile.in 1.1

---
   Module Name: pkgsrc
   Committed By:        hans
   Date:                Fri May  4 13:15:18 UTC 2012

   Modified Files:
        pkgsrc/devel/guile-gnome: distinfo
   Added Files:
        pkgsrc/devel/guile-gnome/patches: patch-corba_gnome_corba_Makefile.in
            patch-glib_gnome_gobject_Makefile.in

   Log Message:
   Fix build with gcc 4.6.

diffstat:

 devel/guile-gnome/distinfo                                     |   4 ++-
 devel/guile-gnome/patches/patch-corba_gnome_corba_Makefile.in  |  13 ++++++++++
 devel/guile-gnome/patches/patch-glib_gnome_gobject_Makefile.in |  13 ++++++++++
 3 files changed, 29 insertions(+), 1 deletions(-)

diffs (49 lines):

diff -r 5c2f17cf74e5 -r 37535473e9c6 devel/guile-gnome/distinfo
--- a/devel/guile-gnome/distinfo        Sun May 06 00:21:57 2012 +0000
+++ b/devel/guile-gnome/distinfo        Sun May 06 01:06:25 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2011/05/13 02:50:06 dmcmahill Exp $
+$NetBSD: distinfo,v 1.5.8.1 2012/05/06 01:06:25 tron Exp $
 
 SHA1 (guile-gnome-platform-2.16.1.tar.gz) = 3cf7cc8de6f261e6cf48d34e691706fe4b7f1061
 RMD160 (guile-gnome-platform-2.16.1.tar.gz) = 4723f091e015c4fca6986c48fa143e7fd3070631
@@ -6,3 +6,5 @@
 SHA1 (patch-aa) = 6343a2d81e9f2747250f231beee376c21ba3bfb5
 SHA1 (patch-ab) = bcfc2cf7eccbef8c17db683a7fbbdef7b05c9d42
 SHA1 (patch-ac) = 7409fd75f94ec0a59b94939853b41b85e1a69768
+SHA1 (patch-corba_gnome_corba_Makefile.in) = 52e00564e2d246e78e82787809706aa7c7e44523
+SHA1 (patch-glib_gnome_gobject_Makefile.in) = 83a5533d70e36bb55476661af066e0ceaf13c1f0
diff -r 5c2f17cf74e5 -r 37535473e9c6 devel/guile-gnome/patches/patch-corba_gnome_corba_Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/guile-gnome/patches/patch-corba_gnome_corba_Makefile.in     Sun May 06 01:06:25 2012 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-corba_gnome_corba_Makefile.in,v 1.1.2.2 2012/05/06 01:06:25 tron Exp $
+
+--- corba/gnome/corba/Makefile.in.orig 2008-07-03 17:18:02.000000000 +0200
++++ corba/gnome/corba/Makefile.in      2012-05-03 17:10:49.783244723 +0200
+@@ -693,7 +693,7 @@ export GUILE_LOAD_PATH
+       || { rm $@; false; }
+ .c.doc:
+       $(CPP) -DSCM_MAGIC_SNARF_DOCS $(GUILE_SNARF_CFLAGS) $< \
+-        | grep -E '^\^\^ {.*\^\^ }' > $@ || { rm $@; false; }
++        | grep -E '(\^\^ {|\^\^ })' > $@ || { rm $@; false; }
+ 
+ %.scm guile-gnome-gw-%.c: %-spec.scm
+       guile $(GUILE_FLAGS) -c \
diff -r 5c2f17cf74e5 -r 37535473e9c6 devel/guile-gnome/patches/patch-glib_gnome_gobject_Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/guile-gnome/patches/patch-glib_gnome_gobject_Makefile.in    Sun May 06 01:06:25 2012 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-glib_gnome_gobject_Makefile.in,v 1.1.2.2 2012/05/06 01:06:25 tron Exp $
+
+--- glib/gnome/gobject/Makefile.in.orig        2008-07-03 17:18:05.000000000 +0200
++++ glib/gnome/gobject/Makefile.in     2012-05-03 16:48:27.192315854 +0200
+@@ -770,7 +770,7 @@ export GUILE_LOAD_PATH
+       || { rm $@; false; }
+ .c.doc:
+       $(CPP) -DSCM_MAGIC_SNARF_DOCS $(GUILE_SNARF_CFLAGS) $< \
+-        | grep -E '^\^\^ {.*\^\^ }' > $@ || { rm $@; false; }
++        | grep -E '(\^\^ {|\^\^ })' > $@ || { rm $@; false; }
+ 
+ %.scm guile-gnome-gw-%.c: %-spec.scm
+       guile $(GUILE_FLAGS) -c \