[PC-BSD Commits] r4673 - in pbibuild/modules/multimedia/gxmms2: . kmenu-dir overlay-dir overlay-dir/bin

[svn at pcbsd.org]

Author: kris
Date: 2009-10-16 09:25:59 -0700 (Fri, 16 Oct 2009)
New Revision: 4673

Removed:
   pbibuild/modules/multimedia/gxmms2/overlay-dir/autolibs/
   pbibuild/modules/multimedia/gxmms2/overlay-dir/share/
   pbibuild/modules/multimedia/gxmms2/preportmake.sh
Modified:
   pbibuild/modules/multimedia/gxmms2/kmenu-dir/xmms2d
   pbibuild/modules/multimedia/gxmms2/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/multimedia/gxmms2/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/multimedia/gxmms2/overlay-dir/bin/xmms2-admin.sh
   pbibuild/modules/multimedia/gxmms2/pbi.conf
Log:

Fixed up gxmms2 module, works nicely now



Modified: pbibuild/modules/multimedia/gxmms2/kmenu-dir/xmms2d
===================================================================
--- pbibuild/modules/multimedia/gxmms2/kmenu-dir/xmms2d	2009-10-16 16:04:09 UTC (rev 4672)
+++ pbibuild/modules/multimedia/gxmms2/kmenu-dir/xmms2d	2009-10-16 16:25:59 UTC (rev 4673)
@@ -1,4 +1,4 @@
-ExePath: bin/xmms2d.sh
+ExePath: bin/xmms2d
 ExeIcon: xmms2-128.png
 ExeDescr: xmms2d
 ExeNoDesktop: 1

Modified: pbibuild/modules/multimedia/gxmms2/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/multimedia/gxmms2/overlay-dir/PBI.RemoveScript.sh	2009-10-16 16:04:09 UTC (rev 4672)
+++ pbibuild/modules/multimedia/gxmms2/overlay-dir/PBI.RemoveScript.sh	2009-10-16 16:25:59 UTC (rev 4673)
@@ -7,22 +7,3 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-
-
-if [ ! -z "$DISPLAY" ]
-then
- # Ask if we want to remove the user profiles
- kdialog --yesno "Do you want to remove gxmms2 user settings?" --title "Remove user settings"
- if [ "$?" = "0" ]
- then
-  cd /home
-  for i in `ls`
-  do
-   if [ -e "/home/${i}/.config/gxmms2" ]
-   then
-    rm -rf /home/${i}/.config/gxmms2
-   fi
-  done
- fi
-fi
-

Modified: pbibuild/modules/multimedia/gxmms2/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/multimedia/gxmms2/overlay-dir/PBI.SetupScript.sh	2009-10-16 16:04:09 UTC (rev 4672)
+++ pbibuild/modules/multimedia/gxmms2/overlay-dir/PBI.SetupScript.sh	2009-10-16 16:25:59 UTC (rev 4673)
@@ -23,3 +23,5 @@
   ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
 fi
 
+ln -fs /Programs/${PROGDIR}/.sbin/xmms2d /Programs/bin/xmms2d
+ln -fs /Programs/${PROGDIR}/.sbin/xmms2 /Programs/bin/xmms2

Modified: pbibuild/modules/multimedia/gxmms2/overlay-dir/bin/xmms2-admin.sh
===================================================================
--- pbibuild/modules/multimedia/gxmms2/overlay-dir/bin/xmms2-admin.sh	2009-10-16 16:04:09 UTC (rev 4672)
+++ pbibuild/modules/multimedia/gxmms2/overlay-dir/bin/xmms2-admin.sh	2009-10-16 16:25:59 UTC (rev 4673)
@@ -19,7 +19,7 @@
 # Function to start xmms2d in the background
 start_xmms2d() {
   echo -e "Starting xmms2d...\c"
-  ( /usr/local/bin/xmms2d ) &
+  ( /Programs/bin/xmms2d 2>/dev/null ) &
   sleep 2
   echo -e "Done!"
 };
@@ -34,7 +34,7 @@
 
 # Function enable startup of xmms2d in the background
 enable_xmms2d() {
-  ln -s /usr/local/bin/xmms2d ~${KDEDIR}/Autostart/xmms2d
+  ln -s /Programs/bin/xmms2d ~${KDEDIR}/Autostart/xmms2d
 };
 
 # Function disable startup of xmms2d in the background

Modified: pbibuild/modules/multimedia/gxmms2/pbi.conf
===================================================================
--- pbibuild/modules/multimedia/gxmms2/pbi.conf	2009-10-16 16:04:09 UTC (rev 4672)
+++ pbibuild/modules/multimedia/gxmms2/pbi.conf	2009-10-16 16:25:59 UTC (rev 4673)
@@ -38,7 +38,7 @@
 
 # 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="02"
+BUILDKEY="31"
 
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY