[pkgsrc/trunk]: pkgsrc/editors/elvis Added patch-ae, which resolves a name co...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bcae81cfce2a
branches:  trunk
changeset: 515148:bcae81cfce2a
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Jun 26 10:21:55 2006 +0000

description:
Added patch-ae, which resolves a name collision (FT_FILE) with FreeType.

diffstat:

 editors/elvis/distinfo         |   3 ++-
 editors/elvis/patches/patch-ae |  14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletions(-)

diffs (32 lines):

diff -r 821af0a8ae47 -r bcae81cfce2a editors/elvis/distinfo
--- a/editors/elvis/distinfo    Mon Jun 26 09:54:45 2006 +0000
+++ b/editors/elvis/distinfo    Mon Jun 26 10:21:55 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2006/05/15 16:29:19 joerg Exp $
+$NetBSD: distinfo,v 1.7 2006/06/26 10:21:55 rillig Exp $
 
 SHA1 (elvis-2.2_0.tar.gz) = 8c16574b6d36529735b8ced70972ddaf6275a477
 RMD160 (elvis-2.2_0.tar.gz) = 9867a3941a84a3db0bcfe4e36dd14132fbcf5805
@@ -6,3 +6,4 @@
 SHA1 (patch-ab) = 3ded3089b617bccc3458e6c9101a339534fd3152
 SHA1 (patch-ac) = bbed33584e0301da4265727082336fb941e1638b
 SHA1 (patch-ad) = 702b08ec1182c3673721de62690a3a7c32983b8a
+SHA1 (patch-ae) = 2a8eb92b44fa932fcc51e7af999f1363dd53ff74
diff -r 821af0a8ae47 -r bcae81cfce2a editors/elvis/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/elvis/patches/patch-ae    Mon Jun 26 10:21:55 2006 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 2006/06/26 10:21:55 rillig Exp $
+
+--- guix11/xdialog.h.orig      2006-06-26 12:17:12.000000000 +0200
++++ guix11/xdialog.h   2006-06-26 12:19:24.000000000 +0200
+@@ -1,5 +1,9 @@
+ /* xdialog.h */
+ 
++/* Let's hope that there will be no conflict with FreeType,
++ * which had defined this to FILE. */
++#undef FT_FILE
++
+ typedef enum {
+       FT_DEFAULT,     /* dummy value, for fields with no explicit type */
+       FT_ONEOF,       /* one of a preset list; includes boolean */