[48582] trunk/dports/lang

[jann at macports.org]

Revision: 48582
          http://trac.macports.org/changeset/48582
Author:   jann at macports.org
Date:     2009-03-25 12:38:03 -0700 (Wed, 25 Mar 2009)
Log Message:
-----------
Use  instead of overriding , fixes #18973

Modified Paths:
--------------
    trunk/dports/lang/eiffelstudio/Portfile
    trunk/dports/lang/eiffelstudio64/Portfile

Modified: trunk/dports/lang/eiffelstudio/Portfile
===================================================================
--- trunk/dports/lang/eiffelstudio/Portfile	2009-03-25 19:22:36 UTC (rev 48581)
+++ trunk/dports/lang/eiffelstudio/Portfile	2009-03-25 19:38:03 UTC (rev 48582)
@@ -23,7 +23,6 @@
                   http://n.ethz.ch/student/roederja/download/:launcher
 depends_lib       port:gtk2
 depends_build     bin:bzip2:bzip2
-prefix            /Applications/MacPorts
 extract.suffix    .tar
 extract.cmd       tar
 extract.post_args
@@ -64,20 +63,19 @@
                     system "tar -xjf ${distpath}/${eiffel_launch} -C ${worksrcpath}/Eiffel${branch}/"
                   }
 
-destroot.violate_mtree  yes
 destroot          {
-                    xinstall -m 755 -d ${destroot}/${prefix}
-                    file copy ${worksrcpath}/Eiffel${branch} ${destroot}/${prefix}/
+                    xinstall -m 755 -d ${destroot}/${applications_dir}
+                    file copy ${worksrcpath}/Eiffel${branch} ${destroot}/${applications_dir}/
 
                     # Run ranlib on the libraries
-                    system "ranlib ${destroot}/${prefix}/Eiffel${branch}/studio/spec/$env(ISE_PLATFORM)/lib/*.a"
+                    system "ranlib ${destroot}/${applications_dir}/Eiffel${branch}/studio/spec/$env(ISE_PLATFORM)/lib/*.a"
                   }
 
 post-install      {
                     ui_msg " ################################################################################## \n\
                         To complete the installation you have to add the following to your .bashrc file : \n\
                         export ISE_PLATFORM=$env(ISE_PLATFORM) \n\
-                        export ISE_EIFFEL=${prefix}/Eiffel${branch} \n\
+                        export ISE_EIFFEL=${applications_dir}/Eiffel${branch} \n\
                         export GOBO=\$ISE_EIFFEL/library/gobo/svn \n\
                         export PATH=\$PATH:\$ISE_EIFFEL/studio/spec/\$ISE_PLATFORM/bin:\$GOBO/../spec/\$ISE_PLATFORM/bin \n\
                         ################################################################################## \n"

Modified: trunk/dports/lang/eiffelstudio64/Portfile
===================================================================
--- trunk/dports/lang/eiffelstudio64/Portfile	2009-03-25 19:22:36 UTC (rev 48581)
+++ trunk/dports/lang/eiffelstudio64/Portfile	2009-03-25 19:38:03 UTC (rev 48582)
@@ -23,7 +23,6 @@
                   http://n.ethz.ch/student/roederja/download/:launcher
 depends_lib       port:gtk2
 depends_build     bin:bzip2:bzip2
-prefix            /Applications/MacPorts
 extract.suffix    .tar
 extract.cmd       tar
 extract.post_args
@@ -60,20 +59,19 @@
                     system "tar -xjf ${distpath}/${eiffel_launch} -C ${worksrcpath}/Eiffel${branch}/"
                   }
 
-destroot.violate_mtree  yes
 destroot          {
-                    xinstall -m 755 -d ${destroot}/${prefix}
-                    file copy ${worksrcpath}/Eiffel${branch} ${destroot}/${prefix}/
+                    xinstall -m 755 -d ${destroot}/${applications_dir}
+                    file copy ${worksrcpath}/Eiffel${branch} ${destroot}/${applications_dir}/
 
                     # Run ranlib on the libraries
-                    system "ranlib ${destroot}/${prefix}/Eiffel${branch}/studio/spec/$env(ISE_PLATFORM)/lib/*.a"
+                    system "ranlib ${destroot}/${applications_dir}/Eiffel${branch}/studio/spec/$env(ISE_PLATFORM)/lib/*.a"
                   }
 
 post-install      {
                     ui_msg " ################################################################################## \n\
                         To complete the installation you have to add the following to your .bashrc file : \n\
                         export ISE_PLATFORM=$env(ISE_PLATFORM) \n\
-                        export ISE_EIFFEL=${prefix}/Eiffel${branch} \n\
+                        export ISE_EIFFEL=${applications_dir}/Eiffel${branch} \n\
                         export GOBO=\$ISE_EIFFEL/library/gobo/svn \n\
                         export PATH=\$PATH:\$ISE_EIFFEL/studio/spec/\$ISE_PLATFORM/bin:\$GOBO/../spec/\$ISE_PLATFORM/bin \n\
                         ################################################################################## \n"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090325/b8e49f09/attachment-0001.html>