[PC-BSD Commits] r5533 - in pbibuild/modules/audio/amarok-kde4: . overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2009-12-10 07:12:16 -0800 (Thu, 10 Dec 2009)
New Revision: 5533

Modified:
   pbibuild/modules/audio/amarok-kde4/build.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:

Updated amarok, fixed runtime



Modified: pbibuild/modules/audio/amarok-kde4/build.sh
===================================================================
--- pbibuild/modules/audio/amarok-kde4/build.sh	2009-12-10 14:47:23 UTC (rev 5532)
+++ pbibuild/modules/audio/amarok-kde4/build.sh	2009-12-10 15:12:16 UTC (rev 5533)
@@ -9,7 +9,14 @@
 #   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.RemoveScript.sh
===================================================================
--- pbibuild/modules/audio/amarok-kde4/overlay-dir/PBI.RemoveScript.sh	2009-12-10 14:47:23 UTC (rev 5532)
+++ pbibuild/modules/audio/amarok-kde4/overlay-dir/PBI.RemoveScript.sh	2009-12-10 15:12:16 UTC (rev 5533)
@@ -34,9 +34,9 @@
 # Link our service libraries for amarok
 for i in `cat /Programs/${PROGDIR}/lib-list`
 do
-  if [ -e "/usr/local/kde4/share/kde4/servicetypes/${i}" ]
+  if [ -e "/usr/local/kde4/lib/kde4/${i}" ]
   then
-    rm /usr/local/kde4/share/kde4/servicetypes/${i}
+    rm /usr/local/kde4/lib/kde4/${i}
   fi
   if [ -e "/PCBSD/local/kde4/lib/kde4/${i}" ]
   then

Modified: pbibuild/modules/audio/amarok-kde4/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/audio/amarok-kde4/overlay-dir/PBI.SetupScript.sh	2009-12-10 14:47:23 UTC (rev 5532)
+++ pbibuild/modules/audio/amarok-kde4/overlay-dir/PBI.SetupScript.sh	2009-12-10 15:12:16 UTC (rev 5533)
@@ -18,46 +18,37 @@
 # Check which font config we want to link to
 if [ -d "/PCBSD/local/etc/fonts" ]
 then
-
-  # Link our services for amarok
-  for i in `cat /Programs/${PROGDIR}/serv-list1`
-  do
-    ln -fs /Programs/${PROGDIR}/kde4/share/kde4/services/${i} /PCBSD/local/kde4/share/kde4/services/${i}
-  done
-
-  # Link our services for amarok
-  for i in `cat /Programs/${PROGDIR}/serv-list2`
-  do
-    ln -fs /Programs/${PROGDIR}/kde4/share/kde4/servicetypes/${i} /PCBSD/local/kde4/share/kde4/servicetypes/${i}
-  done
-  
-  # Link our service libraries for amarok
-  for i in `cat /Programs/${PROGDIR}/lib-list`
-  do
-    ln -fs /Programs/${PROGDIR}/kde4/lib/kde4/${i} /PCBSD/local/kde4/lib/kde4/${i}
-  done
-
+  BASE="/PCBSD/local"
 else
-  
-  # Link our services for amarok
-  for i in `cat /Programs/${PROGDIR}/serv-list1`
-  do
-    ln -fs /Programs/${PROGDIR}/kde4/share/kde4/services/${i} /usr/local/kde4/share/kde4/services/${i}
-  done
-
-  # Link our services for amarok
-  for i in `cat /Programs/${PROGDIR}/serv-list2`
-  do
-    ln -fs /Programs/${PROGDIR}/kde4/share/kde4/servicetypes/${i} /usr/local/kde4/share/kde4/servicetypes/${i}
-  done
-  
-  # Link our service libraries for amarok
-  for i in `cat /Programs/${PROGDIR}/lib-list`
-  do
-    ln -fs /Programs/${PROGDIR}/kde4/lib/kde4/${i} /usr/local/kde4/lib/kde4/${i}
-  done
-
+  BASE="/usr/local"
 fi
 
+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"

Modified: pbibuild/modules/audio/amarok-kde4/pbi.conf
===================================================================
--- pbibuild/modules/audio/amarok-kde4/pbi.conf	2009-12-10 14:47:23 UTC (rev 5532)
+++ pbibuild/modules/audio/amarok-kde4/pbi.conf	2009-12-10 15:12:16 UTC (rev 5533)
@@ -25,13 +25,15 @@
 PBIUPDATE="http://update.pbidir.com"
 
 # Other Ports we need built (One per line)
-OTHERPORT="/usr/ports/multimedia/gstreamer-plugins"
+OTHERPORT="/usr/ports/multimedia/gstreamer-plugins
+/usr/ports/multimedia/gstreamer-plugins-good
+/usr/ports/multimedia/gstreamer-plugins-bad"
 
 # Enter your custom make options here
 MAKEOPTS=""
 
 # 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="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY