[PC-BSD Commits] r1462 - in pbibuild/modules: javajdk javajre openoffice-en openoffice-i18n

svn at pcbsd.org svn at pcbsd.org
Wed Feb 27 10:19:58 PST 2008


Author: kris
Date: 2008-02-27 10:19:58 -0800 (Wed, 27 Feb 2008)
New Revision: 1462

Modified:
   pbibuild/modules/javajdk/preportmake.sh
   pbibuild/modules/javajre/preportmake.sh
   pbibuild/modules/openoffice-en/preportmake.sh
   pbibuild/modules/openoffice-i18n/preportmake.sh
Log:

Fixed up the java / apps which require java to use amd64 / i386 packages
properly



Modified: pbibuild/modules/javajdk/preportmake.sh
===================================================================
--- pbibuild/modules/javajdk/preportmake.sh	2008-02-27 17:01:32 UTC (rev 1461)
+++ pbibuild/modules/javajdk/preportmake.sh	2008-02-27 18:19:58 UTC (rev 1462)
@@ -5,9 +5,19 @@
 mkdir -p /usr/ports/distfiles
 cd /usr/ports/distfiles
 
-# Get the diablo-caffe file
-fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2
+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
 
+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.3-2007k.zip
 

Modified: pbibuild/modules/javajre/preportmake.sh
===================================================================
--- pbibuild/modules/javajre/preportmake.sh	2008-02-27 17:01:32 UTC (rev 1461)
+++ pbibuild/modules/javajre/preportmake.sh	2008-02-27 18:19:58 UTC (rev 1462)
@@ -5,9 +5,20 @@
 mkdir -p /usr/ports/distfiles
 cd /usr/ports/distfiles
 
-# Get the diablo-caffe file
-fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-latte-freebsd6-i386-1.5.0_07-b01.tar.bz2
+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
 
+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.3-2007k.zip
 

Modified: pbibuild/modules/openoffice-en/preportmake.sh
===================================================================
--- pbibuild/modules/openoffice-en/preportmake.sh	2008-02-27 17:01:32 UTC (rev 1461)
+++ pbibuild/modules/openoffice-en/preportmake.sh	2008-02-27 18:19:58 UTC (rev 1462)
@@ -5,9 +5,19 @@
 mkdir -p /usr/ports/distfiles
 cd /usr/ports/distfiles
 
-# Get the diablo-caffe file
-fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2
+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
 
+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.3-2007k.zip
 

Modified: pbibuild/modules/openoffice-i18n/preportmake.sh
===================================================================
--- pbibuild/modules/openoffice-i18n/preportmake.sh	2008-02-27 17:01:32 UTC (rev 1461)
+++ pbibuild/modules/openoffice-i18n/preportmake.sh	2008-02-27 18:19:58 UTC (rev 1462)
@@ -5,9 +5,20 @@
 mkdir -p /usr/ports/distfiles
 cd /usr/ports/distfiles
 
-# Get the diablo-caffe file
-fetch http://www.pcbsd.org/~kris/autobuildpkgs/diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2
+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
 
+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.3-2007k.zip
 



More information about the Commits mailing list