[103550] users/cal/base-sqlite-portindex

28 Feb 2013

Revision: 103550
          https://trac.macports.org/changeset/103550
Author:   cal@macports.org
Date:     2013-02-28 13:20:37 -0800 (Thu, 28 Feb 2013)
Log Message:
-----------
merge from trunk

Modified Paths:
--------------
    users/cal/base-sqlite-portindex/doc/portfile.7
    users/cal/base-sqlite-portindex/src/macports1.0/macports.tcl
    users/cal/base-sqlite-portindex/src/port1.0/portconfigure.tcl
    users/cal/base-sqlite-portindex/src/port1.0/portutil.tcl

Property Changed:
----------------
    users/cal/base-sqlite-portindex/


Property changes on: users/cal/base-sqlite-portindex
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:103013-103402
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:103013-103549
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: users/cal/base-sqlite-portindex/doc/portfile.7
===================================================================

--- users/cal/base-sqlite-portindex/doc/portfile.7	2013-02-28 18:47:38 UTC (rev 103549)
+++ users/cal/base-sqlite-portindex/doc/portfile.7	2013-02-28 21:20:37 UTC (rev 103550)
@@ -1,6 +1,6 @@
 .\" portfile.7
 .\"
-.\" Copyright (c) 2004-2011 The MacPorts Project
+.\" Copyright (c) 2004-2013 The MacPorts Project
 .\" Copyright (c) 2002-2003 Apple Inc.
 .\" All rights reserved.
 .\"
@@ -1110,7 +1110,7 @@
 .Em optional
 .br
 .Sy Default:
-.Em -O2
+.Em -Os
 .br
 .Sy Example:
 .Dl configure.optflags -O3

Modified: users/cal/base-sqlite-portindex/src/macports1.0/macports.tcl
===================================================================
--- users/cal/base-sqlite-portindex/src/macports1.0/macports.tcl	2013-02-28 18:47:38 UTC (rev 103549)
+++ users/cal/base-sqlite-portindex/src/macports1.0/macports.tcl	2013-02-28 21:20:37 UTC (rev 103550)
@@ -37,6 +37,7 @@
 package require macports_dlist 1.0
 package require macports_index 1.0
 package require macports_util 1.0
+package require portindex 1.0
 
 namespace eval macports {
     namespace export bootstrap_options user_options portinterp_options open_mports ui_priorities port_phases 
@@ -1127,6 +1128,9 @@
         }
     }
 
+    #set portindex [portindex::open [macports::getportdir [lindex ${sources_default} 0]]]
+    #$portindex release
+
     # load the quick index
     _mports_load_quickindex
 

Modified: users/cal/base-sqlite-portindex/src/port1.0/portconfigure.tcl
===================================================================
--- users/cal/base-sqlite-portindex/src/port1.0/portconfigure.tcl	2013-02-28 18:47:38 UTC (rev 103549)
+++ users/cal/base-sqlite-portindex/src/port1.0/portconfigure.tcl	2013-02-28 21:20:37 UTC (rev 103550)
@@ -1,8 +1,7 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
-# portconfigure.tcl
 # $Id$
 #
-# Copyright (c) 2007 - 2012 The MacPorts Project
+# Copyright (c) 2007 - 2013 The MacPorts Project
 # Copyright (c) 2007 Markus W. Weissmann <mww@macports.org>
 # Copyright (c) 2002 - 2003 Apple Inc.
 # All rights reserved.
@@ -129,7 +128,7 @@
 default configure.mtune     {}
 # We could have debug/optimizations be global configurable at some point.
 options configure.optflags configure.cflags configure.cppflags configure.cxxflags configure.objcflags configure.ldflags configure.libs configure.fflags configure.f90flags configure.fcflags configure.classpath
-default configure.optflags  {-O2}
+default configure.optflags  {-Os}
 # compiler flags section
 default configure.cflags    {${configure.optflags}}
 default configure.cppflags  {-I${prefix}/include}
@@ -360,8 +359,7 @@
 
 # internal proc to determine if the compiler supports -arch
 proc portconfigure::arch_flag_supported {compiler} {
-    return [expr {[string first "macports-gcc-" $compiler] != 0 &&
-                  [string first "macports-dragonegg-" $compiler] != 0}]
+    return [regexp {^gcc-4|llvm|apple|clang} $compiler]
 }
 
 # maps compiler names to the port that provides them

Modified: users/cal/base-sqlite-portindex/src/port1.0/portutil.tcl
===================================================================
--- users/cal/base-sqlite-portindex/src/port1.0/portutil.tcl	2013-02-28 18:47:38 UTC (rev 103549)
+++ users/cal/base-sqlite-portindex/src/port1.0/portutil.tcl	2013-02-28 21:20:37 UTC (rev 103550)
@@ -5,7 +5,7 @@
 # Copyright (c) 2002-2003 Apple Inc.
 # Copyright (c) 2004 Robert Shaw <rshaw@opendarwin.org>
 # Copyright (c) 2006-2007 Markus W. Weissmann <mww@macports.org>
-# Copyright (c) 2004-2012 The MacPorts Project
+# Copyright (c) 2004-2013 The MacPorts Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -1007,7 +1007,7 @@
 # reinplace
 # Provides "sed in place" functionality
 proc reinplace {args}  {
-    global env worksrcpath
+    global env worksrcpath macosx_version
     set extended 0
     set suppress 0
     set oldlocale_exists 0
@@ -1097,6 +1097,9 @@
                     set env(LC_CTYPE) $oldlocale
                 } else {
                     unset env(LC_CTYPE)
+                    if {$macosx_version == "10.5"} {
+                        unsetenv LC_CTYPE
+                    }
                 }
             }
             close $tmpfd
@@ -1108,6 +1111,9 @@
                 set env(LC_CTYPE) $oldlocale
             } else {
                 unset env(LC_CTYPE)
+                if {$macosx_version == "10.5"} {
+                    unsetenv LC_CTYPE
+                }
             }
         }
         close $tmpfd
@@ -1403,13 +1409,15 @@
 
 proc target_run {ditem} {
     global target_state_fd workpath portpath ports_trace PortInfo ports_dryrun \
-           ports_dry_last_skipped worksrcpath prefix subport env portdbpath
+           ports_dry_last_skipped worksrcpath prefix subport env portdbpath \
+           macosx_version
     set portname $subport
     set result 0
     set skipped 0
     set procedure [ditem_key $ditem procedure]
     set savedhome [file join $portdbpath home]
     set env(HOME) "${workpath}/.home"
+    set env(TMPDIR) "${workpath}/.tmp"
 
     if {[ditem_key $ditem state] != "no"} {
         set target_state_fd [open_statefile]
@@ -1634,6 +1642,12 @@
     }
 
     set env(HOME) $savedhome
+    if {[info exists env(TMPDIR)]} {
+        unset env(TMPDIR)
+        if {$macosx_version == "10.5"} {
+            unsetenv TMPDIR
+        }
+    }
 
     return $result
 }
@@ -1750,8 +1764,16 @@
     }
 
     if {![tbool ports_dryrun]} {
-        if {![file isdirectory $workpath]} {
-            file mkdir "${workpath}/.home"
+        set need_chown 0
+        if {![file isdirectory $workpath/.home]} {
+            file mkdir $workpath/.home
+            set need_chown 1
+        }
+        if {![file isdirectory $workpath/.tmp]} {
+            file mkdir $workpath/.tmp
+            set need_chown 1
+        }
+        if {$need_chown} {
             chownAsRoot $subbuildpath
         }
         # Create a symlink to the workpath for port authors

    

cal＠macports.org

tags

participants (1)