[PC-BSD Commits] r3319 - in pbibuild/modules/limewire: . overlay-dir

svn at pcbsd.org svn at pcbsd.org
Thu Jan 22 12:51:56 PST 2009


Author: kris
Date: 2009-01-22 12:51:56 -0800 (Thu, 22 Jan 2009)
New Revision: 3319

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

Updated limewire, now 100% self-contained



Modified: pbibuild/modules/limewire/build.sh
===================================================================
--- pbibuild/modules/limewire/build.sh	2009-01-22 20:40:45 UTC (rev 3318)
+++ pbibuild/modules/limewire/build.sh	2009-01-22 20:51:56 UTC (rev 3319)
@@ -9,3 +9,10 @@
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
 
+
+# Copy over only the JRE portion
+cp -R /usr/local/diablo*jdk*/jre ${PBIDIR}/diablo-jre1.6.0
+
+# Make the javavms file
+echo "/Programs/LimeWire${PORTVER}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
+

Modified: pbibuild/modules/limewire/copy-files
===================================================================
--- pbibuild/modules/limewire/copy-files	2009-01-22 20:40:45 UTC (rev 3318)
+++ pbibuild/modules/limewire/copy-files	2009-01-22 20:51:56 UTC (rev 3319)
@@ -1,2 +1,5 @@
 /usr/local/bin/limewire bin/
-/usr/local/share/java/limewire share/
+/usr/local/share/java/limewire share/java/
+/usr/local/bin/java* bin/
+/usr/local/bin/classpath bin/
+/usr/local/etc/java* etc/

Modified: pbibuild/modules/limewire/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/limewire/overlay-dir/PBI.FirstRun.sh	2009-01-22 20:40:45 UTC (rev 3318)
+++ pbibuild/modules/limewire/overlay-dir/PBI.FirstRun.sh	2009-01-22 20:51:56 UTC (rev 3319)
@@ -12,16 +12,3 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-INSTALLED=`ls /Programs | grep LimeWire`
-if [ $? = 0 ]
-then
-	kdialog --msgbox "Please remove the previous version of LimeWire first"
-	exit 2
-fi
-
-if [ ! -e "/usr/local/bin/java" ]
-then
-	kdialog --error "Error: LimeWire requires Java to run. Please install Java from www.pbidir.com before installing LimeWire."
-	exit 2
-fi
-

Modified: pbibuild/modules/limewire/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/limewire/overlay-dir/PBI.RemoveScript.sh	2009-01-22 20:40:45 UTC (rev 3318)
+++ pbibuild/modules/limewire/overlay-dir/PBI.RemoveScript.sh	2009-01-22 20:51:56 UTC (rev 3319)
@@ -7,8 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /usr/local/bin/limewire
-rm /usr/local/share/java/limewire
 
 if [ ! -z "$DISPLAY" ]
 then

Modified: pbibuild/modules/limewire/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/limewire/overlay-dir/PBI.SetupScript.sh	2009-01-22 20:40:45 UTC (rev 3318)
+++ pbibuild/modules/limewire/overlay-dir/PBI.SetupScript.sh	2009-01-22 20:51:56 UTC (rev 3319)
@@ -12,9 +12,13 @@
 # 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
 
-ln -s /Programs/${PROGDIR}/share/limewire /usr/local/share/java/limewire
-ln -s /Programs/${PROGDIR}/bin/limewire /usr/local/bin/limewire
 
-echo "LAUNCHCLOSE: /usr/local/bin/limewire"
+echo "LAUNCHCLOSE: /Programs/bin/limewire"

Modified: pbibuild/modules/limewire/pbi.conf
===================================================================
--- pbibuild/modules/limewire/pbi.conf	2009-01-22 20:40:45 UTC (rev 3318)
+++ pbibuild/modules/limewire/pbi.conf	2009-01-22 20:51:56 UTC (rev 3319)
@@ -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="32"
+BUILDKEY="01"
 
 # If this port has a non-standard port version variable in Makefile, then
 # list the key here such as "OOOVERSION="

Modified: pbibuild/modules/limewire/preportmake.sh
===================================================================
--- pbibuild/modules/limewire/preportmake.sh	2009-01-22 20:40:45 UTC (rev 3318)
+++ pbibuild/modules/limewire/preportmake.sh	2009-01-22 20:51:56 UTC (rev 3319)
@@ -2,13 +2,17 @@
 # Script to grab the java files and place them in the right directory
 # before starting the build
 
-mkdir -p /usr/ports/distfiles
 cd /usr/ports/distfiles
 
+# Get the Java files / patchset
+fetch http://www.pcbsd.org/~kris/autobuildpkgs/bsd-jdk16-patches-4.tar.bz2
+fetch http://www.pcbsd.org/~kris/autobuildpkgs/jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar
+fetch http://www.pcbsd.org/~kris/autobuildpkgs/jdk-6u3-fcs-bin-b05-jrl-24_sep_2007.jar
+fetch http://www.pcbsd.org/~kris/autobuildpkgs/jdk-6u3-fcs-mozilla_headers-b05-unix-24_sep_2007.jar
+
 ARCH="`uname -p`"
 if [ "$ARCH" = "i386" ]
 then
-  # Get the diablo-caffe file
   fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-caffe-freebsd6-i386-1.6.0_07-b02.tar.bz2
   fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-caffe-freebsd7-i386-1.6.0_07-b02.tar.bz2
 fi
@@ -21,15 +25,16 @@
 fi
 
 
+
 # Get the tzupdater files
-fetch http://www.pcbsd.org/~kris/autobuildpkgs/jdk-1_5_0_14-fcs-src-b03-jrl-05_oct_2007.jar
-fetch http://www.pcbsd.org/~kris/autobuildpkgs/jdk-1_5_0_14-fcs-bin-b03-jrl-05_oct_2007.jar
 fetch http://www.pcbsd.org/~kris/autobuildpkgs/tzupdater-1_3_11-2008i.zip
 
 cd /usr/ports/java/jdk16/
 echo "#!/bin/sh
 exit 0" > /usr/ports/java/jdk16/files/license.sh
 
+cd /usr/ports/java/diablo-jre16
+make install
+
 cd /usr/ports/devel/automake15
 make install clean
-



More information about the Commits mailing list