[52654] trunk/dports/audio/ardour2

[devans at macports.org]

Revision: 52654
          http://trac.macports.org/changeset/52654
Author:   devans at macports.org
Date:     2009-06-20 11:00:33 -0700 (Sat, 20 Jun 2009)
Log Message:
-----------
ardour2:

  * properly set configure.compiler to use macports gcc43
  * properly set build.env and destroot.env using ${configure.cc}, ${configure.cxx}, ${configure.cpp} to ensure absolute paths to executables
  * patch gtk2_ardour/SConscript to allow explicit invocation of 'cpp' to be replaced by ${configure.cpp} using post-patch reinplace
  * increment revision in case this results in different compilation
  * thanks to ryandesign for his patch, test device and suggestions.  Closes #19879.

Modified Paths:
--------------
    trunk/dports/audio/ardour2/Portfile

Added Paths:
-----------
    trunk/dports/audio/ardour2/files/patch-gtk2_ardour-SConscript.diff

Modified: trunk/dports/audio/ardour2/Portfile
===================================================================
--- trunk/dports/audio/ardour2/Portfile	2009-06-20 17:57:34 UTC (rev 52653)
+++ trunk/dports/audio/ardour2/Portfile	2009-06-20 18:00:33 UTC (rev 52654)
@@ -5,6 +5,7 @@
 
 name                    ardour2
 version                 2.8
+revision                1
 distname                ardour-${version}
 maintainers             devans
 categories              audio x11
@@ -51,21 +52,24 @@
 patchfiles              patch-SConstruct.diff \
                         patch-libs-pbd-mountpoint.cc.diff \
                         patch-libs-pbd-pathscanner.cc.diff \
+                        patch-gtk2_ardour-SConscript.diff \
                         patch-gtk2_ardour-nag.cc.diff
 
 post-patch {
     reinplace "s%@MP_PREFIX@%${prefix}%g" ${worksrcpath}/SConstruct
+    reinplace "s%@MP_CPP@%${configure.cpp}%g" ${worksrcpath}/gtk2_ardour/SConscript
 }
 
+configure.compiler      macports-gcc-4.3
 use_configure           no
 
 build.cmd               scons
 build.target
 build.args              PREFIX=${prefix} VST=0 AUBIO=1 FREESOUND=1 LV2=0
-build.env               CC=gcc-mp-4.3 CXX=g++-mp-4.3
+build.env               CC=${configure.cc} CXX=${configure.cxx} CPP=${configure.cpp}
 
 destroot.cmd            scons
-destroot.env            CC=gcc-mp-4.3 CXX=g++-mp-4.3
+destroot.env            CC=${configure.cc} CXX=${configure.cxx} CPP=${configure.cpp}
 
 variant lv2 description {Add support for LV2 plugins (currently broken)} {
         build.args-delete LV2=0

Added: trunk/dports/audio/ardour2/files/patch-gtk2_ardour-SConscript.diff
===================================================================
--- trunk/dports/audio/ardour2/files/patch-gtk2_ardour-SConscript.diff	                        (rev 0)
+++ trunk/dports/audio/ardour2/files/patch-gtk2_ardour-SConscript.diff	2009-06-20 18:00:33 UTC (rev 52654)
@@ -0,0 +1,14 @@
+--- gtk2_ardour/SConscript.orig	2009-06-19 21:48:51.000000000 -0700
++++ gtk2_ardour/SConscript	2009-06-19 21:55:28.000000000 -0700
+@@ -405,9 +405,9 @@
+ # 
+ 
+ if env['GTKOSX']:
+-	ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P -DGTKOSX -DTOP_MENUBAR ardour.menus.in ardour.menus", chdir=1)
++	ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "@MP_CPP@ -E -P -DGTKOSX -DTOP_MENUBAR ardour.menus.in ardour.menus", chdir=1)
+ else:
+-	ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "cpp -E -P ardour.menus.in ardour.menus", chdir=1)
++	ardour_menus = env.Command ('ardour.menus', 'ardour.menus.in', "@MP_CPP@ -E -P ardour.menus.in ardour.menus", chdir=1)
+ 
+ ardour_dark_theme = env.SubstInFile ('ardour2_ui_dark.rc', 'ardour2_ui_dark.rc.in', SUBST_DICT = my_font_dict)
+ ardour_light_theme = env.SubstInFile ('ardour2_ui_light.rc', 'ardour2_ui_light.rc.in', SUBST_DICT = my_font_dict)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090620/e7490565/attachment-0001.html>