[pkgsrc/trunk]: pkgsrc/sysutils/vobcopy Don't declare bool enum if TRUE and F...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bb952c7f34b3
branches:  trunk
changeset: 528709:bb952c7f34b3
user:      darcy <darcy%pkgsrc.org@localhost>
date:      Sun May 13 06:14:38 2007 +0000

description:
Don't declare bool enum if TRUE and FALSE are already defined.  Fixes
failure in bulk build.

diffstat:

 sysutils/vobcopy/distinfo         |   3 ++-
 sysutils/vobcopy/patches/patch-ac |  22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)

diffs (39 lines):

diff -r 7bc35b22b261 -r bb952c7f34b3 sysutils/vobcopy/distinfo
--- a/sysutils/vobcopy/distinfo Sun May 13 02:59:08 2007 +0000
+++ b/sysutils/vobcopy/distinfo Sun May 13 06:14:38 2007 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2006/05/19 08:32:04 joerg Exp $
+$NetBSD: distinfo,v 1.7 2007/05/13 06:14:38 darcy Exp $
 
 SHA1 (vobcopy-0.5.14.tar.gz) = d4d7c6c5ed4380e4a57e82f561892ad7fba9593b
 RMD160 (vobcopy-0.5.14.tar.gz) = 47887e9897b1217e3841fd239cfaa2f2973cb9f5
 Size (vobcopy-0.5.14.tar.gz) = 44420 bytes
 SHA1 (patch-aa) = 431d7d05356fd8e756bcdf67a822360e9183492e
 SHA1 (patch-ab) = eea1f5bb3004e86281663c03c8662d5b6e4ea4fe
+SHA1 (patch-ac) = 47573a8ce870474a585a0dfc7bf434e822d009c0
diff -r 7bc35b22b261 -r bb952c7f34b3 sysutils/vobcopy/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/vobcopy/patches/patch-ac Sun May 13 06:14:38 2007 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1 2007/05/13 06:14:38 darcy Exp $
+
+--- vobcopy.h.orig     2004-11-22 14:12:58.000000000 -0500
++++ vobcopy.h
+@@ -5,6 +5,9 @@
+ #define MAX_STRING  81
+ #define MAX_DIFFER  2000
+ 
++#if defined(FALSE)
++typedef int bool;
++#else
+ #if defined(__APPLE__) && defined(__GNUC__)
+ typedef int bool;
+ 
+@@ -13,6 +16,7 @@ typedef int bool;
+ #else
+   typedef enum  { FALSE=0, TRUE=1 }  bool;
+ #endif /* Darwin */
++#endif /* defined FALSE */
+ 
+ 
+ void usage(char *);