[PC-BSD Commits] r3308 - in pbibuild/modules/gtkpool: . overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2009-01-21 11:26:36 -0800 (Wed, 21 Jan 2009)
New Revision: 3308

Modified:
   pbibuild/modules/gtkpool/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/gtkpool/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/gtkpool/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/gtkpool/pbi.conf
Log:

Updated gtkpool, now 100% self-contained as proper



Modified: pbibuild/modules/gtkpool/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/gtkpool/overlay-dir/PBI.FirstRun.sh	2009-01-21 18:50:45 UTC (rev 3307)
+++ pbibuild/modules/gtkpool/overlay-dir/PBI.FirstRun.sh	2009-01-21 19:26:36 UTC (rev 3308)
@@ -15,34 +15,3 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-
-
-if [ -e "/usr/local/bin/gtkpool" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/gtkpool | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "GTKPool is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/gtkpool | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep GTKPool 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "GTKPool could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "GTKPool 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 "GTKPool is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 

Modified: pbibuild/modules/gtkpool/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/gtkpool/overlay-dir/PBI.RemoveScript.sh	2009-01-21 18:50:45 UTC (rev 3307)
+++ pbibuild/modules/gtkpool/overlay-dir/PBI.RemoveScript.sh	2009-01-21 19:26:36 UTC (rev 3308)
@@ -6,9 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/gtkpool
-rm -fR /usr/local/share/gtkpool
-rm -fR /usr/local/share/icons/gtkpool.png
 
 if [ ! -z "$DISPLAY" ]
 then

Modified: pbibuild/modules/gtkpool/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/gtkpool/overlay-dir/PBI.SetupScript.sh	2009-01-21 18:50:45 UTC (rev 3307)
+++ pbibuild/modules/gtkpool/overlay-dir/PBI.SetupScript.sh	2009-01-21 19:26:36 UTC (rev 3308)
@@ -14,8 +14,13 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /Programs/${PROGDIR}/.sbin/gtkpool /usr/local/bin/gtkpool
-ln -s /Programs/${PROGDIR}/share/gtkpool /usr/local/share/gtkpool
-ln -s /Programs/${PROGDIR}/share/icons/gtkpool.png /usr/local/share/icons/gtkpool.png
 
-echo "LAUNCHCLOSE: /usr/local/bin/gtkpool"
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
+
+echo "LAUNCHCLOSE: /Programs/bin/gtkpool"

Modified: pbibuild/modules/gtkpool/pbi.conf
===================================================================
--- pbibuild/modules/gtkpool/pbi.conf	2009-01-21 18:50:45 UTC (rev 3307)
+++ pbibuild/modules/gtkpool/pbi.conf	2009-01-21 19:26:36 UTC (rev 3308)
@@ -25,7 +25,7 @@
 PBIUPDATE="http://update.pbidir.com"
 
 # Other Ports we need built (One per line)
-OTHERPORT=""
+OTHERPORT="/usr/ports/x11-themes/qtcurve-gtk2"
 
 # Enter your custom make options here
 MAKEOPTS=""