[73669] trunk/dports/devel/PlasmaShop

[ryandesign at macports.org]

Revision: 73669
          http://trac.macports.org/changeset/73669
Author:   ryandesign at macports.org
Date:     2010-11-20 20:56:12 -0800 (Sat, 20 Nov 2010)
Log Message:
-----------
PlasmaShop: add universal variant

Modified Paths:
--------------
    trunk/dports/devel/PlasmaShop/Portfile
    trunk/dports/devel/PlasmaShop/files/patch-config.diff

Modified: trunk/dports/devel/PlasmaShop/Portfile
===================================================================
--- trunk/dports/devel/PlasmaShop/Portfile	2010-11-21 04:02:09 UTC (rev 73668)
+++ trunk/dports/devel/PlasmaShop/Portfile	2010-11-21 04:56:12 UTC (rev 73669)
@@ -47,24 +47,31 @@
 
 patchfiles                  patch-prefix.diff patch-config.diff
 
+variant universal {}
+if {[variant_isset universal]} {
+    set archflags ${configure.universal_cflags}
+} else {
+    set archflags ${configure.cc_archflags}
+}
+
 post-patch {
     foreach file ${files_being_patched} {
         reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/${file}
         reinplace "s|@APPLICATIONS_DIR@|${applications_dir}|g" ${worksrcpath}/${file}
     }
-    reinplace "s|@CFLAGS@|${configure.cflags} ${configure.cc_archflags}|g" ${worksrcpath}/config
-    reinplace "s|@CXXFLAGS@|${configure.cxxflags} ${configure.cxx_archflags}|g" ${worksrcpath}/config
-    reinplace "s|@LDFLAGS@|${configure.ldflags} ${configure.ld_archflags}|g" ${worksrcpath}/config
+    reinplace "s|@CFLAGS@|${configure.cflags} ${archflags}|g" ${worksrcpath}/config
+    reinplace "s|@CXXFLAGS@|${configure.cxxflags} ${archflags}|g" ${worksrcpath}/config
+    reinplace "s|@LDFLAGS@|${configure.ldflags} ${archflags}|g" ${worksrcpath}/config
 }
 
 configure.cmd               ${qt_qmake_cmd}
 configure.pre_args
 
+configure.universal_args-delete --disable-dependency-tracking
+
 # http://forum.guildofwriters.com/viewtopic.php?f=86&t=4145#p40027
 use_parallel_build          no
 
-universal_variant           no
-
 platform darwin {
     if {${os.major} < 10} {
         set font Monaco

Modified: trunk/dports/devel/PlasmaShop/files/patch-config.diff
===================================================================
--- trunk/dports/devel/PlasmaShop/files/patch-config.diff	2010-11-21 04:02:09 UTC (rev 73668)
+++ trunk/dports/devel/PlasmaShop/files/patch-config.diff	2010-11-21 04:56:12 UTC (rev 73669)
@@ -1,5 +1,5 @@
 --- config.orig	Tue Nov 16 15:07:59 2010 -0800
-+++ config	Sat Nov 20 03:53:51 2010 -0600
++++ config	Sat Nov 20 22:36:50 2010 -0600
 @@ -1,10 +1,12 @@
  # Configure where libHSPlasma is installed
 -PLASMA_PATH=<<EDIT ME>>
@@ -21,4 +21,4 @@
 +
 +QMAKE_CFLAGS += @CFLAGS@
 +QMAKE_CXXFLAGS += @CXXFLAGS@
-+QMAKE_LDFLAGS += @LDFLAGS@
++QMAKE_LFLAGS += @LDFLAGS@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101120/2663254d/attachment.html>