[PC-BSD Commits] r2624 - in pbibuild/modules/mldonkey: . kmenu-dir overlay-dir overlay-dir/bin

[svn at pcbsd.org]

Author: kris
Date: 2008-08-20 09:29:55 -0700 (Wed, 20 Aug 2008)
New Revision: 2624

Added:
   pbibuild/modules/mldonkey/kmenu-dir/startmldonkey
   pbibuild/modules/mldonkey/overlay-dir/bin/startmldonkey
Removed:
   pbibuild/modules/mldonkey/kmenu-dir/mldonkey
Modified:
   pbibuild/modules/mldonkey/kmenu-dir/mlgui
   pbibuild/modules/mldonkey/kmenu-dir/mlguistarter
   pbibuild/modules/mldonkey/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/mldonkey/pbi.conf
Log:

Fixed up the mldonkey PBI module, should work properly now, and start mlnet
if needed before the GUI



Modified: pbibuild/modules/mldonkey/kmenu-dir/mlgui
===================================================================
--- pbibuild/modules/mldonkey/kmenu-dir/mlgui	2008-08-20 16:16:03 UTC (rev 2623)
+++ pbibuild/modules/mldonkey/kmenu-dir/mlgui	2008-08-20 16:29:55 UTC (rev 2624)
@@ -9,5 +9,5 @@
 ExeLink: 0
 ExeWebLink: 0
 ExeTaskbar: 0
-ExeOwndir: 2
+ExeOwndir: 1
 ExeKdeCat: Internet

Modified: pbibuild/modules/mldonkey/kmenu-dir/mlguistarter
===================================================================
--- pbibuild/modules/mldonkey/kmenu-dir/mlguistarter	2008-08-20 16:16:03 UTC (rev 2623)
+++ pbibuild/modules/mldonkey/kmenu-dir/mlguistarter	2008-08-20 16:29:55 UTC (rev 2624)
@@ -9,5 +9,5 @@
 ExeLink: 0
 ExeWebLink: 0
 ExeTaskbar: 0
-ExeOwndir: 2
+ExeOwndir: 1
 ExeKdeCat: Internet

Modified: pbibuild/modules/mldonkey/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/mldonkey/overlay-dir/PBI.FirstRun.sh	2008-08-20 16:16:03 UTC (rev 2623)
+++ pbibuild/modules/mldonkey/overlay-dir/PBI.FirstRun.sh	2008-08-20 16:29:55 UTC (rev 2624)
@@ -17,32 +17,32 @@
 #########################################
 
 
-if [ -e "/usr/local/bin/digikam" ]
+if [ -e "/usr/local/bin/mlgui" ]
 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/mlgui | grep Programs 2>/dev/null
     if [ "$?" = "0" ]
     then
       kdialog --yesno "digiKam 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/mlgui | cut -d '>' -f 2 | cut -d "/" -f 3`"
+        echo $FF | grep MLDonkey 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 "MLDonkey 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 "MLDonkey 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 "MLDonkey is already installed, it must be uninstalled before loading this PBI"
       return 2
     fi
 fi 


Property changes on: pbibuild/modules/mldonkey/overlay-dir/bin/startmldonkey
___________________________________________________________________
Added: svn:executable
   + *

Modified: pbibuild/modules/mldonkey/pbi.conf
===================================================================
--- pbibuild/modules/mldonkey/pbi.conf	2008-08-20 16:16:03 UTC (rev 2623)
+++ pbibuild/modules/mldonkey/pbi.conf	2008-08-20 16:29:55 UTC (rev 2624)
@@ -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="01"
+BUILDKEY="21"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY