[PC-BSD Commits] r6975 - in pbibuild/modules/audio/amarok-kde4: . kmenu-dir overlay-dir overlay-dir/fake-bin

svn at pcbsd.org svn at pcbsd.org
Thu Jun 17 12:33:24 PDT 2010


Author: kris
Date: 2010-06-17 12:33:24 -0700 (Thu, 17 Jun 2010)
New Revision: 6975

Added:
   pbibuild/modules/audio/amarok-kde4/overlay-dir/fake-bin/
   pbibuild/modules/audio/amarok-kde4/overlay-dir/fake-bin/wrapper
Removed:
   pbibuild/modules/audio/amarok-kde4/kmenu-dir/amarok_daapserver
   pbibuild/modules/audio/amarok-kde4/kmenu-dir/amarok_proxy
   pbibuild/modules/audio/amarok-kde4/kmenu-dir/amarokapp
   pbibuild/modules/audio/amarok-kde4/kmenu-dir/amarokcollectionscanner
   pbibuild/modules/audio/amarok-kde4/overlay-dir/autolibs/
   pbibuild/modules/audio/amarok-kde4/overlay-dir/bin/
   pbibuild/modules/audio/amarok-kde4/overlay-dir/lib-list
   pbibuild/modules/audio/amarok-kde4/overlay-dir/serv-list1
   pbibuild/modules/audio/amarok-kde4/overlay-dir/serv-list2
   pbibuild/modules/audio/amarok-kde4/overlay-dir/share/
Modified:
   pbibuild/modules/audio/amarok-kde4/build.sh
   pbibuild/modules/audio/amarok-kde4/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/audio/amarok-kde4/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/audio/amarok-kde4/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/audio/amarok-kde4/pbi.conf
Log:

Updatd amarok module to fix some runtime issues and give it a major cleaning while here



Modified: pbibuild/modules/audio/amarok-kde4/build.sh
===================================================================
--- pbibuild/modules/audio/amarok-kde4/build.sh	2010-06-17 19:27:38 UTC (rev 6974)
+++ pbibuild/modules/audio/amarok-kde4/build.sh	2010-06-17 19:33:24 UTC (rev 6975)
@@ -8,15 +8,3 @@
 # MODULEDIR = The location of the module directory for this PBI
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
-
-# Do some pruning
-rm -rf ${PBIDIR}/autolibs/perl*
-rm -rf ${PBIDIR}/autolibs/python*
-rm -rf ${PBIDIR}/kde4/include
-rm -rf ${PBIDIR}/kde4/man
-rm -rf ${PBIDIR}/include
-rm -rf ${PBIDIR}/share/doc
-rm -rf ${PBIDIR}/share/gtk-doc
-rm -rf ${PBIDIR}/share/examples
-
-

Modified: pbibuild/modules/audio/amarok-kde4/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/audio/amarok-kde4/overlay-dir/PBI.FirstRun.sh	2010-06-17 19:27:38 UTC (rev 6974)
+++ pbibuild/modules/audio/amarok-kde4/overlay-dir/PBI.FirstRun.sh	2010-06-17 19:33:24 UTC (rev 6975)
@@ -15,33 +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/amarok" ]
-then
-    # Looks like K3b is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/amarok | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "Amarok is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        AMA="`ls -al /usr/local/bin/amarok | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $AMA | grep Amarok 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${AMA}
-        else
-          kdialog --sorry "Amarok could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "Amarok 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 "Amarok is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 

Modified: pbibuild/modules/audio/amarok-kde4/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/audio/amarok-kde4/overlay-dir/PBI.RemoveScript.sh	2010-06-17 19:27:38 UTC (rev 6974)
+++ pbibuild/modules/audio/amarok-kde4/overlay-dir/PBI.RemoveScript.sh	2010-06-17 19:33:24 UTC (rev 6975)
@@ -6,42 +6,3 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-
-for i in `cat /Programs/${PROGDIR}/serv-list1`
-do
-  if [ -e "/usr/local/kde4/share/kde4/services/${i}" ]
-  then
-    rm /usr/local/kde4/share/kde4/services/${i}
-  fi
-  if [ -e "/PCBSD/local/kde4/share/kde4/services/${i}" ]
-  then
-    rm /PCBSD/local/kde4/share/kde4/services/${i}
-  fi
-done
-
-for i in `cat /Programs/${PROGDIR}/serv-list2`
-do
-  if [ -e "/usr/local/kde4/share/kde4/servicetypes/${i}" ]
-  then
-    rm /usr/local/kde4/share/kde4/servicetypes/${i}
-  fi
-  if [ -e "/PCBSD/local/kde4/share/kde4/servicetypes/${i}" ]
-  then
-    rm /PCBSD/local/kde4/share/kde4/servicetypes/${i}
-  fi
-done
-
-# Link our service libraries for amarok
-for i in `cat /Programs/${PROGDIR}/lib-list`
-do
-  if [ -e "/usr/local/kde4/lib/kde4/${i}" ]
-  then
-    rm /usr/local/kde4/lib/kde4/${i}
-  fi
-  if [ -e "/PCBSD/local/kde4/lib/kde4/${i}" ]
-  then
-    rm /PCBSD/local/kde4/lib/kde4/${i}
-  fi
-done
-
-

Modified: pbibuild/modules/audio/amarok-kde4/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/audio/amarok-kde4/overlay-dir/PBI.SetupScript.sh	2010-06-17 19:27:38 UTC (rev 6974)
+++ pbibuild/modules/audio/amarok-kde4/overlay-dir/PBI.SetupScript.sh	2010-06-17 19:33:24 UTC (rev 6975)
@@ -15,40 +15,9 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-# Check which font config we want to link to
-if [ -d "/PCBSD/local/etc/fonts" ]
-then
-  BASE="/PCBSD/local"
-else
-  BASE="/usr/local"
-fi
+# Setup the wrapper script
+sed -i.bak "s|CHANGEME|/Programs/${PROGDIR}|g" /Programs/${PROGDIR}/fake-bin/wrapper
+rm /Programs/${PROGDIR}/fake-bin/wrapper.bak
+chmod 755 /Programs/${PROGDIR}/fake-bin/wrapper
 
-rm /Programs/${PROGDIR}/serv-list1
-rm /Programs/${PROGDIR}/serv-list2
-rm /Programs/${PROGDIR}/lib-list
-
-# Link our services for amarok
-cd /Programs/${PROGDIR}/kde4/share/kde4/services/
-for i in `ls amarok*.desktop`
-do
-  ln -fs /Programs/${PROGDIR}/kde4/share/kde4/services/${i} ${BASE}/kde4/share/kde4/services/${i}
-  echo "${i}" >>/Programs/${PROGDIR}/serv-list1
-done
-
-# Link our services for amarok
-cd /Programs/${PROGDIR}/kde4/share/kde4/servicetypes/
-for i in `ls amarok*.desktop`
-do
-  ln -fs /Programs/${PROGDIR}/kde4/share/kde4/servicetypes/${i} ${BASE}/kde4/share/kde4/servicetypes/${i}
-  echo "${i}" >>/Programs/${PROGDIR}/serv-list2
-done
- 
-# Link our service libraries for amarok
-cd /Programs/${PROGDIR}/kde4/lib/kde4/
-for i in `ls amarok*.so`
-do
-  ln -fs /Programs/${PROGDIR}/kde4/lib/kde4/${i} ${BASE}/kde4/lib/kde4/${i}
-  echo "${i}" >>/Programs/${PROGDIR}/lib-list
-done
-  
-echo "LAUNCHCLOSE: /Programs/bin/amarok"
+ln /Programs/${PROGDIR}/fake-bin/wrapper /Programs/${PROGDIR}/bin/amarok


Property changes on: pbibuild/modules/audio/amarok-kde4/overlay-dir/fake-bin/wrapper
___________________________________________________________________
Added: svn:executable
   + *

Modified: pbibuild/modules/audio/amarok-kde4/pbi.conf
===================================================================
--- pbibuild/modules/audio/amarok-kde4/pbi.conf	2010-06-17 19:27:38 UTC (rev 6974)
+++ pbibuild/modules/audio/amarok-kde4/pbi.conf	2010-06-17 19:33:24 UTC (rev 6975)
@@ -35,6 +35,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="02"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY



More information about the Commits mailing list