[80733] trunk/dports/perl/p5-net-libidn

[jeremyhu at macports.org]

Revision: 80733
          http://trac.macports.org/changeset/80733
Author:   jeremyhu at macports.org
Date:     2011-07-16 10:06:26 -0700 (Sat, 16 Jul 2011)
Log Message:
-----------
p5-net-libidn: Build fix for building -universal with a +universal perl.  Dev ack via email.

Modified Paths:
--------------
    trunk/dports/perl/p5-net-libidn/Portfile
    trunk/dports/perl/p5-net-libidn/files/patch-Makefile.PL.diff

Modified: trunk/dports/perl/p5-net-libidn/Portfile
===================================================================
--- trunk/dports/perl/p5-net-libidn/Portfile	2011-07-16 17:01:21 UTC (rev 80732)
+++ trunk/dports/perl/p5-net-libidn/Portfile	2011-07-16 17:06:26 UTC (rev 80733)
@@ -21,8 +21,11 @@
 patchfiles-append       patch-Makefile.PL.diff
 
 post-patch {
-    reinplace "s|@CC@|${configure.cc} ${configure.cppflags}|g" ${worksrcpath}/Makefile.PL
+    reinplace "s|@CC@|${configure.cc}|g" ${worksrcpath}/Makefile.PL
+
+    if {[variant_isset universal]} {
+        reinplace "s|@CFLAGS@|${configure.cppflags} ${configure.universal_cflags}|g" ${worksrcpath}/Makefile.PL
+    } else {
+        reinplace "s|@CFLAGS@|${configure.cppflags} ${configure.cc_archflags}|g" ${worksrcpath}/Makefile.PL
+    }
 }
-
-configure.env           C_INCLUDE_PATH="${prefix}/include" \
-                        LIBRARY_PATH="${prefix}/lib"

Modified: trunk/dports/perl/p5-net-libidn/files/patch-Makefile.PL.diff
===================================================================
--- trunk/dports/perl/p5-net-libidn/files/patch-Makefile.PL.diff	2011-07-16 17:01:21 UTC (rev 80732)
+++ trunk/dports/perl/p5-net-libidn/files/patch-Makefile.PL.diff	2011-07-16 17:06:26 UTC (rev 80733)
@@ -1,6 +1,15 @@
---- Makefile.PL.orig	2007-12-12 16:28:08.000000000 -0600
-+++ Makefile.PL	2009-07-17 02:01:17.000000000 -0500
-@@ -167,7 +167,7 @@
+--- Makefile.PL.orig	2011-07-15 22:50:57.000000000 -0700
++++ Makefile.PL	2011-07-15 22:53:15.000000000 -0700
+@@ -65,7 +65,7 @@ sub InitMakeParams
+ 		$Params{INC} = '';
+ 	}
+ 
+-	my $libidn = CheckLibidn($Params{INC}, $Params{LIBS});
++	my $libidn = CheckLibidn("@CFLAGS@", "-lidn");
+ 
+ 	unless($libidn)
+ 	{
+@@ -165,7 +165,7 @@ sub CheckCCode
  		return 0;
  	}
  
@@ -8,4 +17,4 @@
 +	my $cc = '@CC@';
  	{
  		unlink($test);
- 		system "$cc $cflags $ldflags -o $test $test.c";
+ 		system "$cc $cflags -o $test $test.c $ldflags";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110716/62b15a56/attachment.html>