[PC-BSD Commits] r3056 - in pbibuild/modules/ktorrent: . overlay-dir overlay-dir/share overlay-dir/share/icons overlay-dir/share/icons/16x16 overlay-dir/share/icons/22x22 overlay-dir/share/icons/32x32 overlay-dir/share/icons/48x48

svn at pcbsd.org svn at pcbsd.org
Wed Dec 10 08:31:58 PST 2008


Author: kris
Date: 2008-12-10 08:31:56 -0800 (Wed, 10 Dec 2008)
New Revision: 3056

Added:
   pbibuild/modules/ktorrent/overlay-dir/share/icons/
   pbibuild/modules/ktorrent/overlay-dir/share/icons/16x16/
   pbibuild/modules/ktorrent/overlay-dir/share/icons/16x16/actions/
   pbibuild/modules/ktorrent/overlay-dir/share/icons/22x22/
   pbibuild/modules/ktorrent/overlay-dir/share/icons/22x22/actions/
   pbibuild/modules/ktorrent/overlay-dir/share/icons/32x32/
   pbibuild/modules/ktorrent/overlay-dir/share/icons/32x32/actions/
   pbibuild/modules/ktorrent/overlay-dir/share/icons/48x48/
   pbibuild/modules/ktorrent/overlay-dir/share/icons/48x48/actions/
Removed:
   pbibuild/modules/ktorrent/overlay-dir/share/config.kcfg/
Modified:
   pbibuild/modules/ktorrent/copy-files
   pbibuild/modules/ktorrent/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/ktorrent/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/ktorrent/pbi.conf
Log:

Updated ktorrent module to build and work with the new KDE4 version



Modified: pbibuild/modules/ktorrent/copy-files
===================================================================
--- pbibuild/modules/ktorrent/copy-files	2008-12-09 23:26:21 UTC (rev 3055)
+++ pbibuild/modules/ktorrent/copy-files	2008-12-10 16:31:56 UTC (rev 3056)
@@ -1,29 +1,27 @@
-/usr/local/bin/ktorrent bin/
-/usr/local/bin/ktcache* bin/
-/usr/local/bin/ktshell bin/
-/usr/local/bin/kttorinfo bin/
-/usr/local/bin/ktupnptest bin/
-/usr/local/share/icons/hicolor/128x128/apps/ktorrent.png share/icons/128x128/apps/
-/usr/local/share/icons/hicolor/64x64/apps/ktorrent.png share/icons/64x64/apps/
-/usr/local/share/icons/hicolor/32x32/apps/ktorrent.png share/icons/32x32/apps/
-/usr/local/share/icons/hicolor/16x16/apps/ktorrent.png share/icons/16x16/apps/
-/usr/local/share/apps/ktorrent share/apps/
-/usr/local/share/applications/kde/ktorrent.desktop share/applications/kde/
-/usr/local/share/services/kt* share/services/
-/usr/local/share/servicetypes/ktorrent*.desktop share/servicetypes/
-/usr/local/share/config.kcfg/kt* share/config.kcfg/
-/usr/local/share/servicetypes/ktorrent*.desktop share/servicetypes/
-/usr/local/lib/libktorrent* autolibs/
-/usr/local/lib/kde3/kt* autolibs/kde3/
-/usr/local/lib/kde3/kt* autolibs/
-/usr/local/lib/kde3/ktinfo* autolibs/kde3/
-/usr/local/lib/kde3/ktfilter* autolibs/kde3/
-/usr/local/lib/kde3/ktlog* autolibs/kde3/
-/usr/local/lib/kde3/ktpart* autolibs/kde3/
-/usr/local/lib/kde3/ktrss* autolibs/kde3/
-/usr/local/lib/kde3/ktscan* autolibs/kde3/
-/usr/local/lib/kde3/ktscheduler* autolibs/kde3/
-/usr/local/lib/kde3/ktsearch* autolibs/kde3/
-/usr/local/lib/kde3/ktstats* autolibs/kde3/
-/usr/local/lib/kde3/ktupnp* autolibs/kde3/
-/usr/local/lib/kde3/ktweb* autolibs/kde3/
+/usr/local/kde4/bin/ktorrent bin/
+/usr/local/kde4/bin/ktupnp* bin/
+/usr/local/kde4/share/icons/hicolor/16x16/actions/kt* share/icons/16x16/actions/
+/usr/local/kde4/share/icons/hicolor/22x22/actions/kt* share/icons/22x22/actions/
+/usr/local/kde4/share/icons/hicolor/32x32/actions/kt* share/icons/32x32/actions/
+/usr/local/kde4/share/icons/hicolor/48x48/actions/kt* share/icons/48x48/actions/
+/usr/local/kde4/share/icons/hicolor/128x128/apps/ktorrent.png share/icons/128x128/apps/
+/usr/local/kde4/share/icons/hicolor/64x64/apps/ktorrent.png share/icons/64x64/apps/
+/usr/local/kde4/share/icons/hicolor/32x32/apps/ktorrent.png share/icons/32x32/apps/
+/usr/local/kde4/share/icons/hicolor/16x16/apps/ktorrent.png share/icons/16x16/apps/
+/usr/local/kde4/share/apps/ktorrent share/apps/
+/usr/local/kde4/share/applications/kde/ktorrent.desktop share/applications/kde/
+/usr/local/kde4/share/kde4/services/kt* share/services/
+/usr/local/kde4/share/kde4/servicetypes/ktorrent*.desktop share/servicetypes/
+/usr/local/kde4/lib/libktc* autolibs/
+/usr/local/kde4/lib/libbt* autolibs/
+/usr/local/kde4/lib/libktu* autolibs/
+/usr/local/kde4/lib/kde4/ktbwschedulerplugin.so autolibs/kde4/
+/usr/local/kde4/lib/kde4/ktinfowidgetplugin.so autolibs/kde4/
+/usr/local/kde4/lib/kde4/ktipfilterplugin.so autolibs/kde4/
+/usr/local/kde4/lib/kde4/ktlogviewerplugin.so autolibs/kde4/
+/usr/local/kde4/lib/kde4/ktmediaplayerplugin.so autolibs/kde4/
+/usr/local/kde4/lib/kde4/ktscanfolderplugin.so autolibs/kde4/
+/usr/local/kde4/lib/kde4/ktsearchplugin.so autolibs/kde4/
+/usr/local/kde4/lib/kde4/ktstatsplugin.so autolibs/kde4/
+/usr/local/kde4/lib/kde4/ktupnpplugin.so autolibs/kde4/
+/usr/local/kde4/lib/kde4/ktwebinterfaceplugin.so autolibs/kde4/

Modified: pbibuild/modules/ktorrent/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/ktorrent/overlay-dir/PBI.RemoveScript.sh	2008-12-09 23:26:21 UTC (rev 3055)
+++ pbibuild/modules/ktorrent/overlay-dir/PBI.RemoveScript.sh	2008-12-10 16:31:56 UTC (rev 3056)
@@ -7,35 +7,65 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /usr/local/bin/ktorrent
-rm /usr/local/share/apps/ktorrent
-rm /usr/local/share/servicetypes/ktorrentplugin.desktop
-rm /usr/local/share/applications/kde/ktorrent.desktop
-rm /usr/local/share/icons/crystalsvg/16x16/apps/ktorrent.png
-rm /usr/local/share/icons/crystalsvg/32x32/apps/ktorrent.png
-rm /usr/local/share/icons/crystalsvg/64x64/apps/ktorrent.png
-rm /usr/local/share/icons/crystalsvg/128x128/apps/ktorrent.png
+rm /usr/local/kde4/bin/ktorrent
+rm /usr/local/kde4/share/apps/ktorrent
+rm /usr/local/kde4/share/kde4/servicetypes/ktorrentplugin.desktop
+rm /usr/local/kde4/share/applications/kde4/ktorrent.desktop
+rm /usr/local/kde4/share/icons/crystalsvg/16x16/apps/ktorrent.png
+rm /usr/local/kde4/share/icons/crystalsvg/32x32/apps/ktorrent.png
+rm /usr/local/kde4/share/icons/crystalsvg/64x64/apps/ktorrent.png
+rm /usr/local/kde4/share/icons/crystalsvg/128x128/apps/ktorrent.png
 
 
 # Remove the services links
-cd /Programs/${1}/autolibs/kde3/
+cd /Programs/${1}/autolibs/kde4/
 for i in `ls`
 do
- rm /usr/local/lib/kde3/${i}
+ if [ -h "/usr/local/kde4/lib/kde4/${i}" ]
+ then
+   rm /usr/local/kde4/lib/kde4/${i}
+ fi
 done
 
-# Remove the sound links
-cd /Programs/${1}/share/config.kcfg/
+cd /Programs/${PROGDIR}/share/icons/16x16/actions
 for i in `ls`
 do
- rm /usr/local/share/config.kcfg/${i}
+ if [ -h "/usr/local/kde4/share/icons/hicolor/16x16/actions/${i}" ]
+ then
+  rm /usr/local/kde4/share/icons/hicolor/16x16/actions/${i}
+ fi
 done
+cd /Programs/${PROGDIR}/share/icons/22x22/actions
+for i in `ls`
+do
+ if [ -h "/usr/local/kde4/share/icons/hicolor/22x22/actions/${i}" ]
+ then
+   rm /usr/local/kde4/share/icons/hicolor/22x22/actions/${i}
+ fi
+done
+cd /Programs/${PROGDIR}/share/icons/32x32/actions
+for i in `ls`
+do
+ if [ -h "/usr/local/kde4/share/icons/hicolor/32x32/actions/${i}" ]
+ then
+   rm /usr/local/kde4/share/icons/hicolor/32x32/actions/${i}
+ fi
+done
+cd /Programs/${PROGDIR}/share/icons/48x48/actions
+for i in `ls`
+do
+ if [ -h "/usr/local/kde4/share/icons/hicolor/48x48/actions/${i}" ]
+ then
+   rm /usr/local/kde4/share/icons/hicolor/48x48/actions/${i}
+ fi
+done
 
+
 # Remove the services links
 cd /Programs/${1}/share/services/
 for i in `ls`
 do
- rm /usr/local/share/services/${i}
+ rm /usr/local/kde4/share/kde4/services/${i}
 done
 
 # Remove the old locale files since we are uninstalling
@@ -56,9 +86,9 @@
   cd /home
   for i in `ls`
   do
-   if [ -e "/home/${i}/.kde/share/apps/ktorrent" ]
+   if [ -e "/home/${i}/.kde4/share/apps/ktorrent" ]
    then
-    rm -rf /home/${i}/.kde/share/apps/ktorrent
+    rm -rf /home/${i}/.kde4/share/apps/ktorrent
    fi
   done
  fi

Modified: pbibuild/modules/ktorrent/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/ktorrent/overlay-dir/PBI.SetupScript.sh	2008-12-09 23:26:21 UTC (rev 3055)
+++ pbibuild/modules/ktorrent/overlay-dir/PBI.SetupScript.sh	2008-12-10 16:31:56 UTC (rev 3056)
@@ -14,35 +14,55 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /Programs/${PROGDIR}/.sbin/ktorrent /usr/local/bin/ktorrent
-ln -s /Programs/${PROGDIR}/share/apps/ktorrent /usr/local/share/apps/ktorrent
-ln -s /Programs/${PROGDIR}/share/servicetypes/ktorrentplugin.desktop /usr/local/share/servicetypes/ktorrentplugin.desktop
-ln -s /Programs/${PROGDIR}/share/applications/kde/ktorrent.desktop /usr/local/share/applications/kde/ktorrent.desktop
-ln -s /Programs/${PROGDIR}/share/icons/128x128/apps/ktorrent.png /usr/local/share/icons/crystalsvg/128x128/apps/ktorrent.png
-ln -s /Programs/${PROGDIR}/share/icons/64x64/apps/ktorrent.png /usr/local/share/icons/crystalsvg/64x64/apps/ktorrent.png
-ln -s /Programs/${PROGDIR}/share/icons/32x32/apps/ktorrent.png /usr/local/share/icons/crystalsvg/32x32/apps/ktorrent.png
-ln -s /Programs/${PROGDIR}/share/icons/16x16/apps/ktorrent.png /usr/local/share/icons/crystalsvg/16x16/apps/ktorrent.png
+ln -s /Programs/${PROGDIR}/.sbin/ktorrent /usr/local/kde4/bin/ktorrent
+ln -s /Programs/${PROGDIR}/share/apps/ktorrent /usr/local/kde4/share/apps/ktorrent
+ln -s /Programs/${PROGDIR}/share/servicetypes/ktorrentplugin.desktop /usr/local/kde4/share/kde4/servicetypes/ktorrentplugin.desktop
+ln -s /Programs/${PROGDIR}/share/applications/kde/ktorrent.desktop /usr/local/kde4/share/applications/kde4/ktorrent.desktop
+ln -s /Programs/${PROGDIR}/share/icons/128x128/apps/ktorrent.png /usr/local/kde4/share/icons/hicolor/128x128/apps/ktorrent.png
+ln -s /Programs/${PROGDIR}/share/icons/64x64/apps/ktorrent.png /usr/local/kde4/share/icons/hicolor/64x64/apps/ktorrent.png
+ln -s /Programs/${PROGDIR}/share/icons/32x32/apps/ktorrent.png /usr/local/kde4/share/icons/hicolor/32x32/apps/ktorrent.png
+ln -s /Programs/${PROGDIR}/share/icons/16x16/apps/ktorrent.png /usr/local/kde4/share/icons/hicolor/16x16/apps/ktorrent.png
 
 # Make links for services
-cd /Programs/${PROGDIR}/autolibs/kde3/
-for i in `ls`
+cd /Programs/${PROGDIR}/autolibs/kde4/
+for i in `ls kt*`
 do
  # Link the services now
- ln -s /Programs/${PROGDIR}/autolibs/kde3/${i} /usr/local/lib/kde3/${i}
+ ln -s /Programs/${PROGDIR}/autolibs/kde4/${i} /usr/local/kde4/lib/kde4/${i}
 done
 
-# Make links for config.kcfg files
-cd /Programs/${PROGDIR}/share/config.kcfg/
+# Make links for icons
+cd /Programs/${PROGDIR}/share/icons/16x16/actions
 for i in `ls`
 do
- ln -s /Programs/${PROGDIR}/share/config.kcfg/${i} /usr/local/share/config.kcfg/${i}
+ ln -s /Programs/${PROGDIR}/share/icons/16x16/actions/${i} /usr/local/kde4/share/icons/hicolor/16x16/actions/${i}
 done
 
+cd /Programs/${PROGDIR}/share/icons/22x22/actions
+for i in `ls`
+do
+ ln -s /Programs/${PROGDIR}/share/icons/22x22/actions/${i} /usr/local/kde4/share/icons/hicolor/22x22/actions/${i}
+done
+
+cd /Programs/${PROGDIR}/share/icons/32x32/actions
+for i in `ls`
+do
+ ln -s /Programs/${PROGDIR}/share/icons/32x32/actions/${i} /usr/local/kde4/share/icons/hicolor/32x32/actions/${i}
+done
+
+cd /Programs/${PROGDIR}/share/icons/48x48/actions
+for i in `ls`
+do
+ ln -s /Programs/${PROGDIR}/share/icons/48x48/actions/${i} /usr/local/kde4/share/icons/hicolor/48x48/actions/${i}
+done
+
+
+
 # Make links for services files
 cd /Programs/${PROGDIR}/share/services/
 for i in `ls`
 do
- ln -s /Programs/${PROGDIR}/share/services/${i} /usr/local/share/services/${i}
+ ln -s /Programs/${PROGDIR}/share/services/${i} /usr/local/kde4/share/kde4/services/${i}
 done
 
 
@@ -56,6 +76,6 @@
 done
 
 
-echo "LAUNCHCLOSE: /usr/local/bin/ktorrent"
+echo "LAUNCHCLOSE: /usr/local/kde4/bin/ktorrent"
 
 

Modified: pbibuild/modules/ktorrent/pbi.conf
===================================================================
--- pbibuild/modules/ktorrent/pbi.conf	2008-12-09 23:26:21 UTC (rev 3055)
+++ pbibuild/modules/ktorrent/pbi.conf	2008-12-10 16:31:56 UTC (rev 3056)
@@ -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="13"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY



More information about the Commits mailing list