[63197] trunk/dports/_resources/port1.0

jmr at macports.org jmr at macports.org
Fri Jan 29 00:03:39 PST 2010


Revision: 63197
          http://trac.macports.org/changeset/63197
Author:   jmr at macports.org
Date:     2010-01-29 00:03:35 -0800 (Fri, 29 Jan 2010)
Log Message:
-----------
revert r63189

Revision Links:
--------------
    http://trac.macports.org/changeset/63189

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/gnustep-1.0.tcl
    trunk/dports/_resources/port1.0/group/kde4-1.0.tcl
    trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl
    trunk/dports/_resources/port1.0/group/php5extension-1.0.tcl
    trunk/dports/_resources/port1.0/group/xcodeversion-1.0.tcl
    trunk/dports/_resources/port1.0/group/zope-1.0.tcl

Property Changed:
----------------
    trunk/dports/_resources/port1.0/fetch/
    trunk/dports/_resources/port1.0/group/
    trunk/dports/_resources/port1.0/package/


Property changes on: trunk/dports/_resources/port1.0/fetch
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: trunk/dports/_resources/port1.0/group
___________________________________________________________________
Deleted: svn:mergeinfo
   - 

Modified: trunk/dports/_resources/port1.0/group/gnustep-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/gnustep-1.0.tcl	2010-01-29 06:57:30 UTC (rev 63196)
+++ trunk/dports/_resources/port1.0/group/gnustep-1.0.tcl	2010-01-29 08:03:35 UTC (rev 63197)
@@ -229,7 +229,7 @@
         
         if {[file exists ${worksrcpath}/Documentation/GNUmakefile]} {
             
-            notes "--->  Making Documentation for ${name}"
+            ui_msg "--->  Making Documentation for ${name}"
             
             _cd ${worksrcpath}/Documentation
             system "${destroot.env} ${destroot.cmd} \
@@ -243,7 +243,7 @@
                     ${info_dir}/${manual_name}-manual.info
             }
         } else {
-            notes "--->  No Documentation for ${name}"
+            ui_msg "--->  No Documentation for ${name}"
         }
     }    
 }

Modified: trunk/dports/_resources/port1.0/group/kde4-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/kde4-1.0.tcl	2010-01-29 06:57:30 UTC (rev 63196)
+++ trunk/dports/_resources/port1.0/group/kde4-1.0.tcl	2010-01-29 08:03:35 UTC (rev 63197)
@@ -87,17 +87,16 @@
 }
 
 post-activate {
-    notes \
-##########################################################
-# Don't forget that dbus needs to be started as the local 
-# user (not with sudo) before any KDE programs will launch
-# To start it run the following command:                  
-# launchctl load /Library/LaunchAgents/org.freedesktop.dbus-session.plist
-##########################################################
- 
-######################################################
-#  Programs will not start until you run the command 
-#  'sudo chown -R \$USER ~/Library/Preferences/KDE'  
-#  replacing \$USER with your username.              
-######################################################"
+    ui_msg "##########################################################"
+    ui_msg "# Don't forget that dbus needs to be started as the local "
+    ui_msg "# user (not with sudo) before any KDE programs will launch"
+    ui_msg "# To start it run the following command:                  "
+    ui_msg "# launchctl load /Library/LaunchAgents/org.freedesktop.dbus-session.plist"
+    ui_msg "##########################################################"
+    ui_msg " "
+    ui_msg "######################################################"
+    ui_msg "#  Programs will not start until you run the command "
+    ui_msg "#  'sudo chown -R \$USER ~/Library/Preferences/KDE'  "
+    ui_msg "#  replacing \$USER with your username.              "
+    ui_msg "######################################################"
 }

Modified: trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2010-01-29 06:57:30 UTC (rev 63196)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2010-01-29 08:03:35 UTC (rev 63197)
@@ -160,7 +160,7 @@
 
     configure {
         foreach arch ${universal_archs_to_use} {
-            notes "$UI_PREFIX [format [msgcat::mc "Configuring %1\$s for architecture %2\$s"] $name ${arch}]"
+            ui_msg "$UI_PREFIX [format [msgcat::mc "Configuring %1\$s for architecture %2\$s"] $name ${arch}]"
 
             copy ${worksrcpath} ${worksrcpath}-${arch}
 
@@ -320,7 +320,7 @@
 
     build {
         foreach arch ${universal_archs_to_use} {
-            notes "$UI_PREFIX [format [msgcat::mc "Building %1\$s for architecture %2\$s"] $name ${arch}]"
+            ui_msg "$UI_PREFIX [format [msgcat::mc "Building %1\$s for architecture %2\$s"] $name ${arch}]"
             
             if { [info exists merger_build_env(${arch})] } {
                 build.env-append  $merger_build_env(${arch})
@@ -350,7 +350,7 @@
 
     destroot {
         foreach arch ${universal_archs_to_use} {
-            notes "$UI_PREFIX [format [msgcat::mc "Staging %1\$s into destroot for architecture %2\$s"] $name ${arch}]"
+            ui_msg "$UI_PREFIX [format [msgcat::mc "Staging %1\$s into destroot for architecture %2\$s"] $name ${arch}]"
             copy ${destroot} ${workpath}/destroot-${arch}
             set destdirSave ${destroot.destdir}
             eval destroot.destdir  [string map "${destroot} ${workpath}/destroot-${arch}" ${destroot.destdir}]
@@ -584,7 +584,7 @@
             # Rosetta does not translate G5 instructions
             # PowerPC systems can't translate Intel instructions
             if { (${os.arch}=="i386" && ${arch}!="ppc64") || (${os.arch}=="powerpc" && ${arch}!="i386" && ${arch}!="x86_64") } {
-                notes "$UI_PREFIX [format [msgcat::mc "Testing %1\$s for architecture %2\$s"] $name ${arch}]"
+                ui_msg "$UI_PREFIX [format [msgcat::mc "Testing %1\$s for architecture %2\$s"] $name ${arch}]"
                 set test_dir_save ${test.dir}
                 if { [string match "${worksrcpath}/*" ${test.dir}] } {
                     # The test directory is inside the source directory, so put in the new source directory name.

Modified: trunk/dports/_resources/port1.0/group/php5extension-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/php5extension-1.0.tcl	2010-01-29 06:57:30 UTC (rev 63196)
+++ trunk/dports/_resources/port1.0/group/php5extension-1.0.tcl	2010-01-29 08:03:35 UTC (rev 63197)
@@ -148,12 +148,12 @@
                     ui_debug "Found extension_dir ${phpiniextensiondir} in ${php5extension.php_ini}"
                     if {${phpiniextensiondir} != ${php5extension.extension_dir}} {
                         if {0 == ${count}} {
-                            notes \
-                            "Your php.ini contains a line that will prevent ${name}
-                            and other PHP extensions from working. To fix this,
-                            edit ${php5extension.php_ini} and delete this line:"
+                            ui_msg "Your php.ini contains a line that will prevent ${name}"
+                            ui_msg "and other PHP extensions from working. To fix this,"
+                            ui_msg "edit ${php5extension.php_ini} and delete this line:"
+                            ui_msg ""
                         }
-                        notes ${line}
+                        ui_msg ${line}
                         incr count
                     }
                     unset phpiniextensiondir

Modified: trunk/dports/_resources/port1.0/group/xcodeversion-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/xcodeversion-1.0.tcl	2010-01-29 06:57:30 UTC (rev 63196)
+++ trunk/dports/_resources/port1.0/group/xcodeversion-1.0.tcl	2010-01-29 08:03:35 UTC (rev 63197)
@@ -56,7 +56,7 @@
         foreach {darwin_major minimum_xcodeversion} [join ${minimum_xcodeversions}] {
             if {${darwin_major} == ${os.major}} {
                 if {[rpm-vercomp ${current_xcodeversion} ${minimum_xcodeversion}] < 0} {
-                    notes "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} or later but you have Xcode ${current_xcodeversion}."
+                    ui_msg "On Mac OS X ${macosx_version}, ${name} ${version} requires Xcode ${minimum_xcodeversion} or later but you have Xcode ${current_xcodeversion}."
                     return -code error "incompatible Xcode version"
                 }
             }

Modified: trunk/dports/_resources/port1.0/group/zope-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/zope-1.0.tcl	2010-01-29 06:57:30 UTC (rev 63196)
+++ trunk/dports/_resources/port1.0/group/zope-1.0.tcl	2010-01-29 08:03:35 UTC (rev 63197)
@@ -134,12 +134,11 @@
 	destroot {
 		# Warn user if not running as root
 		if {$env(USER) != "root"} {
-			notes \
-"-----------------------------------------------------------
-			Note that you are not running as root, so files installed
-			by this port will not end up with proper ownership and
-			likely not work correctly with Zope.
-			-----------------------------------------------------------"
+			ui_msg "-----------------------------------------------------------"
+			ui_msg "Note that you are not running as root, so files installed"
+			ui_msg "by this port will not end up with proper ownership and"
+			ui_msg "likely not work correctly with Zope."
+			ui_msg "-----------------------------------------------------------"
 		}
 		cd ${worksrcpath}
 


Property changes on: trunk/dports/_resources/port1.0/package
___________________________________________________________________
Deleted: svn:mergeinfo
   - 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100129/d2e012df/attachment-0001.html>


More information about the macports-changes mailing list