[40803] trunk/base
jmr at macports.org
jmr at macports.org
Wed Oct 15 03:17:50 PDT 2008
Revision: 40803
http://trac.macports.org/changeset/40803
Author: jmr at macports.org
Date: 2008-10-15 03:17:48 -0700 (Wed, 15 Oct 2008)
Log Message:
-----------
Move default frameworks_dir under prefix, and use it in portgroups
Modified Paths:
--------------
trunk/base/aclocal.m4
trunk/base/configure
trunk/base/doc/macports.conf.5
trunk/base/doc/portgroup.7
trunk/base/doc/porthier.7
trunk/base/src/macports1.0/macports.tcl
trunk/base/src/port1.0/portmain.tcl
trunk/base/src/port1.0/resources/group/python24-1.0.tcl
trunk/base/src/port1.0/resources/group/python30-1.0.tcl
Modified: trunk/base/aclocal.m4
===================================================================
--- trunk/base/aclocal.m4 2008-10-15 09:30:44 UTC (rev 40802)
+++ trunk/base/aclocal.m4 2008-10-15 10:17:48 UTC (rev 40803)
@@ -388,11 +388,7 @@
AC_MSG_CHECKING([for Frameworks installation directory])
if test "x$MPFRAMEWORKSDIR" = "x" ; then
- if test "$DSTUSR" = "root" ; then
- MPFRAMEWORKSDIR="/Library/Frameworks"
- else
- MPFRAMEWORKSDIR="~$DSTUSR/Library/Frameworks"
- fi
+ MPFRAMEWORKSDIR="${prefix}/Library/Frameworks"
fi
AC_MSG_RESULT([$MPFRAMEWORKSDIR])
Modified: trunk/base/configure
===================================================================
--- trunk/base/configure 2008-10-15 09:30:44 UTC (rev 40802)
+++ trunk/base/configure 2008-10-15 10:17:48 UTC (rev 40803)
@@ -6848,11 +6848,7 @@
echo $ECHO_N "checking for Frameworks installation directory... $ECHO_C" >&6; }
if test "x$MPFRAMEWORKSDIR" = "x" ; then
- if test "$DSTUSR" = "root" ; then
- MPFRAMEWORKSDIR="/Library/Frameworks"
- else
- MPFRAMEWORKSDIR="~$DSTUSR/Library/Frameworks"
- fi
+ MPFRAMEWORKSDIR="${prefix}/Library/Frameworks"
fi
{ echo "$as_me:$LINENO: result: $MPFRAMEWORKSDIR" >&5
Modified: trunk/base/doc/macports.conf.5
===================================================================
--- trunk/base/doc/macports.conf.5 2008-10-15 09:30:44 UTC (rev 40802)
+++ trunk/base/doc/macports.conf.5 2008-10-15 10:17:48 UTC (rev 40803)
@@ -96,7 +96,7 @@
Directory containing Frameworks installed from ports.
.br
.Ic Default:
-/Library/Frameworks
+${prefix}/Library/Frameworks
.It Va sources_conf
Location of the sources file. This file enables rsync synchronization of the default ports tree with the
MacPorts rsync server (through the "sync" target of the
Modified: trunk/base/doc/portgroup.7
===================================================================
--- trunk/base/doc/portgroup.7 2008-10-15 09:30:44 UTC (rev 40802)
+++ trunk/base/doc/portgroup.7 2008-10-15 10:17:48 UTC (rev 40803)
@@ -142,9 +142,9 @@
.Em optional
.br
.Sy Default:
-.Em /Library/Frameworks
+.Em ${prefix}/Library/Frameworks
or
-.Em /Application/MacPorts depending on xcode.destroot.type
+.Em /Applications/MacPorts depending on xcode.destroot.type
.br
.It Ic xcode.destroot.settings
Additional settings passed to the xcode build tool during the destroot phase.
Modified: trunk/base/doc/porthier.7
===================================================================
--- trunk/base/doc/porthier.7 2008-10-15 09:30:44 UTC (rev 40802)
+++ trunk/base/doc/porthier.7 2008-10-15 10:17:48 UTC (rev 40803)
@@ -53,6 +53,8 @@
archive libraries
.It Pa libexec/
system daemons & system utilities (executed by other programs)
+.It Pa Library/Frameworks/
+Native Mac OS X Library Frameworks
.It Pa sbin/
system programs and administration utilities
.It Pa share/
@@ -127,8 +129,6 @@
.El
.It Pa /Applications/MacPorts/
Native Mac OS X applications
-.It Pa /Library/Frameworks/
-Native Mac OS X Library Frameworks
.Pp
.El
.El
Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl 2008-10-15 09:30:44 UTC (rev 40802)
+++ trunk/base/src/macports1.0/macports.tcl 2008-10-15 10:17:48 UTC (rev 40803)
@@ -1061,7 +1061,7 @@
if {[info exists env(DYLD_FRAMEWORK_PATH)]} {
lappend search_path $env(DYLD_FRAMEWORK_PATH)
} else {
- lappend search_path /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks
+ lappend search_path ${frameworks_dir} /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks
}
if {[info exists env(DYLD_FALLBACK_FRAMEWORK_PATH)]} {
lappend search_path $env(DYLD_FALLBACK_FRAMEWORK_PATH)
@@ -1069,7 +1069,7 @@
if {[info exists env(DYLD_LIBRARY_PATH)]} {
lappend search_path $env(DYLD_LIBRARY_PATH)
}
- lappend search_path /lib /usr/lib /usr/X11R6/lib /usr/X11/lib ${prefix}/lib
+ lappend search_path /lib /usr/lib ${x11prefix}/lib ${prefix}/lib
if {[info exists env(DYLD_FALLBACK_LIBRARY_PATH)]} {
lappend search_path $env(DYLD_FALLBACK_LIBRARY_PATH)
}
Modified: trunk/base/src/port1.0/portmain.tcl
===================================================================
--- trunk/base/src/port1.0/portmain.tcl 2008-10-15 09:30:44 UTC (rev 40802)
+++ trunk/base/src/port1.0/portmain.tcl 2008-10-15 10:17:48 UTC (rev 40803)
@@ -60,7 +60,7 @@
default prefix /opt/local
default x11prefix /usr/X11R6
default applications_dir /Applications/MacPorts
-default frameworks_dir /Library/Frameworks
+default frameworks_dir {${prefix}/Library/Frameworks}
default destdir destroot
default destpath {${workpath}/${destdir}}
# destroot is provided as a clearer name for the "destpath" variable
Modified: trunk/base/src/port1.0/resources/group/python24-1.0.tcl
===================================================================
--- trunk/base/src/port1.0/resources/group/python24-1.0.tcl 2008-10-15 09:30:44 UTC (rev 40802)
+++ trunk/base/src/port1.0/resources/group/python24-1.0.tcl 2008-10-15 10:17:48 UTC (rev 40803)
@@ -34,9 +34,9 @@
set python.bin ${prefix}/bin/python2.4
set python.lib ${prefix}/lib/libpython2.4.dylib
-set python.libdir ${prefix}/Library/Frameworks/Python.framework/Versions/2.4/lib/python2.4
+set python.libdir ${frameworks_dir}/Python.framework/Versions/2.4/lib/python2.4
set python.pkgd ${prefix}/lib/python2.4/site-packages
-set python.include ${prefix}/Library/Frameworks/Python.framework/Versions/2.4/include/python2.4
+set python.include ${frameworks_dir}/Python.framework/Versions/2.4/include/python2.4
categories python
Modified: trunk/base/src/port1.0/resources/group/python30-1.0.tcl
===================================================================
--- trunk/base/src/port1.0/resources/group/python30-1.0.tcl 2008-10-15 09:30:44 UTC (rev 40802)
+++ trunk/base/src/port1.0/resources/group/python30-1.0.tcl 2008-10-15 10:17:48 UTC (rev 40803)
@@ -32,7 +32,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-set prefix ${prefix}/Library/Frameworks/Python.framework/Versions/3.0
+set prefix ${frameworks_dir}/Python.framework/Versions/3.0
set python.bin ${prefix}/bin/python3.0
set python.lib ${prefix}/lib/libpython3.0.dylib
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20081015/b3172f4a/attachment.html
More information about the macports-changes
mailing list