From 2fe91d9028690e83788356aea68accd27af6e41d Mon Sep 17 00:00:00 2001
From: he <he@pkgsrc.org>
Date: Mon, 20 Apr 2009 07:55:00 +0000
Subject: While the logic for handling NetBSD/powerpc (and OpenBSD/powerpc) was
 correct, it was mis-placed in the file.  It needs to include <elf.h> or the
 moral equivalent of that before the symbols can be tested.  This now
 corresponds with what's committed upstream.

Again, since this is a build fix, no revision bump should be required.
---
 lang/parrot/distinfo         |  4 ++--
 lang/parrot/patches/patch-ab | 56 ++++++++++++++++++++++----------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'lang')

diff --git a/lang/parrot/distinfo b/lang/parrot/distinfo
index c2f41f334c7..17b3ae083ed 100644
--- a/lang/parrot/distinfo
+++ b/lang/parrot/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.10 2009/04/17 22:08:44 he Exp $
+$NetBSD: distinfo,v 1.11 2009/04/20 07:55:00 he Exp $
 
 SHA1 (parrot-1.0.0.tar.gz) = 9e028f5fff38a332c13ad4389652a016d7a824f7
 RMD160 (parrot-1.0.0.tar.gz) = 46f60accd33f16cc910f4ea03840badc358d22c7
 Size (parrot-1.0.0.tar.gz) = 3908888 bytes
 SHA1 (patch-aa) = b3ad6ae9acbd8f25682395933fe48209b50a9752
-SHA1 (patch-ab) = d58ab8a52dc844069e318f8442d5325a3afad876
+SHA1 (patch-ab) = 9165c08ded7b434e1baabe7d64ede08d00155e72
 SHA1 (patch-ac) = 5e2875b46aa390fc512bf22001146a4a470ae192
 SHA1 (patch-ad) = 9002a7ca55f8f960bea669e383431b3eeb83a878
 SHA1 (patch-ae) = 72e4752112dab2f0b72ede5c45b77fd5b5554606
diff --git a/lang/parrot/patches/patch-ab b/lang/parrot/patches/patch-ab
index 794f21e9c9d..0abce3717e3 100644
--- a/lang/parrot/patches/patch-ab
+++ b/lang/parrot/patches/patch-ab
@@ -1,36 +1,36 @@
-$NetBSD: patch-ab,v 1.6 2009/04/17 22:08:44 he Exp $
+$NetBSD: patch-ab,v 1.7 2009/04/20 07:55:00 he Exp $
 
 The R_PPC_ADDR16{HI,LO} constants are named something else on
 NetBSD, and might be elsewhere.
 Also add workarounds for NetBSD/powerpc 3.x, which has some
 constants defined as enums.
 
---- src/exec_save.c.orig	2009-03-08 20:32:43.000000000 +0000
-+++ src/exec_save.c
-@@ -30,6 +30,26 @@ static void save_int(FILE *fp, int i);
- static void save_short(FILE *fp, short s);
- static void save_struct(FILE *fp, void *sp, size_t size);
+--- src/exec_save.c.orig	2009-03-08 21:32:43.000000000 +0100
++++ src/exec_save.c	2009-04-19 12:55:25.000000000 +0200
+@@ -150,6 +150,26 @@
+ #    include <elf.h>
+ #  endif
  
-+#if defined(PARROT_PPC)
-+#if !defined(R_PPC_ADDR16_HI) && !defined(R_PPC_ADDR16_LO) && \
-+	defined(R_PPC_16_HI) && defined(R_PPC_16_LO)
-+# define	R_PPC_ADDR16_HI	R_PPC_16_HI
-+# define	R_PPC_ADDR16_LO	R_PPC_16_LO
-+#endif
-+/*
-+ * NetBSD/powerpc 3.x doesn't define these constants,
-+ * but instead has them as enums, so add some workarounds for it.
-+ */
-+#if !defined(R_PPC_ADDR16_HI) && !defined(R_PPC_ADDR16_LO) && \
-+	defined(__NetBSD__)
-+# define	R_PPC_ADDR16_HI RELOC_16_HI
-+# define	R_PPC_ADDR16_LO RELOC_16_LO
-+#endif
-+#if !defined(R_PPC_REL24) && defined(__NetBSD__)
-+# define	R_PPC_REL24	RELOC_REL24
-+#endif
-+#endif /* PARROT_PPC */
++#  if defined(PARROT_PPC)
++#    if !defined(R_PPC_ADDR16_HI) && !defined(R_PPC_ADDR16_LO) && \
++         defined(R_PPC_16_HI) && defined(R_PPC_16_LO)
++#      define	R_PPC_ADDR16_HI	R_PPC_16_HI
++#      define	R_PPC_ADDR16_LO	R_PPC_16_LO
++#    endif
++     /*
++      * NetBSD/powerpc 3.x and OpenBSD/powerpc doesn't define these constants,
++      * but instead has them as enums, so add some workarounds for those.
++      */
++#    if !defined(R_PPC_ADDR16_HI) && !defined(R_PPC_ADDR16_LO) && \
++         (defined(__NetBSD__) || defined(__OpenBSD__))
++#      define	R_PPC_ADDR16_HI RELOC_16_HI
++#      define	R_PPC_ADDR16_LO RELOC_16_LO
++#    endif
++#    if !defined(R_PPC_REL24) && (defined(__NetBSD__) || defined(__OpenBSD__))
++#      define	R_PPC_REL24	RELOC_REL24
++#    endif
++#  endif /* PARROT_PPC */
 +
- #ifdef EXEC_A_OUT
- 
- #  include <a.out.h>
+ /* Add a section to the file
+  *
+  * n = Name
-- 
cgit v1.2.3