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

svn at pcbsd.org svn at pcbsd.org
Sat Jan 10 09:14:49 PST 2009


Author: kris
Date: 2009-01-10 09:14:49 -0800 (Sat, 10 Jan 2009)
New Revision: 3222

Modified:
   pbibuild/modules/amarok/build.sh
   pbibuild/modules/amarok/copy-files
   pbibuild/modules/amarok/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/amarok/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/amarok/pbi.conf
Log:

Updated the amarok PBI, now 100% self-contained, includes the MTP and GPOD support for MP3 players. 



Modified: pbibuild/modules/amarok/build.sh
===================================================================
--- pbibuild/modules/amarok/build.sh	2009-01-10 01:55:28 UTC (rev 3221)
+++ pbibuild/modules/amarok/build.sh	2009-01-10 17:14:49 UTC (rev 3222)
@@ -8,16 +8,3 @@
 # MODULEDIR = The location of the module directory for this PBI
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
-
-# Get all the various language files and copy them to the PBI
-LANGFILE="amarok.mo"
-mkdir ${PBIDIR}/locale/
-cd /usr/local/share/locale
-for i in `ls`
-do
-  if [ -e "/usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}" ]
-  then
-    mkdir ${PBIDIR}/locale/${i}
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE} ${PBIDIR}/locale/${i}/
-  fi
-done

Modified: pbibuild/modules/amarok/copy-files
===================================================================
--- pbibuild/modules/amarok/copy-files	2009-01-10 01:55:28 UTC (rev 3221)
+++ pbibuild/modules/amarok/copy-files	2009-01-10 17:14:49 UTC (rev 3222)
@@ -3,34 +3,35 @@
 /usr/local/bin/amarok_proxy.rb bin/
 /usr/local/bin/amarokapp bin/
 /usr/local/bin/amarokcollectionscanner bin/
+/usr/local/bin/kio* bin/
+/usr/local/bin/*dcop* bin/
+/usr/local/bin/*arts* bin/
+/usr/local/bin/*sql* bin/
+/usr/local/bin/*ruby* bin/
 /usr/local/lib/kde3/*amarok* autolibs/kde3/
+/usr/local/lib/kde3/*kio* autolibs/kde3/
+/usr/local/lib/kde3/*knoti* autolibs/kde3/
+/usr/local/lib/kde3/kded* autolibs/kde3/
 /usr/local/lib/libamarok* autolibs/
-/usr/local/share/apps/amarok share/apps/
-/usr/local/share/apps/konqsidebartng/add/amarok.desktop share/apps/konqsidebartng/add/
-/usr/local/share/apps/konqsidebartng/entries/amarok.desktop share/apps/konqsidebartng/entries/
-/usr/local/share/apps/konqsidebartng/kicker_entries/amarok.desktop share/apps/konqsidebartng/kicker_entries/
-/usr/local/share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop share/apps/konqueror/servicemenus/
-/usr/local/share/apps/konqueror/servicemenus/amarok_append.desktop share/apps/konqueror/servicemenus/
-/usr/local/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop share/apps/konqueror/servicemenus/
-/usr/local/share/apps/profiles/amarok.profile.xml share/apps/profiles/
-/usr/local/share/config.kcfg/amarok.kcfg share/config.kcfg/
-/usr/local/share/config.kcfg/xinecfg.kcfg share/config.kcfg/
-/usr/local/share/config/amarokrc share/config/
-/usr/local/share/services/amarok_daap-mediadevice.desktop share/services/
-/usr/local/share/services/amarok_generic-mediadevice.desktop share/services/
-/usr/local/share/services/amarok_massstorage-device.desktop share/services/
-/usr/local/share/services/amarok_nfs-device.desktop share/services/
-/usr/local/share/services/amarok_smb-device.desktop share/services/
-/usr/local/share/services/amarok_void-engine_plugin.desktop share/services/
-/usr/local/share/services/amarok_xine-engine.desktop share/services/
-/usr/local/share/services/amarokitpc.protocol share/services/
-/usr/local/share/services/amaroklastfm.protocol share/services/
-/usr/local/share/services/amarokpcast.protocol share/services/
-/usr/local/share/services/amarok_ipod-mediadevice.desktop share/services/
-/usr/local/share/services/amarok_mtp-mediadevice.desktop share/services/
-/usr/local/share/services/amarok_njb-mediadevice.desktop share/services/
-/usr/local/share/servicetypes/amarok_codecinstall.desktop share/servicetypes/
-/usr/local/share/servicetypes/amarok_plugin.desktop share/servicetypes/
+/usr/local/lib/libsql* autolibs/
+/usr/local/lib/*hal* autolibs/
+/usr/local/lib/*mtp* autolibs/
+/usr/local/lib/*gpod* autolibs/
+/usr/local/lib/*dbus* autolibs/
+/usr/local/lib/ruby* autolibs/
+/usr/local/share/apps share/apps
+/usr/local/share/apps/konqsidebartng/add share/apps/konqsidebartng/add
+/usr/local/share/apps/konqsidebartng/entries share/apps/konqsidebartng/entries
+/usr/local/share/apps/konqsidebartng/kicker_entries share/apps/konqsidebartng/kicker_entries
+/usr/local/share/apps/konqueror/servicemenus share/apps/konqueror/servicemenus
+/usr/local/share/apps/profiles share/apps/profiles
+/usr/local/share/config.kcfg share/config.kcfg
+/usr/local/share/config share/config
+/usr/local/share/services share/services
+/usr/local/share/servicetypes share/servicetypes
+/usr/local/share/mime share/mime
+/usr/local/share/mimelnk share/mimelnk
+/usr/local/libexec/gam* libexec/
 /usr/local/share/icons/hicolor/128x128/apps/amarok.png share/icons/hicolor/128x128/apps/
 /usr/local/share/icons/hicolor/16x16/apps/amarok.png share/icons/hicolor/16x16/apps/
 /usr/local/share/icons/hicolor/22x22/apps/amarok.png share/icons/hicolor/22x22/apps/

Modified: pbibuild/modules/amarok/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/amarok/overlay-dir/PBI.RemoveScript.sh	2009-01-10 01:55:28 UTC (rev 3221)
+++ pbibuild/modules/amarok/overlay-dir/PBI.RemoveScript.sh	2009-01-10 17:14:49 UTC (rev 3222)
@@ -7,63 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-# Remove all of our various symlinks
-rm /usr/local/bin/amarok
-rm /usr/local/bin/amarok_daapserver.rb
-rm /usr/local/bin/amarok_proxy.rb
-rm /usr/local/bin/amarokapp
-rm /usr/local/bin/amarokcollectionscanner
-rm /usr/local/share/apps/amarok
-rm /usr/local/share/apps/konqsidebartng/add/amarok.desktop 
-rm /usr/local/share/apps/konqsidebartng/entries/amarok.desktop
-rm /usr/local/share/apps/konqsidebartng/kicker_entries/amarok.desktop
-rm /usr/local/share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop
-rm /usr/local/share/apps/konqueror/servicemenus/amarok_append.desktop
-rm /usr/local/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop
-rm /usr/local/share/apps/profiles/amarok.profile.xml
-rm /usr/local/share/config.kcfg/amarok.kcfg
-rm /usr/local/share/config.kcfg/xinecfg.kcfg
-rm /usr/local/share/config/amarokrc
-rm /usr/local/share/services/amarok_daap-mediadevice.desktop
-rm /usr/local/share/services/amarok_generic-mediadevice.desktop
-rm /usr/local/share/services/amarok_massstorage-device.desktop
-rm /usr/local/share/services/amarok_nfs-device.desktop
-rm /usr/local/share/services/amarok_smb-device.desktop
-rm /usr/local/share/services/amarok_void-engine_plugin.desktop
-rm /usr/local/share/services/amarok_xine-engine.desktop
-rm /usr/local/share/services/amarokitpc.protocol
-rm /usr/local/share/services/amaroklastfm.protocol
-rm /usr/local/share/services/amarokpcast.protocol
-rm /usr/local/share/services/amarok_ipod-mediadevice.desktop
-rm /usr/local/share/services/amarok_mtp-mediadevice.desktop
-rm /usr/local/share/services/amarok_njb-mediadevice.desktop
-rm /usr/local/share/servicetypes/amarok_codecinstall.desktop
-rm /usr/local/share/servicetypes/amarok_plugin.desktop
-rm /usr/local/share/icons/hicolor/128x128/apps/amarok.png
-rm /usr/local/share/icons/hicolor/16x16/apps/amarok.png
-rm /usr/local/share/icons/hicolor/22x22/apps/amarok.png
-rm /usr/local/share/icons/hicolor/32x32/apps/amarok.png
-rm /usr/local/share/icons/hicolor/48x48/apps/amarok.png
-rm /usr/local/share/icons/hicolor/64x64/apps/amarok.png
-
-
-
-
-# Remove the services links
-cd /Programs/${1}/autolibs/kde3/
-for i in `ls`
-do
- rm /usr/local/lib/kde3/${i}
-done
-
-# Remove the old locale files since we are uninstalling
-LANGFILE="amarok.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
-
 cd /home
 for i in `ls` 
    do 
@@ -73,6 +16,7 @@
        if [ "$?" = "0" ] 
        then 
          rm -R /home/${i}/.kde/share/apps/amarok
+         rm -R /home/${i}/.kde/share/config/amarokrc
        fi 
      fi 
    done

Modified: pbibuild/modules/amarok/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/amarok/overlay-dir/PBI.SetupScript.sh	2009-01-10 01:55:28 UTC (rev 3221)
+++ pbibuild/modules/amarok/overlay-dir/PBI.SetupScript.sh	2009-01-10 17:14:49 UTC (rev 3222)
@@ -14,66 +14,14 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -fs /Programs/${PROGDIR}/.sbin/amarok /usr/local/bin/amarok
-ln -fs /Programs/${PROGDIR}/.sbin/amarok_daapserver.rb /usr/local/bin/amarok_daapserver.rb
-ln -fs /Programs/${PROGDIR}/.sbin/amarok_proxy.rb /usr/local/bin/amarok_proxy.rb
-ln -fs /Programs/${PROGDIR}/.sbin/amarokapp /usr/local/bin/amarokapp
-ln -fs /Programs/${PROGDIR}/.sbin/amarokcollectionscanner /usr/local/bin/amarokcollectionscanner
-ln -fs /Programs/${PROGDIR}/share/apps/amarok /usr/local/share/apps/amarok
-ln -fs /Programs/${PROGDIR}/share/apps/konqsidebartng/add/amarok.desktop /usr/local/share/apps/konqsidebartng/add/amarok.desktop 
-ln -fs /Programs/${PROGDIR}/share/apps/konqsidebartng/entries/amarok.desktop /usr/local/share/apps/konqsidebartng/entries/amarok.desktop
-ln -fs /Programs/${PROGDIR}/share/apps/konqsidebartng/kicker_entries/amarok.desktop /usr/local/share/apps/konqsidebartng/kicker_entries/amarok.desktop
-ln -fs /Programs/${PROGDIR}/share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop /usr/local/share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop
-ln -fs /Programs/${PROGDIR}/share/apps/konqueror/servicemenus/amarok_append.desktop /usr/local/share/apps/konqueror/servicemenus/amarok_append.desktop
-ln -fs /Programs/${PROGDIR}/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop /usr/local/share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop
 
+# 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
 
-ln -fs /Programs/${PROGDIR}/share/apps/profiles/amarok.profile.xml /usr/local/share/apps/profiles/amarok.profile.xml
-ln -fs /Programs/${PROGDIR}/share/config.kcfg/amarok.kcfg /usr/local/share/config.kcfg/amarok.kcfg
-ln -fs /Programs/${PROGDIR}/share/config.kcfg/xinecfg.kcfg /usr/local/share/config.kcfg/xinecfg.kcfg
-ln -fs /Programs/${PROGDIR}/share/config/amarokrc /usr/local/share/config/amarokrc
 
-ln -fs /Programs/${PROGDIR}/share/services/amarok_daap-mediadevice.desktop /usr/local/share/services/amarok_daap-mediadevice.desktop
-ln -fs /Programs/${PROGDIR}/share/services/amarok_generic-mediadevice.desktop /usr/local/share/services/amarok_generic-mediadevice.desktop
-ln -fs /Programs/${PROGDIR}/share/services/amarok_massstorage-device.desktop /usr/local/share/services/amarok_massstorage-device.desktop
-ln -fs /Programs/${PROGDIR}/share/services/amarok_nfs-device.desktop /usr/local/share/services/amarok_nfs-device.desktop
-ln -fs /Programs/${PROGDIR}/share/services/amarok_smb-device.desktop /usr/local/share/services/amarok_smb-device.desktop
-ln -fs /Programs/${PROGDIR}/share/services/amarok_void-engine_plugin.desktop /usr/local/share/services/amarok_void-engine_plugin.desktop
-ln -fs /Programs/${PROGDIR}/share/services/amarok_xine-engine.desktop /usr/local/share/services/amarok_xine-engine.desktop
-ln -fs /Programs/${PROGDIR}/share/services/amarokitpc.protocol /usr/local/share/services/amarokitpc.protocol
-ln -fs /Programs/${PROGDIR}/share/services/amaroklastfm.protocol /usr/local/share/services/amaroklastfm.protocol
-ln -fs /Programs/${PROGDIR}/share/services/amarokpcast.protocol /usr/local/share/services/amarokpcast.protocol
-ln -fs /Programs/${PROGDIR}/share/services/amarok_ipod-mediadevice.desktop /usr/local/share/services/amarok_ipod-mediadevice.desktop
-ln -fs /Programs/${PROGDIR}/share/services/amarok_mtp-mediadevice.desktop /usr/local/share/services/amarok_mtp-mediadevice.desktop
-ln -fs /Programs/${PROGDIR}/share/services/amarok_njb-mediadevice.desktop /usr/local/share/services/amarok_njb-mediadevice.desktop
-
-ln -fs /Programs/${PROGDIR}/share/servicetypes/amarok_codecinstall.desktop /usr/local/share/servicetypes/amarok_codecinstall.desktop
-ln -fs /Programs/${PROGDIR}/share/servicetypes/amarok_plugin.desktop /usr/local/share/servicetypes/amarok_plugin.desktop
-ln -fs /Programs/${PROGDIR}/share/icons/hicolor/128x128/apps/amarok.png /usr/local/share/icons/hicolor/128x128/apps/amarok.png
-ln -fs /Programs/${PROGDIR}/share/icons/hicolor/16x16/apps/amarok.png /usr/local/share/icons/hicolor/16x16/apps/amarok.png
-ln -fs /Programs/${PROGDIR}/share/icons/hicolor/22x22/apps/amarok.png /usr/local/share/icons/hicolor/22x22/apps/amarok.png
-ln -fs /Programs/${PROGDIR}/share/icons/hicolor/32x32/apps/amarok.png /usr/local/share/icons/hicolor/32x32/apps/amarok.png
-ln -fs /Programs/${PROGDIR}/share/icons/hicolor/48x48/apps/amarok.png /usr/local/share/icons/hicolor/48x48/apps/amarok.png
-ln -fs /Programs/${PROGDIR}/share/icons/hicolor/64x64/apps/amarok.png /usr/local/share/icons/hicolor/64x64/apps/amarok.png
-
-
-
-# Make links for services
-cd /Programs/${PROGDIR}/autolibs/kde3/
-for i in `ls`
-do
- # Link the services now
- ln -s /Programs/${PROGDIR}/autolibs/kde3/${i} /usr/local/lib/kde3/${i}
-done
-
-# Copy over all the LANG files
-LANGFILE="amarok.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  mkdir -p /usr/local/share/locale/${i}/LC_MESSAGES >/dev/null 2>/dev/null
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
-
-
-echo "LAUNCHCLOSE: /usr/local/bin/amarok"
+echo "LAUNCHCLOSE: /Programs/bin/amarok"

Modified: pbibuild/modules/amarok/pbi.conf
===================================================================
--- pbibuild/modules/amarok/pbi.conf	2009-01-10 01:55:28 UTC (rev 3221)
+++ pbibuild/modules/amarok/pbi.conf	2009-01-10 17:14:49 UTC (rev 3222)
@@ -25,13 +25,13 @@
 PBIUPDATE="http://update.pbidir.com"
 
 # Other Ports we need built (One per line)
-OTHERPORT=""
+OTHERPORT="/usr/ports/databases/sqlite3"
 
 # 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="27"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY



More information about the Commits mailing list