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

[svn at pcbsd.org]

Author: kris
Date: 2009-04-06 07:18:59 -0700 (Mon, 06 Apr 2009)
New Revision: 3769

Added:
   pbibuild/modules/amarok-kde4/overlay-dir/lib-list
Modified:
   pbibuild/modules/amarok-kde4/copy-files
   pbibuild/modules/amarok-kde4/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/amarok-kde4/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/amarok-kde4/pbi.conf
Log:

Updated amarok-kde4 PBI, now runs without having to re-scan for plugins and such :)



Modified: pbibuild/modules/amarok-kde4/copy-files
===================================================================
--- pbibuild/modules/amarok-kde4/copy-files	2009-04-06 06:25:18 UTC (rev 3768)
+++ pbibuild/modules/amarok-kde4/copy-files	2009-04-06 14:18:59 UTC (rev 3769)
@@ -4,7 +4,23 @@
 /usr/local/bin/my* bin/
 /usr/local/bin/mp* bin/
 /usr/local/bin/hal* bin/
-/usr/local/kde4/* kde4/
+/usr/local/kde4/etc kde4/
+/usr/local/kde4/lib kde4/
+/usr/local/kde4/share/config kde4/share/
+/usr/local/kde4/share/config.kcfg kde4/share/
+/usr/local/kde4/share/dbus-1 kde4/share/
+/usr/local/kde4/share/doc kde4/share/
+/usr/local/kde4/share/icons kde4/share/
+/usr/local/kde4/share/apps kde4/share/
+/usr/local/kde4/share/mime kde4/share/
+/usr/local/kde4/share/misc kde4/share/
+/usr/local/kde4/share/nls kde4/share/
+/usr/local/kde4/share/pixmaps kde4/share/
+/usr/local/kde4/share/sgml kde4/share/
+/usr/local/kde4/share/sounds kde4/share/
+/usr/local/kde4/share/xml kde4/share/
+/usr/local/kde4/share/kde4/services/*amarok* kde4/share/kde4/services/
+/usr/local/kde4/share/kde4/servicetypes/*amarok* kde4/share/kde4/servicetypes/
 /usr/local/lib/*sql* autolibs/
 /usr/local/lib/libm* autolibs/
 /usr/local/lib/liblou* autolibs/

Modified: pbibuild/modules/amarok-kde4/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/amarok-kde4/overlay-dir/PBI.RemoveScript.sh	2009-04-06 06:25:18 UTC (rev 3768)
+++ pbibuild/modules/amarok-kde4/overlay-dir/PBI.RemoveScript.sh	2009-04-06 14:18:59 UTC (rev 3769)
@@ -31,6 +31,21 @@
   fi
 done
 
+# Link our service libraries for amarok
+for i in `cat /Programs/${PROGDIR}/lib-list`
+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/lib/kde4/${i}" ]
+  then
+    rm /PCBSD/local/kde4/lib/kde4/${i}
+  fi
+done
+
+
+
 cd /home
 for i in `ls` 
    do 

Modified: pbibuild/modules/amarok-kde4/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/amarok-kde4/overlay-dir/PBI.SetupScript.sh	2009-04-06 06:25:18 UTC (rev 3768)
+++ pbibuild/modules/amarok-kde4/overlay-dir/PBI.SetupScript.sh	2009-04-06 14:18:59 UTC (rev 3769)
@@ -31,6 +31,12 @@
   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
 
 else
   ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
@@ -46,8 +52,13 @@
   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
 
-
 fi
 
 

Modified: pbibuild/modules/amarok-kde4/pbi.conf
===================================================================
--- pbibuild/modules/amarok-kde4/pbi.conf	2009-04-06 06:25:18 UTC (rev 3768)
+++ pbibuild/modules/amarok-kde4/pbi.conf	2009-04-06 14:18:59 UTC (rev 3769)
@@ -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="02"
+BUILDKEY="05"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY