[69313] trunk/dports/science/root

30 Jun 2010

Revision: 69313
          http://trac.macports.org/changeset/69313
Author:   michaelld@macports.org
Date:     2010-06-29 21:40:19 -0700 (Tue, 29 Jun 2010)
Log Message:
-----------
Removed the incorrect usage of /opt/local in a patchfile, by moving to
@PREFIX@ and then replacing with ${prefix} in post-configure.

Modified Paths:
--------------
    trunk/dports/science/root/Portfile
    trunk/dports/science/root/files/patch-config-Makefile.config.diff

Modified: trunk/dports/science/root/Portfile
===================================================================

--- trunk/dports/science/root/Portfile	2010-06-30 04:18:44 UTC (rev 69312)
+++ trunk/dports/science/root/Portfile	2010-06-30 04:40:19 UTC (rev 69313)
@@ -5,7 +5,7 @@
 
 name                root
 version             5.26.00b
-revision            2
+revision            3
 categories          science
 maintainers         gmail.com:mattiafrancescomoro
 license             LGPLv2.1
@@ -47,7 +47,7 @@
     if {${build_arch} == "i386" || ${build_arch} == "ppc"} {
        configure.pre_args macosx --prefix=${prefix}
     } else {
-       configure.pre_args macos64 --prefix=${prefix}
+       configure.pre_args macosx64 --prefix=${prefix}
     }
 }
 
@@ -182,7 +182,10 @@
 
     post-configure {
         # patch up the Makefile.config to handle the QTLIB frameworks correctly
-	system "cd ${worksrcpath} && patch -p0 < ${filespath}/patch-config-Makefile.config.diff"
+        # first, patch using @PREFIX@
+        system "cd ${worksrcpath} && patch -p0 < ${filespath}/patch-config-Makefile.config.diff"
+        # then replace @PREFIX@ with ${prefix}
+        reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/config/Makefile.config
     }
 }
 

Modified: trunk/dports/science/root/files/patch-config-Makefile.config.diff
===================================================================
--- trunk/dports/science/root/files/patch-config-Makefile.config.diff	2010-06-30 04:18:44 UTC (rev 69312)
+++ trunk/dports/science/root/files/patch-config-Makefile.config.diff	2010-06-30 04:40:19 UTC (rev 69313)
@@ -5,7 +5,7 @@
  BUILDQTGSI     := yes
  QTLIBDIR       := -L/opt/local/libexec/qt4-mac/lib
 -QTLIB          := QtCore.la QtGui.la Qt3Support.la QtOpenGL.la QtSvg.la QtXml.la QtWebKit.la QtNetwork.la
-+QTLIB          := -F/opt/local/libexec/qt4-mac/lib -framework QtCore -framework QtGui -framework Qt3Support -framework QtOpenGL -framework QtSvg -framework QtXml -framework QtWebKit -framework QtNetwork -framework ApplicationServices -framework Carbon -framework AppKit -L/opt/local/libexec/qt4-mac/lib -lpng -lz -lm
++QTLIB          := -F@PREFIX@/libexec/qt4-mac/lib -framework QtCore -framework QtGui -framework Qt3Support -framework QtOpenGL -framework QtSvg -framework QtXml -framework QtWebKit -framework QtNetwork -framework ApplicationServices -framework Carbon -framework AppKit -L@PREFIX@/libexec/qt4-mac/lib -lpng -lz -lm
  QTINCDIR       := $(filter-out /usr/include, /opt/local/libexec/qt4-mac/include/ /opt/local/libexec/qt4-mac/include//Qt /opt/local/libexec/qt4-mac/include//Qt3Support /opt/local/libexec/qt4-mac/include//QtAssistant /opt/local/libexec/qt4-mac/include//QtCore /opt/local/libexec/qt4-mac/include//QtDBus /opt/local/libexec/qt4-mac/include//QtDesigner /opt/local/libexec/qt4-mac/include//QtGui /opt/local/libexec/qt4-mac/include//QtHelp /opt/local/libexec/qt4-mac/include//QtMultimedia /opt/local/libexec/qt4-mac/include//QtNetwork /opt/local/libexec/qt4-mac/include//QtOpenGL /opt/local/libexec/qt4-mac/include//QtScript /opt/local/libexec/qt4-mac/include//QtScriptTools /opt/local/libexec/qt4-mac/include//QtSql /opt/local/libexec/qt4-mac/include//QtSvg /opt/local/libexec/qt4-mac/include//QtTest /opt/local/libexec/qt4-mac/include//QtUiTools /opt/local/libexec/qt4-mac/include//QtWebKit /opt/local/libexec/qt4-mac/include//QtXml /opt/local/libexec/qt4-mac/include//QtXmlPatterns)
  QTVERS	       := 4
  QTMOCEXE       := /opt/local/bin/moc

    

[69313] trunk/dports/science/root

michaelld＠macports.org