OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Aug-2006 13:10:41
Branch: HEAD Handle: 2006082512104100
Modified files:
openpkg-src/j2se j2se.spec
Log:
add native FreeBSD ix86/amd64 support (based on new officially
licensed Diablo JDK from the FreeBSD Foundation)
Summary:
Revision Changes Path
1.70 +49 -43 openpkg-src/j2se/j2se.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/j2se/j2se.spec
============================================================================
$ cvs diff -u -r1.69 -r1.70 j2se.spec
--- openpkg-src/j2se/j2se.spec 25 Aug 2006 10:02:08 -0000 1.69
+++ openpkg-src/j2se/j2se.spec 25 Aug 2006 11:10:41 -0000 1.70
@@ -23,11 +23,13 @@
##
# package versions
+%define V_base 1.5.0
%define V_openpkg 1.5.0.08
-%define V_sunjava 1_5_0_08
-%define V_filesys 1.5.0_08
+%define V_sundist 1_5_0_08
+%define V_sunfsys 1.5.0_08
%define V_sunsupp 1_5_0
-%define V_basever 1.5.0
+%define V_bsddist 1.5.0_07-b00
+%define V_bsdfsys 1.5.0_07
# package information
Name: j2se
@@ -48,15 +50,17 @@
%option with_jce no
# list of sources
-Source0: http://java.sun.com/j2se/::/jdk-%{V_sunjava}-linux-i586.bin
-Source1: http://java.sun.com/j2se/::/jdk-%{V_sunjava}-linux-amd64.bin
-Source2: http://java.sun.com/j2se/::/jdk-%{V_sunjava}-solaris-sparc.sh
-Source3: http://java.sun.com/j2se/::/jdk-%{V_sunjava}-solaris-sparcv9.sh
-Source4: http://java.sun.com/j2se/::/jdk-%{V_sunjava}-solaris-i586.sh
-Source5: http://java.sun.com/j2se/::/jdk-%{V_sunjava}-solaris-amd64.sh
+Source0: http://java.sun.com/j2se/::/jdk-%{V_sundist}-linux-i586.bin
+Source1: http://java.sun.com/j2se/::/jdk-%{V_sundist}-linux-amd64.bin
+Source2: http://java.sun.com/j2se/::/jdk-%{V_sundist}-solaris-sparc.sh
+Source3: http://java.sun.com/j2se/::/jdk-%{V_sundist}-solaris-sparcv9.sh
+Source4: http://java.sun.com/j2se/::/jdk-%{V_sundist}-solaris-i586.sh
+Source5: http://java.sun.com/j2se/::/jdk-%{V_sundist}-solaris-amd64.sh
Source6: http://java.sun.com/j2se/::/jdk-%{V_sunsupp}-doc.zip
Source7: http://java.sun.com/j2se/::/jce_policy-%{V_sunsupp}.zip
-Source8: rc.j2se
+Source8:
http://www.freebsdfoundation.org/downloads/java.shtml::/diablo-caffe-freebsd6-i386-%{V_bsddist}.tar.bz2
+Source9:
http://www.freebsdfoundation.org/downloads/java.shtml::/diablo-caffe-freebsd6-amd64-%{V_bsddist}.tar.bz2
+Source10: rc.j2se
%NoSource 0
%NoSource 1
%NoSource 2
@@ -65,6 +69,8 @@
%NoSource 5
%NoSource 6
%NoSource 7
+%NoSource 8
+%NoSource 9
# build information
Prefix: %{l_prefix}
@@ -89,8 +95,8 @@
%track
prog j2se = {
- version = %{V_sunjava}
- url = http://java.sun.com/j2se/%{V_basever}/download.jsp
+ version = %{V_sundist}
+ url = http://java.sun.com/j2se/%{V_base}/download.jsp
regex = jre-(__VER__)-
}
@@ -107,30 +113,38 @@
pkgfile2=""
docsfile="%{SOURCE jdk-%{V_sunsupp}-doc.zip}"
cryptfile="%{SOURCE jce_policy-%{V_sunsupp}.zip}"
- pkgdir="%{V_filesys}"
+ pkgdir="%{V_sunfsys}"
case "%{l_platform -t}" in
- i?86-linux2.[2-6]* | i?86-freebsd[456]* )
- pkgfile1="%{SOURCE jdk-%{V_sunjava}-linux-i586.bin}"
- pkgdir="jdk%{V_filesys}"
+ i?86-freebsd[456]* )
+ pkgfile1="%{SOURCE
diablo-caffe-freebsd6-i386-%{V_bsddist}.tar.bz2}"
+ pkgdir="diablo-jdk%{V_bsdfsys}"
+ ;;
+ amd64-freebsd[456]* )
+ pkgfile1="%{SOURCE
diablo-caffe-freebsd6-amd64-%{V_bsddist}.tar.bz2}"
+ pkgdir="diablo-jdk%{V_bsdfsys}"
+ ;;
+ i?86-linux2.[2-6]* )
+ pkgfile1="%{SOURCE jdk-%{V_sundist}-linux-i586.bin}"
+ pkgdir="jdk%{V_sunfsys}"
;;
amd64-linux2.[2-6]* )
- pkgfile1="%{SOURCE jdk-%{V_sunjava}-linux-i586.bin}"
- pkgfile2="%{SOURCE jdk-%{V_sunjava}-linux-amd64.bin}"
- pkgdir="jdk%{V_filesys}"
+ pkgfile1="%{SOURCE jdk-%{V_sundist}-linux-i586.bin}"
+ pkgfile2="%{SOURCE jdk-%{V_sundist}-linux-amd64.bin}"
+ pkgdir="jdk%{V_sunfsys}"
;;
sun4u-sunos5.[6-9]* | sun4[uv]-sunos5.10 )
- pkgfile1="%{SOURCE jdk-%{V_sunjava}-solaris-sparc.sh}"
- pkgfile2="%{SOURCE jdk-%{V_sunjava}-solaris-sparcv9.sh}"
- pkgdir="jdk%{V_filesys}"
+ pkgfile1="%{SOURCE jdk-%{V_sundist}-solaris-sparc.sh}"
+ pkgfile2="%{SOURCE jdk-%{V_sundist}-solaris-sparcv9.sh}"
+ pkgdir="jdk%{V_sunfsys}"
;;
i?86-sunos5.[6-9]* | i?86-sunos5.10 )
- pkgfile1="%{SOURCE jdk-%{V_sunjava}-solaris-i586.sh}"
- pkgdir="jdk%{V_filesys}"
+ pkgfile1="%{SOURCE jdk-%{V_sundist}-solaris-i586.sh}"
+ pkgdir="jdk%{V_sunfsys}"
;;
amd64-sunos5.[6-9]* | amd64-sunos5.10 )
- pkgfile1="%{SOURCE jdk-%{V_sunjava}-solaris-i586.sh}"
- pkgfile2="%{SOURCE jdk-%{V_sunjava}-solaris-amd64.sh}"
- pkgdir="jdk%{V_filesys}"
+ pkgfile1="%{SOURCE jdk-%{V_sundist}-solaris-i586.sh}"
+ pkgfile2="%{SOURCE jdk-%{V_sundist}-solaris-amd64.sh}"
+ pkgdir="jdk%{V_sunfsys}"
;;
esac
if [ ".$pkgfile1" = . ]; then
@@ -151,6 +165,12 @@
cd $RPM_BUILD_ROOT%{l_prefix}/libexec
HOME=$RPM_BUILD_ROOT%{l_prefix}/libexec/j2se
case "%{l_platform -t}" in
+ i?86-freebsd[456]* )
+ %{l_bzip2} -d -c $pkgfile1 | %{l_tar} xf -
+ ;;
+ amd64-freebsd[456]* )
+ %{l_bzip2} -d -c $pkgfile1 | %{l_tar} xf -
+ ;;
i?86-linux2.[2-6]* | i?86-freebsd[456]* )
echo "yes" | sh $pkgfile1 >COPYING.32
;;
@@ -196,18 +216,6 @@
esac
) || exit $?
- # optionally brand ELF binaries (FreeBSD only)
- case "%{l_platform -t}" in
- i?86-freebsd[456]* )
- brandelf -t Linux \
- `find $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/bin/ -type f
-print` \
- >/dev/null 2>&1 || true
- brandelf -t Linux \
- `find $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/jre/bin/ -type
f -print` \
- >/dev/null 2>&1 || true
- ;;
- esac
-
# move man pages to a canonical location
if [ -d $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/man1 ]; then
mv $RPM_BUILD_ROOT%{l_prefix}/libexec/j2se/man/man1/* \
@@ -262,13 +270,11 @@
done
) || exit $?
( cd $RPM_BUILD_ROOT%{l_prefix}/cgi
- ln -s ../libexec/j2se/jdk%{V_filesys}/bin/java-rmi.cgi java-rmi.cgi
+ ln -s ../libexec/j2se/jdk%{V_sunfsys}/bin/java-rmi.cgi java-rmi.cgi
) || exit $?
# install run command script
- %{l_shtool} install \
- -c -m 755 %{l_value -s -a} \
- -e 's;@javer@;jdk%{V_filesys};' \
+ %{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE rc.j2se} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
# determine installation files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
