[PC-BSD Commits] r3719 - in pbibuild/modules: javajdk javajdk16 javajre javajre16 limewire vuze

svn at pcbsd.org svn at pcbsd.org
Tue Mar 31 16:01:42 PST 2009


Author: kris
Date: 2009-03-31 17:01:42 -0700 (Tue, 31 Mar 2009)
New Revision: 3719

Modified:
   pbibuild/modules/javajdk/preportmake.sh
   pbibuild/modules/javajdk16/preportmake.sh
   pbibuild/modules/javajre/preportmake.sh
   pbibuild/modules/javajre16/preportmake.sh
   pbibuild/modules/limewire/preportmake.sh
   pbibuild/modules/vuze/preportmake.sh
Log:

Updated the java and related ports to download the javapack.tbz, which contains all the java dist files. Now I won't need to update each preportmake.sh every time java comes out with some new file



Modified: pbibuild/modules/javajdk/preportmake.sh
===================================================================
--- pbibuild/modules/javajdk/preportmake.sh	2009-03-31 22:58:36 UTC (rev 3718)
+++ pbibuild/modules/javajdk/preportmake.sh	2009-04-01 00:01:42 UTC (rev 3719)
@@ -5,21 +5,8 @@
 mkdir -p /usr/ports/distfiles
 cd /usr/ports/distfiles
 
-ARCH="`uname -p`"
-if [ "$ARCH" = "i386" ]
-then
-  # Get the diablo-caffe file
-  fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2
-fi
+fetch http://www.pcbsd.org/~kris/autobuildpkgs/javapack.tbz
+tar xvjf javapack.tbz
 
-if [ "$ARCH" = "amd64" ]
-then
-  # Get the diablo-caffe file
-  fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-caffe-freebsd6-amd64-1.5.0_07-b01.tar.bz2
-fi
-
-# Get the tzupdater files
-fetch http://www.pcbsd.org/~kris/autobuildpkgs/tzupdater-1_3_11-2008i.zip
-
 cd /usr/ports/devel/automake15
 make install clean

Modified: pbibuild/modules/javajdk16/preportmake.sh
===================================================================
--- pbibuild/modules/javajdk16/preportmake.sh	2009-03-31 22:58:36 UTC (rev 3718)
+++ pbibuild/modules/javajdk16/preportmake.sh	2009-04-01 00:01:42 UTC (rev 3719)
@@ -5,34 +5,9 @@
 mkdir -p /usr/ports/distfiles
 cd /usr/ports/distfiles
 
-ARCH="`uname -p`"
-if [ "$ARCH" = "i386" ]
-then
-  # Get the diablo-caffe file
-  # 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
-  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
+fetch http://www.pcbsd.org/~kris/autobuildpkgs/javapack.tbz
+tar xvjf javapack.tbz
 
-if [ "$ARCH" = "amd64" ]
-then
-  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
-  fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-caffe-freebsd6-amd64-1.6.0_07-b02.tar.bz2
-  fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-caffe-freebsd7-amd64-1.6.0_07-b02.tar.bz2
-fi
-
-# Get the tzupdater files
-fetch http://www.pcbsd.org/~kris/autobuildpkgs/tzupdater-1_3_11-2008i.zip
-
-pkg_add -r perl
-
 cd /usr/ports/java/jdk16/
 echo "#!/bin/sh
 exit 0" > /usr/ports/java/jdk16/files/license.sh

Modified: pbibuild/modules/javajre/preportmake.sh
===================================================================
--- pbibuild/modules/javajre/preportmake.sh	2009-03-31 22:58:36 UTC (rev 3718)
+++ pbibuild/modules/javajre/preportmake.sh	2009-04-01 00:01:42 UTC (rev 3719)
@@ -5,22 +5,8 @@
 mkdir -p /usr/ports/distfiles
 cd /usr/ports/distfiles
 
-ARCH="`uname -p`"
-if [ "$ARCH" = "i386" ]
-then
-  # Get the diablo-latte file
-  fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-latte-freebsd6-i386-1.5.0_07-b01.tar.bz2
-fi
+fetch http://www.pcbsd.org/~kris/autobuildpkgs/javapack.tbz
+tar xvjf javapack.tbz
 
-if [ "$ARCH" = "amd64" ]
-then
-  # Get the diablo-caffe file
-  fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-latte-freebsd6-amd64-1.5.0_07-b01.tar.bz2
-fi
-
-
-# Get the tzupdater files
-fetch http://www.pcbsd.org/~kris/autobuildpkgs/tzupdater-1_3_11-2008i.zip
-
 cd /usr/ports/devel/automake15
 make install clean

Modified: pbibuild/modules/javajre16/preportmake.sh
===================================================================
--- pbibuild/modules/javajre16/preportmake.sh	2009-03-31 22:58:36 UTC (rev 3718)
+++ pbibuild/modules/javajre16/preportmake.sh	2009-04-01 00:01:42 UTC (rev 3719)
@@ -4,33 +4,9 @@
 
 cd /usr/ports/distfiles
 
-ARCH="`uname -p`"
-if [ "$ARCH" = "i386" ]
-then
-  # Get the diablo-caffe file
-  # 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
-  fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-latte-freebsd6-i386-1.6.0_07-b02.tar.bz2
-  fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-latte-freebsd7-i386-1.6.0_07-b02.tar.bz2
-fi
+fetch http://www.pcbsd.org/~kris/autobuildpkgs/javapack.tbz
+tar xvjf javapack.tbz
 
-if [ "$ARCH" = "amd64" ]
-then
-  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
-  fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-latte-freebsd6-i386-1.6.0_07-b02.tar.bz2
-  fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-latte-freebsd6-amd64-1.6.0_07-b02.tar.bz2
-  fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-latte-freebsd7-amd64-1.6.0_07-b02.tar.bz2
-fi
-
-# Get the tzupdater files
-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

Modified: pbibuild/modules/limewire/preportmake.sh
===================================================================
--- pbibuild/modules/limewire/preportmake.sh	2009-03-31 22:58:36 UTC (rev 3718)
+++ pbibuild/modules/limewire/preportmake.sh	2009-04-01 00:01:42 UTC (rev 3719)
@@ -4,31 +4,9 @@
 
 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
+fetch http://www.pcbsd.org/~kris/autobuildpkgs/javapack.tbz
+tar xvjf javapack.tbz
 
-ARCH="`uname -p`"
-if [ "$ARCH" = "i386" ]
-then
-  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
-
-if [ "$ARCH" = "amd64" ]
-then
-  # Get the diablo-caffe file
-  fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-caffe-freebsd6-amd64-1.6.0_07-b02.tar.bz2
-  fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-caffe-freebsd7-amd64-1.6.0_07-b02.tar.bz2
-fi
-
-
-
-# Get the tzupdater files
-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

Modified: pbibuild/modules/vuze/preportmake.sh
===================================================================
--- pbibuild/modules/vuze/preportmake.sh	2009-03-31 22:58:36 UTC (rev 3718)
+++ pbibuild/modules/vuze/preportmake.sh	2009-04-01 00:01:42 UTC (rev 3719)
@@ -4,31 +4,9 @@
 
 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
+fetch http://www.pcbsd.org/~kris/autobuildpkgs/javapack.tbz
+tar xvjf javapack.tbz
 
-ARCH="`uname -p`"
-if [ "$ARCH" = "i386" ]
-then
-  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
-
-if [ "$ARCH" = "amd64" ]
-then
-  # Get the diablo-caffe file
-  fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-caffe-freebsd6-amd64-1.6.0_07-b02.tar.bz2
-  fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-caffe-freebsd7-amd64-1.6.0_07-b02.tar.bz2
-fi
-
-
-
-# Get the tzupdater files
-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



More information about the Commits mailing list