[44284] trunk/dports/gnustep/gnustep-make/Portfile

[ryandesign at macports.org]

Revision: 44284
          http://trac.macports.org/changeset/44284
Author:   ryandesign at macports.org
Date:     2008-12-24 15:50:13 -0800 (Wed, 24 Dec 2008)
Log Message:
-----------
gnustep-make: gnustep_layout should only be automatically selected if the user has not already requested fhs_layout

Modified Paths:
--------------
    trunk/dports/gnustep/gnustep-make/Portfile

Modified: trunk/dports/gnustep/gnustep-make/Portfile
===================================================================
--- trunk/dports/gnustep/gnustep-make/Portfile	2008-12-24 23:41:35 UTC (rev 44283)
+++ trunk/dports/gnustep/gnustep-make/Portfile	2008-12-24 23:50:13 UTC (rev 44284)
@@ -32,7 +32,9 @@
 
 destroot.args       messages=yes
 
-default_variants    +gnustep_layout
+if {![variant_isset fhs_layout]} {
+    default_variants    +gnustep_layout
+}
 
 # for the curious only, not really supported by MacPorts
 variant fhs_layout conflicts gnustep_layout {
@@ -46,7 +48,7 @@
     }
 }
 
-variant gnustep_layout {
+variant gnustep_layout conflicts fhs_layout {
     configure.pre_args      --prefix=${prefix}/GNUstep
     configure.args-append   \
         --with-config-file=${prefix}/GNUstep/System/Library/GNUstep.conf
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081224/4b0e9512/attachment.html>