[61977] trunk/dports/graphics/dcraw/Portfile

ryandesign at macports.org ryandesign at macports.org
Sat Dec 26 09:48:03 PST 2009


Revision: 61977
          http://trac.macports.org/changeset/61977
Author:   ryandesign at macports.org
Date:     2009-12-26 09:48:00 -0800 (Sat, 26 Dec 2009)
Log Message:
-----------
dcraw: fix universal variant, which seems to have been broken since r39644

Revision Links:
--------------
    http://trac.macports.org/changeset/39644

Modified Paths:
--------------
    trunk/dports/graphics/dcraw/Portfile

Modified: trunk/dports/graphics/dcraw/Portfile
===================================================================
--- trunk/dports/graphics/dcraw/Portfile	2009-12-26 17:29:57 UTC (rev 61976)
+++ trunk/dports/graphics/dcraw/Portfile	2009-12-26 17:48:00 UTC (rev 61977)
@@ -5,6 +5,7 @@
 
 name                    dcraw
 version                 8.99-20091225135800
+revision                1
 set version_number      [lindex [split ${version} -] 0]
 categories              graphics
 maintainers             ryandesign
@@ -14,6 +15,7 @@
 distname                ${name}-${version_number}
 worksrcdir              $name
 dist_subdir             ${name}/${version}
+use_configure           no
 use_parallel_build      yes
 
 description             Digital camera raw photo decoding software supporting \
@@ -42,14 +44,22 @@
     xinstall -W ${filespath} Makefile.in ${worksrcpath}/Makefile
 }
 
-configure {
-    reinplace "s|@CC@|${configure.cc}|g" ${worksrcpath}/Makefile
-    reinplace "s|@CFLAGS@|${configure.cflags}|g" ${worksrcpath}/Makefile
-    reinplace "s|@CPPFLAGS@|${configure.cppflags}|g" ${worksrcpath}/Makefile
-    reinplace "s|@LDFLAGS@|${configure.ldflags}|g" ${worksrcpath}/Makefile
-    reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/Makefile
+variant universal {
+    configure.cflags-append ${configure.universal_cflags}
+    configure.cppflags-append ${configure.universal_cppflags}
+    configure.ldflags-append ${configure.universal_ldflags}
 }
 
+pre-build {
+    build.args          CC=${configure.cc} \
+                        CFLAGS="[join ${configure.cflags}]" \
+                        CPPFLAGS="[join ${configure.cppflags}]" \
+                        LDFLAGS="[join ${configure.ldflags}]" \
+                        PREFIX=${prefix}
+}
+
+destroot.args           PREFIX=${prefix}
+
 set my_locales          {eo ru fr it de pt es zh_TW zh_CN nl pl hu ca cs sv}
 
 post-destroot {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091226/253a5df1/attachment.html>


More information about the macports-changes mailing list