[PC-BSD Commits] r1187 - in pbibuild/modules/dosbox: . overlay-dir

[svn at pcbsd.org]

Author: gonzalo
Date: 2008-01-16 06:02:55 -0800 (Wed, 16 Jan 2008)
New Revision: 1187

Modified:
   pbibuild/modules/dosbox/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/dosbox/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/dosbox/pbi.conf
Log:
DOSBox privileges error

Modified: pbibuild/modules/dosbox/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/dosbox/overlay-dir/PBI.FirstRun.sh	2008-01-16 03:37:10 UTC (rev 1186)
+++ pbibuild/modules/dosbox/overlay-dir/PBI.FirstRun.sh	2008-01-16 14:02:55 UTC (rev 1187)
@@ -17,32 +17,32 @@
 #########################################
 
 
-if [ -e "/usr/local/bin/digikam" ]
+if [ -e "/usr/local/bin/dosbox" ]
 then
     # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/digikam | grep Programs 2>/dev/null
+    ls -al /usr/local/bin/dosbox | grep Programs 2>/dev/null
     if [ "$?" = "0" ]
     then
-      kdialog --yesno "digiKam is already installed, do you wish to uninstall it?" 
+      kdialog --yesno "DOSBox is already installed, do you wish to uninstall it?" 
       if [ "$?" = "0" ]
       then
-        FF="`ls -al /usr/local/bin/digikam | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep digiKam 2>/dev/null
+        FF="`ls -al /usr/local/bin/dosbox | cut -d '>' -f 2 | cut -d "/" -f 3`"
+        echo $FF | grep DOSBox 2>/dev/null
         if [ "$?" = "0" ]
         then
           PBIdelete -remove ${FF}
         else
-          kdialog --sorry "digiKam could not be automatically removed... Please remove it in Add / Remove Programs and try again."
+          kdialog --sorry "DOSBox could not be automatically removed... Please remove it in Add / Remove Programs and try again."
           return 2
         fi
       else
-        kdialog --sorry "digiKam is already installed, it must be uninstalled before loading this PBI"
+        kdialog --sorry "DOSBox is already installed, it must be uninstalled before loading this PBI"
         return 2
       fi
       
     else
       # Could not find a link to PBI folder
-      kdialog --sorry "digiKam is already installed, it must be uninstalled before loading this PBI"
+      kdialog --sorry "DOSBox is already installed, it must be uninstalled before loading this PBI"
       return 2
     fi
 fi 

Modified: pbibuild/modules/dosbox/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/dosbox/overlay-dir/PBI.SetupScript.sh	2008-01-16 03:37:10 UTC (rev 1186)
+++ pbibuild/modules/dosbox/overlay-dir/PBI.SetupScript.sh	2008-01-16 14:02:55 UTC (rev 1187)
@@ -17,5 +17,6 @@
 ln -s /Programs/${PROGDIR}/.sbin/dosbox /usr/local/bin/dosbox
 ln -s /Programs/${PROGDIR}/man/man1/dosbox.1.gz /usr/local/man/man1/dosbox.1.gz
 ln -s /Programs/${PROGDIR}/share/doc/dosbox /usr/local/share/doc/dosbox
+chmod +x /Programs/${PROGDIR}/scripts/removepbi.sh
 
 echo "LAUNCHCLOSE: /usr/local/bin/dosbox"

Modified: pbibuild/modules/dosbox/pbi.conf
===================================================================
--- pbibuild/modules/dosbox/pbi.conf	2008-01-16 03:37:10 UTC (rev 1186)
+++ pbibuild/modules/dosbox/pbi.conf	2008-01-16 14:02:55 UTC (rev 1187)
@@ -32,6 +32,6 @@
 
 # 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="04"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY