[84636] trunk/dports/science/xastir

[ryandesign at macports.org]

Revision: 84636
          http://trac.macports.org/changeset/84636
Author:   ryandesign at macports.org
Date:     2011-09-29 00:06:35 -0700 (Thu, 29 Sep 2011)
Log Message:
-----------
xastir: enable universal variant, removing duplicate FLAG removal code that destroys multiple -arch flags

Modified Paths:
--------------
    trunk/dports/science/xastir/Portfile
    trunk/dports/science/xastir/files/patch-configure.ac.diff

Modified: trunk/dports/science/xastir/Portfile
===================================================================
--- trunk/dports/science/xastir/Portfile	2011-09-29 06:52:53 UTC (rev 84635)
+++ trunk/dports/science/xastir/Portfile	2011-09-29 07:06:35 UTC (rev 84636)
@@ -52,7 +52,4 @@
 configure.cppflags-append   -I${prefix}/include/db46
 configure.ldflags-append    -L${prefix}/lib/db46
 
-# shapelib is not universal
-universal_variant no
-
 livecheck.regex     /${name}-(\[0-9.\]+)/

Modified: trunk/dports/science/xastir/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/science/xastir/files/patch-configure.ac.diff	2011-09-29 06:52:53 UTC (rev 84635)
+++ trunk/dports/science/xastir/files/patch-configure.ac.diff	2011-09-29 07:06:35 UTC (rev 84636)
@@ -1,6 +1,26 @@
 --- configure.ac.orig	2010-10-25 22:02:22.000000000 -0500
-+++ configure.ac	2011-09-29 01:29:11.000000000 -0500
-@@ -926,7 +926,7 @@
++++ configure.ac	2011-09-29 01:56:47.000000000 -0500
+@@ -673,19 +673,6 @@
+ # 
+ LIBS=" -lXm -lXt -lX11 $LIBS" 
+   
+-# 
+-# Remove duplicate entries.  Thanks to Paul Lutt, ke7xt, for this! 
+-#
+-# Don't get rid of dupes on the LIBS line.  We may need the same
+-# "-Llibdir" called out several times, immediately prior to each
+-# "-llibrary" that needs it.
+-# 
+-changequote(,) 
+-CFLAGS=`echo  "$CFLAGS" | awk '{for(i=1;i<=NF;++i) {if (arg[$i]++ == 0) s = s " " $i} print s}'`
+-CPPFLAGS=`echo  "$CPPFLAGS" | awk '{for(i=1;i<=NF;++i) {if (arg[$i]++ == 0) s = s " " $i} print s}'`
+-LDFLAGS=`echo "$LDFLAGS" | awk '{for(i=1;i<=NF;++i) {if (arg[$i]++ == 0) s = s " " $i} print s}'`
+-#LIBS=`echo "$LIBS" | awk '{for(i=1;i<=NF;++i) {if (arg[$i]++ == 0) s = s " " $i} print s}'`
+-changequote([,]) 
+ 
+ 
+ # 
+@@ -926,7 +913,7 @@
  echo
  echo RECOMMENDED OPTIONS:
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110929/f8f358f6/attachment-0001.html>