[PC-BSD Commits] r3755 - in pbibuild/modules: openoffice-en openoffice3-en

[svn at pcbsd.org]

Author: kris
Date: 2009-04-03 12:59:39 -0700 (Fri, 03 Apr 2009)
New Revision: 3755

Modified:
   pbibuild/modules/openoffice-en/preportmake.sh
   pbibuild/modules/openoffice3-en/preportmake.sh
Log:

Updated OO to use new javapack as well



Modified: pbibuild/modules/openoffice-en/preportmake.sh
===================================================================
--- pbibuild/modules/openoffice-en/preportmake.sh	2009-04-03 19:03:28 UTC (rev 3754)
+++ pbibuild/modules/openoffice-en/preportmake.sh	2009-04-03 19:59:39 UTC (rev 3755)
@@ -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 ftp://ftp.pcbsd.org/pub/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/openoffice3-en/preportmake.sh
===================================================================
--- pbibuild/modules/openoffice3-en/preportmake.sh	2009-04-03 19:03:28 UTC (rev 3754)
+++ pbibuild/modules/openoffice3-en/preportmake.sh	2009-04-03 19:59:39 UTC (rev 3755)
@@ -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 ftp://ftp.pcbsd.org/pub/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