[PC-BSD Commits] r3406 - in pbibuild/modules/ktorrent: . overlay-dir

svn at pcbsd.org svn at pcbsd.org
Tue Feb 3 07:28:55 PST 2009


Author: kris
Date: 2009-02-03 07:28:54 -0800 (Tue, 03 Feb 2009)
New Revision: 3406

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

Updated ktorrent, now 100% self-contained



Modified: pbibuild/modules/ktorrent/build.sh
===================================================================
--- pbibuild/modules/ktorrent/build.sh	2009-02-03 15:21:12 UTC (rev 3405)
+++ pbibuild/modules/ktorrent/build.sh	2009-02-03 15:28:54 UTC (rev 3406)
@@ -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="ktorrent.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/ktorrent/copy-files
===================================================================
--- pbibuild/modules/ktorrent/copy-files	2009-02-03 15:21:12 UTC (rev 3405)
+++ pbibuild/modules/ktorrent/copy-files	2009-02-03 15:28:54 UTC (rev 3406)
@@ -1,11 +1,13 @@
 /usr/local/kde4/bin/ktorrent bin/
 /usr/local/kde4/bin/ktupnp* bin/
-/usr/local/kde4/share/icons/hicolor kde4/share/icons/
-/usr/local/kde4/share/apps/ktorrent kde4/share/apps/
-/usr/local/kde4/share/applications/kde/ktorrent.desktop kde4/share/applications/kde/
-/usr/local/kde4/share/kde4/services kde4/share/
-/usr/local/kde4/share/kde4/servicetypes kde4/share/
+/usr/local/kde4/share/applications/kde/ktorrent.desktop share/applications/kde/
 /usr/local/kde4/lib/libktc* autolibs/
 /usr/local/kde4/lib/libbt* autolibs/
 /usr/local/kde4/lib/libktu* autolibs/
-/usr/local/kde4/lib/kde4 kde4/lib/
+/usr/local/kde4/lib kde4/
+/usr/local/kde4/share/apps kde4/share/
+/usr/local/kde4/share/config kde4/share/
+/usr/local/kde4/share/config.kcfg kde4/share/
+/usr/local/kde4/share/services kde4/share/
+/usr/local/kde4/share/servicetypes kde4/share/
+/usr/local/kde4/share/icons kde4/share/

Modified: pbibuild/modules/ktorrent/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/ktorrent/overlay-dir/PBI.FirstRun.sh	2009-02-03 15:21:12 UTC (rev 3405)
+++ pbibuild/modules/ktorrent/overlay-dir/PBI.FirstRun.sh	2009-02-03 15:28:54 UTC (rev 3406)
@@ -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/ktorrent" ]
-then
-    # Looks like ktorrent is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/ktorrent | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "KTorrent is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        KT="`ls -al /usr/local/bin/ktorrent | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $KT | grep KTorrent 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${KT}
-        else
-          kdialog --sorry "KTorrent could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "Ktorrent 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 "KTorrent is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 

Modified: pbibuild/modules/ktorrent/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/ktorrent/overlay-dir/PBI.RemoveScript.sh	2009-02-03 15:21:12 UTC (rev 3405)
+++ pbibuild/modules/ktorrent/overlay-dir/PBI.RemoveScript.sh	2009-02-03 15:28:54 UTC (rev 3406)
@@ -7,76 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-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/kde4/
-for i in `ls`
-do
- if [ -h "/usr/local/kde4/lib/kde4/${i}" ]
- then
-   rm /usr/local/kde4/lib/kde4/${i}
- fi
-done
-
-cd /Programs/${PROGDIR}/share/icons/16x16/actions
-for i in `ls`
-do
- 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/kde4/share/kde4/services/${i}
-done
-
-# Remove the old locale files since we are uninstalling
-LANGFILE="ktorrent.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
-
-
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/ktorrent/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/ktorrent/overlay-dir/PBI.SetupScript.sh	2009-02-03 15:21:12 UTC (rev 3405)
+++ pbibuild/modules/ktorrent/overlay-dir/PBI.SetupScript.sh	2009-02-03 15:28:54 UTC (rev 3406)
@@ -14,68 +14,13 @@
 # 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/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/kde4/
-for i in `ls kt*`
-do
- # Link the services now
- ln -s /Programs/${PROGDIR}/autolibs/kde4/${i} /usr/local/kde4/lib/kde4/${i}
-done
+# 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
 
-# Make links for icons
-cd /Programs/${PROGDIR}/share/icons/16x16/actions
-for i in `ls`
-do
- 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/kde4/share/kde4/services/${i}
-done
-
-
-# Copy over all the LANG files
-LANGFILE="ktorrent.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/kde4/bin/ktorrent"
-
-
+echo "LAUNCHCLOSE: /Programs/bin/ktorrent"

Modified: pbibuild/modules/ktorrent/pbi.conf
===================================================================
--- pbibuild/modules/ktorrent/pbi.conf	2009-02-03 15:21:12 UTC (rev 3405)
+++ pbibuild/modules/ktorrent/pbi.conf	2009-02-03 15:28:54 UTC (rev 3406)
@@ -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="01"
+BUILDKEY="15"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY



More information about the Commits mailing list