[94840] users/krischik/Utilities

1 Jul 2012

Revision: 94840
          https://trac.macports.org/changeset/94840
Author:   krischik@macports.org
Date:     2012-07-01 11:23:44 -0700 (Sun, 01 Jul 2012)
Log Message:
-----------
Update for Lion

Modified Paths:
--------------
    users/krischik/Utilities/Install_KDE4.command
    users/krischik/Utilities/Install_VIM.command
    users/krischik/Utilities/Setup.command
    users/krischik/Utilities/Uninstall_KDE4.command

Modified: users/krischik/Utilities/Install_KDE4.command
===================================================================

--- users/krischik/Utilities/Install_KDE4.command	2012-07-01 13:44:56 UTC (rev 94839)
+++ users/krischik/Utilities/Install_KDE4.command	2012-07-01 18:23:44 UTC (rev 94840)
@@ -14,12 +14,13 @@
     Update_Packages
 
     for I in		\
+	"qt4_select"	\
 	"qt4-mac"	\
 	"akonadi"	\
 	"kdelibs4"	\
 	"kde4-baseapps"	\
 	"kdepim4"	\
-	"amarok"	
+	"amarok"
     do
 	# KDE libs hang in compile with 8 cores.
 	# build.jobs=1
@@ -27,14 +28,14 @@
     done; unset I
 
     port select gcc gnat-gcc42
-    
+
     sudo gchown -R ${1} ~/Library/Preferences/KDE
 
     Clean;
     Load_System
 else
     setopt Multi_OS
-    
+
     Unload_User
     sudo ${0:a} ${USER} 1>&1 2>&2 &>~/Library/Logs/${0:r:t}.out
     Load_User

Modified: users/krischik/Utilities/Install_VIM.command
===================================================================
--- users/krischik/Utilities/Install_VIM.command	2012-07-01 13:44:56 UTC (rev 94839)
+++ users/krischik/Utilities/Install_VIM.command	2012-07-01 18:23:44 UTC (rev 94840)
@@ -13,8 +13,8 @@
 if test "${USER}" = "root"; then
     port select gcc gcc42
 
-    Update_Tree;
-    Update_Packages;
+    #Update_Tree;
+    #Update_Packages;
 
     for I in					\
 	"gnutar ${=General_Variants}"		\

Modified: users/krischik/Utilities/Setup.command
===================================================================
--- users/krischik/Utilities/Setup.command	2012-07-01 13:44:56 UTC (rev 94839)
+++ users/krischik/Utilities/Setup.command	2012-07-01 18:23:44 UTC (rev 94840)
@@ -9,6 +9,9 @@
 setopt No_X_Trace;
 
 case "${OSTYPE}" in
+    ((darwin11*))
+	typeset  General_Variants="+universal"
+    ;;
     ((darwin10*))
 	typeset  General_Variants="+universal-atlas"
     ;;
@@ -116,7 +119,7 @@
 
     echo "===> Install  ${=in_Package} ${=in_Options}"
 
-    if ! port install ${=in_Package} ${=in_Options}; then
+    if ! port -f install ${=in_Package} ${=in_Options}; then
 	port upgrade --enforce-variants ${=in_Package} ${=in_Options};	
     fi;
 

Modified: users/krischik/Utilities/Uninstall_KDE4.command
===================================================================
--- users/krischik/Utilities/Uninstall_KDE4.command	2012-07-01 13:44:56 UTC (rev 94839)
+++ users/krischik/Utilities/Uninstall_KDE4.command	2012-07-01 18:23:44 UTC (rev 94840)
@@ -1,9 +1,9 @@
 #!/opt/local/bin/zsh
 
-setopt X_Trace;
+setopt X_Trace
 
 if test "${USER}" = "root"; then
-    Unload_System;
+    Unload_System
 
     for I in		    \
 	"kdeadmin4"	    \
@@ -17,19 +17,21 @@
 	"kdepimlibs4"	    \
 	"kdesdk4"	    \
 	"kdesupport4"	    \
-	"kdeutils4"	    ;
+	"kdeutils4"	    \
+	"kdelibs4"	    \
+	"qt4_select"
     do
 	port uninstall --follow-dependents ${=I}
     done; unset I
 
-    Load_System;
+    Load_System
 else
-    setopt Multi_OS;
+    setopt Multi_OS
 
-    Unload_User;
-    sudo ${0} 1>&1 2>&2 &>~/Library/Logs/${0:r:t}.out;
-    Load_User;
-fi;
+    Unload_User
+    sudo ${0} 1>&1 2>&2 &>~/Library/Logs/${0:r:t}.out
+    Load_User
+fi
 
 # vim: set nowrap tabstop=8 shiftwidth=4 softtabstop=4 noexpandtab :
 # vim: set textwidth=0 filetype=zsh foldmethod=marker nospell :

    

[94840] users/krischik/Utilities

krischik＠macports.org