[79068] trunk/dports/lang/perl5.12

[jeremyhu at macports.org]

Revision: 79068
          http://trac.macports.org/changeset/79068
Author:   jeremyhu at macports.org
Date:     2011-05-31 19:01:38 -0700 (Tue, 31 May 2011)
Log Message:
-----------
perl5.12: Use stdbool.h for bool to avoid conflicting types

Modified Paths:
--------------
    trunk/dports/lang/perl5.12/Portfile
    trunk/dports/lang/perl5.12/files/patch-hints_darwin.sh.diff

Added Paths:
-----------
    trunk/dports/lang/perl5.12/files/patch-handy.h.stdbool.diff

Modified: trunk/dports/lang/perl5.12/Portfile
===================================================================
--- trunk/dports/lang/perl5.12/Portfile	2011-06-01 00:15:05 UTC (rev 79067)
+++ trunk/dports/lang/perl5.12/Portfile	2011-06-01 02:01:38 UTC (rev 79068)
@@ -26,7 +26,7 @@
                     sha1    86d77c6cbc7a60068dc14c88ffd0729324d1174f \
                     rmd160  e3c5825aa800e2304dd815858880372500a4f9a0
 
-patchfiles	patch-Configure.diff 
+patchfiles	patch-Configure.diff patch-handy.h.stdbool.diff
 
 platform darwin {
     patchfiles-append   patch-hints_darwin.sh.diff

Added: trunk/dports/lang/perl5.12/files/patch-handy.h.stdbool.diff
===================================================================
--- trunk/dports/lang/perl5.12/files/patch-handy.h.stdbool.diff	                        (rev 0)
+++ trunk/dports/lang/perl5.12/files/patch-handy.h.stdbool.diff	2011-06-01 02:01:38 UTC (rev 79068)
@@ -0,0 +1,50 @@
+--- handy.h.orig	2011-01-09 12:20:55.000000000 -0800
++++ handy.h	2011-05-31 18:49:16.000000000 -0700
+@@ -70,45 +70,8 @@ Null SV pointer. (No longer available wh
+ #define MUTABLE_IO(p)	((IO *)MUTABLE_PTR(p))
+ #define MUTABLE_SV(p)	((SV *)MUTABLE_PTR(p))
+ 
+-/* XXX Configure ought to have a test for a boolean type, if I can
+-   just figure out all the headers such a test needs.
+-   Andy Dougherty	August 1996
+-*/
+-/* bool is built-in for g++-2.6.3 and later, which might be used
+-   for extensions.  <_G_config.h> defines _G_HAVE_BOOL, but we can't
+-   be sure _G_config.h will be included before this file.  _G_config.h
+-   also defines _G_HAVE_BOOL for both gcc and g++, but only g++
+-   actually has bool.  Hence, _G_HAVE_BOOL is pretty useless for us.
+-   g++ can be identified by __GNUG__.
+-   Andy Dougherty	February 2000
+-*/
+-#ifdef __GNUG__		/* GNU g++ has bool built-in */
+-#  ifndef HAS_BOOL
+-#    define HAS_BOOL 1
+-#  endif
+-#endif
+-
+-/* The NeXT dynamic loader headers will not build with the bool macro
+-   So declare them now to clear confusion.
+-*/
+-#if defined(NeXT) || defined(__NeXT__)
+-# undef FALSE
+-# undef TRUE
+-  typedef enum bool { FALSE = 0, TRUE = 1 } bool;
+-# define ENUM_BOOL 1
+-# ifndef HAS_BOOL
+-#  define HAS_BOOL 1
+-# endif /* !HAS_BOOL */
+-#endif /* NeXT || __NeXT__ */
+-
+-#ifndef HAS_BOOL
+-# if defined(UTS) || defined(VMS)
+-#  define bool int
+-# else
+-#  define bool char
+-# endif
+-# define HAS_BOOL 1
+-#endif
++#define HAS_BOOL 1
++#include <stdbool.h>
+ 
+ /* Try to figure out __func__ or __FUNCTION__ equivalent, if any.
+  * XXX Should really be a Configure probe, with HAS__FUNCTION__

Modified: trunk/dports/lang/perl5.12/files/patch-hints_darwin.sh.diff
===================================================================
--- trunk/dports/lang/perl5.12/files/patch-hints_darwin.sh.diff	2011-06-01 00:15:05 UTC (rev 79067)
+++ trunk/dports/lang/perl5.12/files/patch-hints_darwin.sh.diff	2011-06-01 02:01:38 UTC (rev 79068)
@@ -1,6 +1,6 @@
---- hints/darwin.sh.b	2010-04-26 01:09:19.000000000 -0700
-+++ hints/darwin.sh	2010-06-23 11:12:00.000000000 -0700
-@@ -134,7 +134,6 @@
+--- hints/darwin.sh.orig	2011-01-09 12:20:55.000000000 -0800
++++ hints/darwin.sh	2011-03-09 01:06:05.000000000 -0800
+@@ -134,7 +134,6 @@ esac
  
  # Shared library extension is .dylib.
  # Bundle extension is .bundle.
@@ -8,7 +8,7 @@
  so='dylib';
  dlext='bundle';
  usedl='define';
-@@ -172,6 +171,20 @@
+@@ -172,6 +171,20 @@ case "$osvers" in
     ldflags="${ldflags} -flat_namespace"
     lddlflags="${ldflags} -bundle -undefined suppress"
     ;;
@@ -29,7 +29,7 @@
  *) 
     lddlflags="${ldflags} -bundle -undefined dynamic_lookup"
     case "$ld" in
-@@ -253,6 +266,10 @@
+@@ -253,6 +266,10 @@ esac
  ;;
  esac
  
@@ -40,3 +40,9 @@
  ##
  # System libraries
  ##
+@@ -317,3 +334,5 @@ ranlib='ranlib'
+ # makefile in the same place.  Since Darwin uses GNU make, this dodges
+ # the problem.
+ firstmakefile=GNUmakefile;
++
++usenm='false'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110531/00094eaa/attachment.html>