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

svn at pcbsd.org svn at pcbsd.org
Tue Dec 2 09:34:16 PST 2008


Author: kris
Date: 2008-12-02 09:34:16 -0800 (Tue, 02 Dec 2008)
New Revision: 3028

Added:
   pbibuild/modules/deluge/preportmake.sh
Removed:
   pbibuild/modules/deluge/overlay-dir/lib/
Modified:
   pbibuild/modules/deluge/build.sh
   pbibuild/modules/deluge/copy-files
   pbibuild/modules/deluge/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/deluge/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/deluge/pbi.conf
Log:

Updated Deluge to make it build + run properly



Modified: pbibuild/modules/deluge/build.sh
===================================================================
--- pbibuild/modules/deluge/build.sh	2008-12-02 15:20:11 UTC (rev 3027)
+++ pbibuild/modules/deluge/build.sh	2008-12-02 17:34:16 UTC (rev 3028)
@@ -14,16 +14,13 @@
 mv /tmp/deluge.sh ${PBIDIR}/bin/deluge.sh
 chmod 755 ${PBIDIR}/bin/deluge.sh
 
-cd /usr/local/share/icons/hicolor/
-for i in `ls`
-do
-  mkdir ${PBIDIR}/share/icons/hicolor/${i}
-  cp -fR /usr/local/share/icons/hicolor/${i}/apps/deluge.png ${PBIDIR}/share/icons/hicolor/${i}/apps/deluge.png
-done
+sed 's|/usr/local/bin|/Programs/Deluge/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 ${PBIDIR}/share/locale/${l}
+  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/copy-files
===================================================================
--- pbibuild/modules/deluge/copy-files	2008-12-02 15:20:11 UTC (rev 3027)
+++ pbibuild/modules/deluge/copy-files	2008-12-02 17:34:16 UTC (rev 3028)
@@ -1,4 +1,15 @@
 /usr/local/bin/deluge bin/
+/usr/local/bin/py* bin/
 /usr/local/share/deluge share/
-/usr/local/lib/python2.5/site-packages lib/python2.5/
+/usr/local/lib/*svg* autolibs/
+/usr/local/lib/*gtk* autolibs/
+/usr/local/lib/*pango* autolibs/
+/usr/local/lib/*dbus* autolibs/
+/usr/local/lib/libg* autolibs/
+/usr/local/lib/libp* autolibs/
+/usr/local/lib/libc* autolibs/
+/usr/local/lib/libx* autolibs/
+/usr/local/etc ./
+/usr/local/lib/python2.5 autolibs/
 /usr/local/share/doc/deluge share/doc/
+/usr/local/share/icons/hicolor share/icons

Modified: pbibuild/modules/deluge/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/deluge/overlay-dir/PBI.RemoveScript.sh	2008-12-02 15:20:11 UTC (rev 3027)
+++ pbibuild/modules/deluge/overlay-dir/PBI.RemoveScript.sh	2008-12-02 17:34:16 UTC (rev 3028)
@@ -7,8 +7,9 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 rm -fR /usr/local/bin/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 -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
+#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	2008-12-02 15:20:11 UTC (rev 3027)
+++ pbibuild/modules/deluge/overlay-dir/PBI.SetupScript.sh	2008-12-02 17:34:16 UTC (rev 3028)
@@ -15,20 +15,13 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 ln -s /Programs/${PROGDIR}/.sbin/deluge.sh /usr/local/bin/deluge
-ln -s /Programs/${PROGDIR}/share/deluge /usr/local/share/deluge
+ln -fs /Programs/${PROGDIR} /Programs/Deluge
 ln -s /Programs/${PROGDIR}/share/pixmaps/deluge.png /usr/local/share/pixmaps/deluge.png
-ln -s /Programs/${PROGDIR}/share/doc/deluge /usr/local/share/doc/deluge
 
-cd /Programs/${PROGDIR}/share/icons/hicolor/
-for i in `ls`
-do
-   ln -s /Programs/${PROGDIR}/share/icons/hicolor/${i}/apps/deluge.png /usr/local/share/icons/hicolor/${i}/apps/deluge.png
-done
-
 cd /Programs/${PROGDIR}/share/locale/
 for l in `ls`
 do
-  ln -s /Programs/${PROGDIR}/share/locale/${l}/LC_MESSAGES/deluge.mo /usr/local/share/locale/${l}/LC_MESSAGES/deluge.mo
+  cp /Programs/${PROGDIR}/share/locale/${l}/LC_MESSAGES/deluge.mo /usr/local/share/locale/${l}/LC_MESSAGES/deluge.mo
 done
 
 echo "LAUNCHCLOSE: /usr/local/bin/deluge"

Modified: pbibuild/modules/deluge/pbi.conf
===================================================================
--- pbibuild/modules/deluge/pbi.conf	2008-12-02 15:20:11 UTC (rev 3027)
+++ pbibuild/modules/deluge/pbi.conf	2008-12-02 17:34:16 UTC (rev 3028)
@@ -28,7 +28,7 @@
 OTHERPORT=""
 
 # Enter your custom make options here
-MAKEOPTS=""
+MAKEOPTS="PREFIX=/Programs/Deluge"
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver


Property changes on: pbibuild/modules/deluge/preportmake.sh
___________________________________________________________________
Added: svn:executable
   + *



More information about the Commits mailing list