[PC-BSD Commits] r3245 - in pbibuild/modules: amule amule/kmenu-dir amule/overlay-dir armagetron armagetron/overlay-dir deluge/overlay-dir qemu qemu/overlay-dir

svn at pcbsd.org svn at pcbsd.org
Tue Jan 13 15:09:52 PST 2009


Author: kris
Date: 2009-01-13 15:09:52 -0800 (Tue, 13 Jan 2009)
New Revision: 3245

Added:
   pbibuild/modules/amule/overlay-dir/amule.png
Removed:
   pbibuild/modules/deluge/overlay-dir/lib
Modified:
   pbibuild/modules/amule/kmenu-dir/amule
   pbibuild/modules/amule/pbi.conf
   pbibuild/modules/armagetron/copy-files
   pbibuild/modules/armagetron/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/armagetron/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/armagetron/pbi.conf
   pbibuild/modules/qemu/copy-files
   pbibuild/modules/qemu/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/qemu/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/qemu/pbi.conf
Log:

Updated qemu, armagetron, to be 100% self-contained, also removed a libdir link in deluge, and added a amule icon




Modified: pbibuild/modules/amule/kmenu-dir/amule
===================================================================
--- pbibuild/modules/amule/kmenu-dir/amule	2009-01-13 20:30:45 UTC (rev 3244)
+++ pbibuild/modules/amule/kmenu-dir/amule	2009-01-13 23:09:52 UTC (rev 3245)
@@ -1,5 +1,5 @@
 ExePath: bin/amule
-ExeIcon: share/pixmaps/amule.xpm
+ExeIcon: amule.png
 ExeDescr: aMule
 ExeNoDesktop: 0
 ExeNoMenu: 0


Property changes on: pbibuild/modules/amule/overlay-dir/amule.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: pbibuild/modules/amule/pbi.conf
===================================================================
--- pbibuild/modules/amule/pbi.conf	2009-01-13 20:30:45 UTC (rev 3244)
+++ pbibuild/modules/amule/pbi.conf	2009-01-13 23:09:52 UTC (rev 3245)
@@ -13,7 +13,7 @@
 PROGAUTHOR="aMule Team"
 
 # Default Icon (Relative to overlay-dir)
-PROGICON="share/pixmaps/amule.xpm"
+PROGICON="amule.png"
 
 # Port we want to build
 PBIPORT="/usr/ports/net-p2p/amule2"

Modified: pbibuild/modules/armagetron/copy-files
===================================================================
--- pbibuild/modules/armagetron/copy-files	2009-01-13 20:30:45 UTC (rev 3244)
+++ pbibuild/modules/armagetron/copy-files	2009-01-13 23:09:52 UTC (rev 3245)
@@ -1,7 +1,6 @@
 /usr/local/bin/armagetronad bin/
 /usr/local/bin/armagetronad-stat bin/
 /usr/local/etc/armagetronad etc/
-/usr/local/share/armagetron share/
 /usr/local/lib/libGL.so.1 autolibs/
 /usr/local/lib/libGLU.so.1 autolibs/
 /usr/local/lib/libSDL.so.11 autolibs/
@@ -17,4 +16,6 @@
 /usr/local/lib/libvga.so.1 autolibs/
 /usr/local/lib/libaa.so.1 autolibs/
 /usr/local/lib/libdrm.so.2 autolibs/
-/usr/local/lib/libjpeg.so.9 autolibs/
\ No newline at end of file
+/usr/local/lib/libjpeg.so.9 autolibs/
+/usr/local/share/games share/
+/usr/local/etc/games etc/

Modified: pbibuild/modules/armagetron/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/armagetron/overlay-dir/PBI.RemoveScript.sh	2009-01-13 20:30:45 UTC (rev 3244)
+++ pbibuild/modules/armagetron/overlay-dir/PBI.RemoveScript.sh	2009-01-13 23:09:52 UTC (rev 3245)
@@ -6,10 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/armagetronad
-rm -fR /usr/local/bin/armagetronad-stat
-rm -fR /usr/local/etc/armagetronad
-rm -fR /usr/local/share/armagetron
 
 if [ ! -z "$DISPLAY" ]
 then

Modified: pbibuild/modules/armagetron/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/armagetron/overlay-dir/PBI.SetupScript.sh	2009-01-13 20:30:45 UTC (rev 3244)
+++ pbibuild/modules/armagetron/overlay-dir/PBI.SetupScript.sh	2009-01-13 23:09:52 UTC (rev 3245)
@@ -14,9 +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/armagetronad /usr/local/bin/armagetronad
-ln -s /Programs/${PROGDIR}/.sbin/armagetronad-stat /usr/local/bin/armagetronad-stat
-ln -s /Programs/${PROGDIR}/etc/armagetronad /usr/local/etc/armagetronad
-ln -s /Programs/${PROGDIR}/share/armagetron /usr/local/share/armagetron
 
-echo "LAUNCHCLOSE: /usr/local/bin/armagetronad"
+# 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: /Programs/bin/armagetronad"

Modified: pbibuild/modules/armagetron/pbi.conf
===================================================================
--- pbibuild/modules/armagetron/pbi.conf	2009-01-13 20:30:45 UTC (rev 3244)
+++ pbibuild/modules/armagetron/pbi.conf	2009-01-13 23:09:52 UTC (rev 3245)
@@ -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="07"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/qemu/copy-files
===================================================================
--- pbibuild/modules/qemu/copy-files	2009-01-13 20:30:45 UTC (rev 3244)
+++ pbibuild/modules/qemu/copy-files	2009-01-13 23:09:52 UTC (rev 3245)
@@ -7,3 +7,5 @@
 /usr/local/lib/libSD* autolibs/
 /usr/local/lib/libsmpeg* autolibs/
 /boot/modules/kqemu* modules/
+/usr/local/lib/qt4/plugins/imageformats lib/qt4/plugins/imageformats
+/usr/local/etc/qemu* etc/

Modified: pbibuild/modules/qemu/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/qemu/overlay-dir/PBI.RemoveScript.sh	2009-01-13 20:30:45 UTC (rev 3244)
+++ pbibuild/modules/qemu/overlay-dir/PBI.RemoveScript.sh	2009-01-13 23:09:52 UTC (rev 3245)
@@ -7,25 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /usr/local/bin/qemu
-rm /usr/local/bin/aqemu
-rm /usr/local/share/qemu
-rm /usr/local/share/aqemu
-rm /usr/local/bin/qemu-img
-rm /usr/local/bin/qemu-system-arm
-rm /usr/local/bin/qemu-system-cris
-rm /usr/local/bin/qemu-system-m68k
-rm /usr/local/bin/qemu-system-mips
-rm /usr/local/bin/qemu-system-mips64
-rm /usr/local/bin/qemu-system-mips64el
-rm /usr/local/bin/qemu-system-ppc
-rm /usr/local/bin/qemu-system-ppc64
-rm /usr/local/bin/qemu-system-ppcemb
-rm /usr/local/bin/qemu-system-sh4
-rm /usr/local/bin/qemu-system-sh4eb
-rm /usr/local/bin/qemu-system-sparc
-rm /usr/local/bin/qemu-system-x86_64
-
 # Remove the kmod and unload it
 rm /boot/modules/kqemu.ko
 kldunload kqemu

Modified: pbibuild/modules/qemu/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/qemu/overlay-dir/PBI.SetupScript.sh	2009-01-13 20:30:45 UTC (rev 3244)
+++ pbibuild/modules/qemu/overlay-dir/PBI.SetupScript.sh	2009-01-13 23:09:52 UTC (rev 3245)
@@ -12,27 +12,14 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-cd /Programs/${PROGDIR}
+# 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
 
-# Create our qemu links
-ln -s /Programs/${PROGDIR}/share/qemu /usr/local/share/qemu
-ln -s /Programs/${PROGDIR}/share/aqemu /usr/local/share/aqemu
-ln -s /Programs/${PROGDIR}/.sbin/aqemu /usr/local/bin/aqemu
-ln -s /Programs/${PROGDIR}/.sbin/qemu /usr/local/bin/qemu
-ln -s /Programs/${PROGDIR}/.sbin/qemu-img /usr/local/bin/qemu-img
-ln -s /Programs/${PROGDIR}/.sbin/qemu-system-arm /usr/local/bin/qemu-system-arm
-ln -s /Programs/${PROGDIR}/.sbin/qemu-system-cris /usr/local/bin/qemu-system-cris
-ln -s /Programs/${PROGDIR}/.sbin/qemu-system-m68k /usr/local/bin/qemu-system-m68k
-ln -s /Programs/${PROGDIR}/.sbin/qemu-system-mips /usr/local/bin/qemu-system-mips
-ln -s /Programs/${PROGDIR}/.sbin/qemu-system-mips64 /usr/local/bin/qemu-system-mips64
-ln -s /Programs/${PROGDIR}/.sbin/qemu-system-mips64el /usr/local/bin/qemu-system-mips64el
-ln -s /Programs/${PROGDIR}/.sbin/qemu-system-ppc /usr/local/bin/qemu-system-ppc
-ln -s /Programs/${PROGDIR}/.sbin/qemu-system-ppc64 /usr/local/bin/qemu-system-ppc64
-ln -s /Programs/${PROGDIR}/.sbin/qemu-system-ppcemb /usr/local/bin/qemu-system-ppcemb
-ln -s /Programs/${PROGDIR}/.sbin/qemu-system-sh4 /usr/local/bin/qemu-system-sh4
-ln -s /Programs/${PROGDIR}/.sbin/qemu-system-sh4eb /usr/local/bin/qemu-system-sh4eb
-ln -s /Programs/${PROGDIR}/.sbin/qemu-system-sparc /usr/local/bin/qemu-system-sparc
-ln -s /Programs/${PROGDIR}/.sbin/qemu-system-x86_64 /usr/local/bin/qemu-system-x86_64
 
 # Link the kernel module and load it and load aio as well
 ln -s /Programs/${PROGDIR}/modules/kqemu.ko /boot/modules/kqemu.ko
@@ -47,4 +34,4 @@
 mv /tmp/loader.conf /boot/loader.conf
 
 
-echo "LAUNCHCLOSE: /usr/local/bin/aqemu"
+echo "LAUNCHCLOSE: /Programs/bin/aqemu"

Modified: pbibuild/modules/qemu/pbi.conf
===================================================================
--- pbibuild/modules/qemu/pbi.conf	2009-01-13 20:30:45 UTC (rev 3244)
+++ pbibuild/modules/qemu/pbi.conf	2009-01-13 23:09:52 UTC (rev 3245)
@@ -32,7 +32,7 @@
 
 # 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="03"
+BUILDKEY="01"
 
 # If this port has a non-standard port version variable in Makefile, then
 # list the key here such as "OOOVERSION="



More information about the Commits mailing list