summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2006-06-26 17:11:39 +0000
committerwiz <wiz@pkgsrc.org>2006-06-26 17:11:39 +0000
commit19ef599f7a52e0081beee05c12090104aa6ecd03 (patch)
treee017eaef08f13c4616d332c477c0c76de1641d46
parentb8441d311694086cc8f32bf0496e8841fd38f659 (diff)
downloadpkgsrc-19ef599f7a52e0081beee05c12090104aa6ecd03.tar.gz
Fix build with gcc4. Addresses PR 33766.
Clean up a pkglint warning while here.
-rw-r--r--devel/bonobo/Makefile8
-rw-r--r--devel/bonobo/distinfo3
-rw-r--r--devel/bonobo/patches/patch-ab13
3 files changed, 19 insertions, 5 deletions
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index a45a3263143..ffbc9cf0954 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2006/04/17 13:46:02 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2006/06/26 17:11:39 wiz Exp $
DISTNAME= bonobo-1.0.22
PKGREVISION= 2
@@ -27,9 +27,9 @@ CONFIGURE_ARGS+= --enable-gtk-doc=no
PKGCONFIG_OVERRIDE= libefs/libefs.pc.in
post-install:
- -@${RMDIR} ${PREFIX}/share/libefs/html/libefs
- -@${RMDIR} ${PREFIX}/share/libefs/html
- -@${RMDIR} ${PREFIX}/share/libefs
+ -${RMDIR} ${PREFIX}/share/libefs/html/libefs
+ -${RMDIR} ${PREFIX}/share/libefs/html
+ -${RMDIR} ${PREFIX}/share/libefs
.include "../../graphics/gdk-pixbuf-gnome/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
diff --git a/devel/bonobo/distinfo b/devel/bonobo/distinfo
index cefa765cb12..40f7f0ca98b 100644
--- a/devel/bonobo/distinfo
+++ b/devel/bonobo/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.16 2005/02/23 22:24:10 agc Exp $
+$NetBSD: distinfo,v 1.17 2006/06/26 17:11:39 wiz Exp $
SHA1 (bonobo-1.0.22.tar.bz2) = 3ec89cc469adf482459e15f37a4008a0d0340c1a
RMD160 (bonobo-1.0.22.tar.bz2) = 9c013077770ca5452c92a9299a579bf41a7f2c5c
Size (bonobo-1.0.22.tar.bz2) = 1186349 bytes
SHA1 (patch-aa) = 03a65d084f79d310d95a1c122c4e2b1e90acc682
+SHA1 (patch-ab) = b24beeda7f60ac622e87ab4b4ee1bcc10423e757
diff --git a/devel/bonobo/patches/patch-ab b/devel/bonobo/patches/patch-ab
new file mode 100644
index 00000000000..c699480057f
--- /dev/null
+++ b/devel/bonobo/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.8 2006/06/26 17:11:39 wiz Exp $
+
+--- tests/test-any.c.orig 2002-01-28 10:54:07.000000000 +0000
++++ tests/test-any.c
+@@ -15,7 +15,7 @@ octet_subtypes_array [] = {
+ TC_octet
+ };
+
+-static const struct CORBA_TypeCode_struct
++const struct CORBA_TypeCode_struct
+ TC_CORBA_sequence_CORBA_octet_struct = {
+ {{(ORBit_RootObject_Interface *) & ORBit_TypeCode_epv, TRUE, -1},
+ ORBIT_PSEUDO_TYPECODE},