[pkgsrc/trunk]: pkgsrc/archivers/file-roller fix previous more correctly: jus...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/039a87895236
branches:  trunk
changeset: 395063:039a87895236
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Mon Jul 06 10:49:55 2009 +0000

description:
fix previous more correctly: just remove the offending file,
it will be rebuilt

diffstat:

 archivers/file-roller/Makefile         |   7 ++++++-
 archivers/file-roller/distinfo         |   3 +--
 archivers/file-roller/patches/patch-ab |  13 -------------
 3 files changed, 7 insertions(+), 16 deletions(-)

diffs (50 lines):

diff -r 6776d6c5a7ff -r 039a87895236 archivers/file-roller/Makefile
--- a/archivers/file-roller/Makefile    Sun Jul 05 21:57:38 2009 +0000
+++ b/archivers/file-roller/Makefile    Mon Jul 06 10:49:55 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2009/05/19 13:55:25 wiz Exp $
+# $NetBSD: Makefile,v 1.93 2009/07/06 10:49:55 drochner Exp $
 #
 
 DISTNAME=      file-roller-2.26.2
@@ -30,6 +30,11 @@
 BUILDLINK_API_DEPENDS.gtk2+=           gtk2+>=2.10.0
 BUILDLINK_API_DEPENDS.libglade+=       libglade>=2.4.0
 
+# XXX force regen, bundled one doesn't fit
+# see gnome bugzilla #587869
+post-extract:
+       ${RM} ${WRKSRC}/src/fr-enum-types.c
+
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff -r 6776d6c5a7ff -r 039a87895236 archivers/file-roller/distinfo
--- a/archivers/file-roller/distinfo    Sun Jul 05 21:57:38 2009 +0000
+++ b/archivers/file-roller/distinfo    Mon Jul 06 10:49:55 2009 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.46 2009/07/05 19:40:59 apb Exp $
+$NetBSD: distinfo,v 1.47 2009/07/06 10:49:55 drochner Exp $
 
 SHA1 (file-roller-2.26.2.tar.bz2) = 4989d1e2d5c7f13e9e5612625ae9ea5770f551cb
 RMD160 (file-roller-2.26.2.tar.bz2) = 7697cc08cb493da99d21afb913f5e1a57ca8de9c
 Size (file-roller-2.26.2.tar.bz2) = 1565897 bytes
 SHA1 (patch-aa) = 0e536d0b9c8e88b97ea7af600e3bb6d6ba496acf
-SHA1 (patch-ab) = cc9b568c0cb14d90645d07340589b78c4cf6fee9
diff -r 6776d6c5a7ff -r 039a87895236 archivers/file-roller/patches/patch-ab
--- a/archivers/file-roller/patches/patch-ab    Sun Jul 05 21:57:38 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2009/07/05 19:40:59 apb Exp $
-
---- src/fr-enum-types.c.orig   2009-04-30 11:03:57.000000000 +0200
-+++ src/fr-enum-types.c
-@@ -4,7 +4,7 @@
- #include <glib-object.h>
- 
- /* enumerations from "/home/paolo/workspace/file-roller/src/typedefs.h" */
--#include "/home/paolo/workspace/file-roller/src/typedefs.h"
-+#include "typedefs.h"
- GType
- fr_compression_get_type (void)
- {