[PC-BSD Commits] r7035 - in pbibuild/modules/shells/zsh: . kmenu-dir overlay-dir

svn at pcbsd.org svn at pcbsd.org
Fri Jun 25 09:45:28 PDT 2010


Author: kris
Date: 2010-06-25 09:45:28 -0700 (Fri, 25 Jun 2010)
New Revision: 7035

Added:
   pbibuild/modules/shells/zsh/overlay-dir/zsh.png
Removed:
   pbibuild/modules/shells/zsh/overlay-dir/LICENSE
   pbibuild/modules/shells/zsh/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/shells/zsh/overlay-dir/bin/
   pbibuild/modules/shells/zsh/overlay-dir/lib/
   pbibuild/modules/shells/zsh/overlay-dir/share/
Modified:
   pbibuild/modules/shells/zsh/copy-files
   pbibuild/modules/shells/zsh/kmenu-dir/zsh
   pbibuild/modules/shells/zsh/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/shells/zsh/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/shells/zsh/pbi.conf
Log:

Updated zsh module



Modified: pbibuild/modules/shells/zsh/copy-files
===================================================================
--- pbibuild/modules/shells/zsh/copy-files	2010-06-25 16:12:10 UTC (rev 7034)
+++ pbibuild/modules/shells/zsh/copy-files	2010-06-25 16:45:28 UTC (rev 7035)
@@ -1,20 +0,0 @@
-/usr/local/bin/zsh bin/
-/usr/local/share/zsh share/
-/usr/local/lib/zsh lib/
-/usr/local/man/man1/zsh.1.gz man/man1/ 
-/usr/local/man/man1/zshroadmap.1.gz man/man1/ 
-/usr/local/man/man1/zshmisc.1.gz man/man1/ 
-/usr/local/man/man1/zshexpn.1.gz man/man1/ 
-/usr/local/man/man1/zshparam.1.gz man/man1/ 
-/usr/local/man/man1/zshoptions.1.gz man/man1/ 
-/usr/local/man/man1/zshbuiltins.1.gz man/man1/ 
-/usr/local/man/man1/zshzle.1.gz man/man1/ 
-/usr/local/man/man1/zshcompwid.1.gz man/man1/ 
-/usr/local/man/man1/zshcompsys.1.gz man/man1/ 
-/usr/local/man/man1/zshcompctl.1.gz man/man1/ 
-/usr/local/man/man1/zshmodules.1.gz man/man1/ 
-/usr/local/man/man1/zshcalsys.1.gz man/man1/ 
-/usr/local/man/man1/zshtcpsys.1.gz man/man1/ 
-/usr/local/man/man1/zshzftpsys.1.gz man/man1/ 
-/usr/local/man/man1/zshcontrib.1.gz man/man1/ 
-/usr/local/man/man1/zshall.1.gz man/man1/ 

Modified: pbibuild/modules/shells/zsh/kmenu-dir/zsh
===================================================================
--- pbibuild/modules/shells/zsh/kmenu-dir/zsh	2010-06-25 16:12:10 UTC (rev 7034)
+++ pbibuild/modules/shells/zsh/kmenu-dir/zsh	2010-06-25 16:45:28 UTC (rev 7035)
@@ -1,13 +1,14 @@
 ExePath: bin/zsh
-ExeIcon: share/pixmaps/zsh.png
-ExeDescr: Zsh
-ExeNoDesktop: 0
-ExeNoMenu: 0
+ExeIcon: zsh.png
+ExeDescr: Quod Libet
+ExeNoDesktop: 1
+ExeNoCrashHandler: 1
+ExeNoMenu: 1
 ExeRunRoot: 0
-ExeRunShell: 1
+ExeRunShell: 0
 ExeNotify: 1
 ExeLink: 0
 ExeWebLink: 0
 ExeTaskbar: 0
 ExeOwndir: 2
-ExeKdeCat: System
+ExeKdeCat: Utilities

Modified: pbibuild/modules/shells/zsh/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/shells/zsh/overlay-dir/PBI.RemoveScript.sh	2010-06-25 16:12:10 UTC (rev 7034)
+++ pbibuild/modules/shells/zsh/overlay-dir/PBI.RemoveScript.sh	2010-06-25 16:45:28 UTC (rev 7035)
@@ -7,18 +7,4 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-# remove shell from /etc/shells
-cp /etc/shells /etc/shells.bak; (grep -v /usr/local/bin/zsh /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
-
-cd /home
-for i in `ls` 
-   do 
-     if [ -d "/home/${i}/.zshrc" ] 
-     then 
-       kdialog --title "Uninstalling zsh!" --yesno "Do you wish to erase zsh's configuration files for ${i} user as well?" 
-       if [ "$?" = "0" ] 
-       then 
-         rm -R /home/${i}/.zshrc
-       fi 
-     fi 
-   done
+rm /Programs/bin/zsh

Modified: pbibuild/modules/shells/zsh/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/shells/zsh/overlay-dir/PBI.SetupScript.sh	2010-06-25 16:12:10 UTC (rev 7034)
+++ pbibuild/modules/shells/zsh/overlay-dir/PBI.SetupScript.sh	2010-06-25 16:45:28 UTC (rev 7035)
@@ -14,6 +14,5 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-echo "/usr/local/bin/zsh" >> /etc/shells
 
-echo "LAUNCHCLOSE: /Programs/bin/zsh
+ln -fs /Programs/${PROGDIR}/.sbin/zsh /Programs/bin/zsh


Property changes on: pbibuild/modules/shells/zsh/overlay-dir/zsh.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: pbibuild/modules/shells/zsh/pbi.conf
===================================================================
--- pbibuild/modules/shells/zsh/pbi.conf	2010-06-25 16:12:10 UTC (rev 7034)
+++ pbibuild/modules/shells/zsh/pbi.conf	2010-06-25 16:45:28 UTC (rev 7035)
@@ -7,13 +7,13 @@
 PROGNAME="Zsh"
 
 # Program Website
-PROGWEB="http://www.zsh.org/"
+PROGWEB="http://www.zsh.org"
 
 # Program Author
-PROGAUTHOR="<zsh-workers at sunsite.dk>"
+PROGAUTHOR="The Zsh Team"
 
 # Default Icon (Relative to overlay-dir)
-PROGICON="share/pixmaps/zsh.png"
+PROGICON="zsh.png"
 
 # Port we want to build
 PBIPORT="/usr/ports/shells/zsh/"
@@ -30,11 +30,12 @@
 # Enter your custom make options here
 MAKEOPTS=""
 
-# Mark port as broken, 8-01-08 KPM. Port fails to build
-PORTBROKE="YES" ; export PORTBROKE
-
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="03"
+BUILDKEY="01"
 
-export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY
+# If this port has a non-standard port version variable in Makefile, then
+# list the key here such as "OOOVERSION="
+VERKEY=""
+
+export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY VERKEY



More information about the Commits mailing list