[PC-BSD Commits] r3246 - in pbibuild/modules/deluge: . overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2009-01-13 17:21:56 -0800 (Tue, 13 Jan 2009)
New Revision: 3246

Modified:
   pbibuild/modules/deluge/build.sh
   pbibuild/modules/deluge/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/deluge/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/deluge/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/deluge/pbi.conf
   pbibuild/modules/deluge/preportmake.sh
Log:

Updated deluge, now 100% self-contained



Modified: pbibuild/modules/deluge/build.sh
===================================================================
--- pbibuild/modules/deluge/build.sh	2009-01-13 23:09:52 UTC (rev 3245)
+++ pbibuild/modules/deluge/build.sh	2009-01-14 01:21:56 UTC (rev 3246)
@@ -14,13 +14,7 @@
 mv /tmp/deluge.sh ${PBIDIR}/bin/deluge.sh
 chmod 755 ${PBIDIR}/bin/deluge.sh
 
-sed 's|/usr/local/bin|/Programs/Deluge/bin|g' ${PBIDIR}/bin/deluge >/tmp/deluge
+sed 's|/usr/local/bin|/Programs/Deluge${PORTVER}/bin|g' ${PBIDIR}/bin/deluge >/tmp/deluge
 mv /tmp/deluge ${PBIDIR}/bin/deluge
 chmod 755 ${PBIDIR}/bin/deluge
 
-cd /usr/local/share/locale/
-for l in `ls`
-do
-  mkdir -p ${PBIDIR}/share/locale/${l}/LC_MESSAGES
-  cp -fR /usr/local/share/locale/${l}/LC_MESSAGES/deluge.mo ${PBIDIR}/share/locale/${l}/LC_MESSAGES/deluge.mo
-done

Modified: pbibuild/modules/deluge/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/deluge/overlay-dir/PBI.FirstRun.sh	2009-01-13 23:09:52 UTC (rev 3245)
+++ pbibuild/modules/deluge/overlay-dir/PBI.FirstRun.sh	2009-01-14 01:21:56 UTC (rev 3246)
@@ -1,7 +1 @@
 #!/bin/sh
-
-if [ -e "/usr/local/bin/deluge" ]
-then
-	kdialog --msgbox "Please remove the previous version of Deluge first"
-	exit 2
-fi
\ No newline at end of file

Modified: pbibuild/modules/deluge/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/deluge/overlay-dir/PBI.RemoveScript.sh	2009-01-13 23:09:52 UTC (rev 3245)
+++ pbibuild/modules/deluge/overlay-dir/PBI.RemoveScript.sh	2009-01-14 01:21:56 UTC (rev 3246)
@@ -6,10 +6,3 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/deluge
-rm -rR /Programs/Deluge
-#rm -fR /usr/local/share/deluge
-#rm -fR /usr/local/share/doc/deluge
-#rm -fR /usr/local/share/icons/hicolor/*/apps/deluge.png
-rm -fR /usr/local/share/locale/*/LC_MESSAGES/deluge.mo
-#rm -fR /usr/local/share/pixmaps/deluge.png

Modified: pbibuild/modules/deluge/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/deluge/overlay-dir/PBI.SetupScript.sh	2009-01-13 23:09:52 UTC (rev 3245)
+++ pbibuild/modules/deluge/overlay-dir/PBI.SetupScript.sh	2009-01-14 01:21:56 UTC (rev 3246)
@@ -14,14 +14,14 @@
 # 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/deluge.sh /usr/local/bin/deluge
-ln -fs /Programs/${PROGDIR} /Programs/Deluge
-ln -s /Programs/${PROGDIR}/share/pixmaps/deluge.png /usr/local/share/pixmaps/deluge.png
 
-cd /Programs/${PROGDIR}/share/locale/
-for l in `ls`
-do
-  cp /Programs/${PROGDIR}/share/locale/${l}/LC_MESSAGES/deluge.mo /usr/local/share/locale/${l}/LC_MESSAGES/deluge.mo
-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
 
-echo "LAUNCHCLOSE: /usr/local/bin/deluge"
+
+echo "LAUNCHCLOSE: /Programs/bin/deluge.sh"

Modified: pbibuild/modules/deluge/pbi.conf
===================================================================
--- pbibuild/modules/deluge/pbi.conf	2009-01-13 23:09:52 UTC (rev 3245)
+++ pbibuild/modules/deluge/pbi.conf	2009-01-14 01:21:56 UTC (rev 3246)
@@ -25,10 +25,10 @@
 PBIUPDATE="http://update.pbidir.com"
 
 # Other Ports we need built (One per line)
-OTHERPORT=""
+OTHERPORT="/usr/ports/x11-themes/qtcurve-gtk2"
 
 # Enter your custom make options here
-MAKEOPTS="PREFIX=/Programs/Deluge"
+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

Modified: pbibuild/modules/deluge/preportmake.sh
===================================================================
--- pbibuild/modules/deluge/preportmake.sh	2009-01-13 23:09:52 UTC (rev 3245)
+++ pbibuild/modules/deluge/preportmake.sh	2009-01-14 01:21:56 UTC (rev 3246)
@@ -1,8 +1,2 @@
 #!/bin/sh
 
-# Remove any /Programs/BMPx link, and recreate it, so we can use PREFIX
-# in our make.conf properly
-rm -rf /Programs/Deluge
-mkdir /Programs
-ln -s /usr/local /Programs/Deluge
-