Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (526b8709491c5b98a3c59c8d65fecaa9d90406c6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (526b8709491c5b98a3c59c8d65fecaa9d90406c6)
  • Date: Wed, 17 Feb 2010 23:37:30 -0600

GIT changes to master z-rejected grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

z-java/j2sdk-bin/DEPENDS | 2 -
z-java/j2sdk-bin/HISTORY | 11 +++++---
z-java/j2sdk-bin/INSTALL | 6 ++--
z-java/j2sdk-bin/JAVA_WARNING | 2 -
z-java/j2sdk/CONFIGURE | 9 ++----
z-java/j2sdk/DEPENDS | 7 ++---
z-java/j2sdk/DETAILS | 10 +++----
z-java/j2sdk/HISTORY | 55
+++++++++++++++++++++--------------------
z-java/j2sdk/INSTALL | 12 ++++----
z-java/j2sdk/PRE_BUILD | 12 ++++----
z-java/jdk1.5-bin/DEPENDS | 2 -
z-java/jdk1.5-bin/DETAILS | 2 -
z-java/jdk1.5-bin/HISTORY | 8 ++++-
z-java/jdk1.5-bin/INSTALL | 2 -
z-java/jdk1.5-bin/PRE_BUILD | 2 -
z-java/jdk6-bin/DEPENDS | 2 -
z-java/jdk6-bin/DETAILS | 2 -
z-java/jdk6-bin/HISTORY | 3 ++
z-java/jdk6-bin/INSTALL | 2 -
z-java/jre1.5-bin/DEPENDS | 2 -
z-java/jre1.5-bin/HISTORY | 6 +++-
z-java/jre1.5-bin/INSTALL | 4 +-
z-java/jre1.5-bin/JAVA_WARNING | 2 -
z-java/jre1.5-bin/PRE_BUILD | 2 -
z-java/jre6-bin/DEPENDS | 2 -
z-java/jre6-bin/HISTORY | 4 ++
z-java/jre6-bin/INSTALL | 2 -
z-java/jre6-bin/JAVA_WARNING | 2 -
z-java/jre6-bin/PRE_BUILD | 2 -
29 files changed, 99 insertions(+), 80 deletions(-)

New commits:
commit 526b8709491c5b98a3c59c8d65fecaa9d90406c6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

jre6-bin: Cleanup whitespace

commit 830b6628967695828808b059687ff5dc69346ec0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

jre1.5-bin: Cleanup whitespace

commit cb98c93adffbf2c9a131651d6a158f8457819b80
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

jdk1.5-bin: Cleanup whitespace

commit 179b0ca446401f9ba5f6da1fb67dc2dabd974410
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

j2sdk-bin: Cleanup whitespace

commit 45b009001a383d7d60655c3e1da0b19a709c50ea
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

jdk6-bin: Cleanup whitespace

commit 25f1ccbf5c300afe436663d3d4660272f34b7250
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

jre1.5-bin: Depends on any provider of ODBC-MGR now

commit d4489aca84c5b7708e18925ae5603656f5d20768
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

jre6-bin: Depends on any provider of ODBC-MGR now

commit f551f88a6ea72244aaf8886d7c7e7a1e2dc1e45e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

jdk1.5-bin: Depends on any provider of ODBC-MGR now

commit 48dad6432a0e5c6324cdc45b592bfb8b350e38b1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

j2sdk-bin: Depends on any provider of ODBC-MGR now

commit f74043ea5db7b96930c3d38226e5d5c10674a121
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

j2sdk: Cleanup whitespace

commit 17aca39c1dafb5f0b9a2e51eefe8b668805363a0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

j2sdk: Depends on any provider of ODBC-MGR now

commit 4525c6285ba865d3c434b4e4a60dd68a866539f2
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

jdk6-bin: Depends on any provider of ODBC-MGR now

diff --git a/z-java/j2sdk-bin/DEPENDS b/z-java/j2sdk-bin/DEPENDS
index 1e0bc2c..2f454cf 100755
--- a/z-java/j2sdk-bin/DEPENDS
+++ b/z-java/j2sdk-bin/DEPENDS
@@ -1,2 +1,2 @@
-depends unixodbc &&
+depends ODBC-MGR &&
depends alsa-lib
diff --git a/z-java/j2sdk-bin/HISTORY b/z-java/j2sdk-bin/HISTORY
index 7e1f68d..91c354a 100644
--- a/z-java/j2sdk-bin/HISTORY
+++ b/z-java/j2sdk-bin/HISTORY
@@ -1,3 +1,6 @@
+2010-02-17 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on any provider of ODBC-MGR now
+
2008-12-04 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 1_4_2_19

@@ -26,7 +29,7 @@

2006-10-18 Flavien Bridault <vlaaad AT sourcemage.org>
* DETAILS: Updated to 1_4_2_12
- * DEPENDS: No longer needs gcc33
+ * DEPENDS: No longer needs gcc33

2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* PROVIDES: [automated] Fixed invalid entries.
@@ -106,7 +109,7 @@
2004-07-28 Eric Schabell <eschabell AT sourcemage.org>
* WIP: removed, not really applicable for z-rejected as we never
move spells into 'stable.'
- * CONFIGURE: uses REJECTED_MSG file and has been updated to include
+ * CONFIGURE: uses REJECTED_MSG file and has been updated to include
spell specific warnings about source downloads.
* FINAL: added to source java.sh for JAVA_HOME to be set.

@@ -142,8 +145,8 @@
* PRE_BUILD: added unpack to PRE_BUILD for SOURCE

2003-05-09 Eric Sandall <sandalle AT sourcemage.org>
- * PREPARE: Added support for SPARC architecture (couldn't find PPC
files) i586 is default, just in case the selection is
- somehow missed...
+ * PREPARE: Added support for SPARC architecture (couldn't find PPC
files)
+ i586 is default, just in case the selection is somehow missed...

2003-03-17 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: added DEPENDS file and depends on unixODBC
diff --git a/z-java/j2sdk-bin/INSTALL b/z-java/j2sdk-bin/INSTALL
index b580104..cb76aea 100755
--- a/z-java/j2sdk-bin/INSTALL
+++ b/z-java/j2sdk-bin/INSTALL
@@ -3,7 +3,7 @@ cd ${INSTALL_ROOT}/usr/lib &&
if [ "$ARCH" = "sparc" ]
then
tail +522 $SOURCE_CACHE/$SOURCE | bunzip2 | tar -xf - &&
-
+
if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]
then
ln -sf
${INSTALL_ROOT}/usr/lib/j2sdk$VER/jre/plugin/sparc/mozilla/javaplugin_oji.so
${INSTALL_ROOT}/usr/lib/mozilla/plugins/javaplugin_oji.so
@@ -12,7 +12,7 @@ then
elif [ "$ARCH" = "ppc" ]
then
tail +400 $SOURCE_CACHE/$SOURCE | bunzip2 | tar -xf - &&
-
+
if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]
then
ln -sf
${INSTALL_ROOT}/usr/lib/j2sdk$VER/jre/plugin/ppc/mozilla/javaplugin_oji.so
${INSTALL_ROOT}/usr/lib/mozilla/plugins/javaplugin_oji.so
@@ -21,7 +21,7 @@ then
elif [ "$ARCH" = "i386" ]
then
yes | sh $SOURCE_CACHE/$SOURCE &&
-
+
if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]
then
ln -sf
${INSTALL_ROOT}/usr/lib/j2sdk$VER/jre/plugin/i386/ns610-gcc32/libjavaplugin_oji.so
${INSTALL_ROOT}/usr/lib/mozilla/plugins/libjavaplugin_oji.so
diff --git a/z-java/j2sdk-bin/JAVA_WARNING b/z-java/j2sdk-bin/JAVA_WARNING
index 388a86c..462950c 100755
--- a/z-java/j2sdk-bin/JAVA_WARNING
+++ b/z-java/j2sdk-bin/JAVA_WARNING
@@ -10,5 +10,5 @@ ${MESSAGE_COLOR}so cast will find it.\n${DEFAULT_COLOR}" &&
if ! query "HAVE YOU DOWNLOADED THE SOURCES AND WISH TO CONTINUE CASTING?" n;
then
message "${MESSAGE_COLOR}Please recast when you have the
sources!\n${DEFAULT_COLOR}"
- return 1
+ return 1
fi
diff --git a/z-java/j2sdk/CONFIGURE b/z-java/j2sdk/CONFIGURE
index fc9b512..85d8ffc 100755
--- a/z-java/j2sdk/CONFIGURE
+++ b/z-java/j2sdk/CONFIGURE
@@ -26,13 +26,12 @@ $JAVA_HOME\n(If compilation fails due to this bootstrap
compiler \n then use cas
SUN's binary)\n\nDo you want to use \"java\" to bootstrap j2sdk compilation
? \nIf you answer 'n',I'll \
use SUN's binary.${DEFAULT_COLOR}" y;
then
- BOOTSTRAP=system
+ BOOTSTRAP=system
else
- BOOTSTRAP=spell
+ BOOTSTRAP=spell
fi
-
- CONFIGURED=yes
- BOOTSTRAP=$BOOTSTRAP

+ CONFIGURED=yes
+ BOOTSTRAP=$BOOTSTRAP
fi

diff --git a/z-java/j2sdk/DEPENDS b/z-java/j2sdk/DEPENDS
index ad0da6b..68d748c 100755
--- a/z-java/j2sdk/DEPENDS
+++ b/z-java/j2sdk/DEPENDS
@@ -3,10 +3,9 @@ depends zlib &&
depends tcsh &&
depends cpio &&
depends alsa-lib &&
-depends unixodbc &&
+depends ODBC-MGR &&
depends zip &&
if [ "$BOOTSTRAP" = "spell" ]
-then depends j2sdk-bin
+ then depends j2sdk-bin
fi &&
-optional_depends "lesstif" "use-lesstif" "" "To substitute LessTif for the
bundled version of Motif"
-
+optional_depends "lesstif" "use-lesstif" "" "To substitute LessTif for the
bundled version of Motif"
diff --git a/z-java/j2sdk/DETAILS b/z-java/j2sdk/DETAILS
index 507be75..7f14bc0 100755
--- a/z-java/j2sdk/DETAILS
+++ b/z-java/j2sdk/DETAILS
@@ -30,11 +30,11 @@
SHORT="j2sdk compiles Sun's j2sdk."

cat << EOF
-Java 2 Platform, Standard Edition (J2SETM) software is the premier solution
for
-rapidly developing and deploying mission-critical, enterprise applications.
-Version 1.4.2 builds upon Java technology's cross-platform support and
robust
-security model with new features and functionality, enhanced performance and
-scalability, and improved reliability and serviceability.
+Java 2 Platform, Standard Edition (J2SETM) software is the premier solution
for
+rapidly developing and deploying mission-critical, enterprise applications.
+Version 1.4.2 builds upon Java technology's cross-platform support and robust
+security model with new features and functionality, enhanced performance and
+scalability, and improved reliability and serviceability.

Thanks to LFS hints(http://tushar.lfsforum.org/)

diff --git a/z-java/j2sdk/HISTORY b/z-java/j2sdk/HISTORY
index 4256fd0..ea6b16b 100644
--- a/z-java/j2sdk/HISTORY
+++ b/z-java/j2sdk/HISTORY
@@ -1,3 +1,6 @@
+2010-02-17 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on any provider of ODBC-MGR now
+
2008-04-20 Julien "_kaze_" ROZO <julien AT rozo.org>
* CONFLICTS: Made conflict with jre6-bin

@@ -42,7 +45,7 @@
* PROVIDES: added JAVA-1.4

2005-01-30 Arjan Bouter <abouter AT sourcemage.org>
- * BUILD: spell_installed -> spell_ok conversion
+ * BUILD: spell_installed -> spell_ok conversion
looks like you missed one Eric ;)

2005-01-23 Eric Sandall <sandalle AT sourcemage.org>
@@ -60,7 +63,7 @@
with getting version numbers in the j2sdk spell logs.

2004-08-23 Eric Schabell <eschabell AT sourcemage.org>
- * CONFIGURE, INSTALL, BUILD: removed some more sorcery
+ * CONFIGURE, INSTALL, BUILD: removed some more sorcery
function calls that are messing with installwatch.
* HISTORY: cleaning up long lines.

@@ -93,18 +96,18 @@
* CONFIGURE: Needs "&&" after the ask_rejected.

2004-01-10 hgg <hgreig AT bigpond.net.au>
- * BUILD: export MAKE_NJOBS=1 instead of unset MAKE_NJOBS (caused
+ * BUILD: export MAKE_NJOBS=1 instead of unset MAKE_NJOBS (caused
error message if unset).

2004-01-09 hgg <hgreig AT bigpond.net.au>
- * j2sdk-1_4_2-kernel.patch,PRE_BUILD: add with a check for 2.6.X
+ * j2sdk-1_4_2-kernel.patch,PRE_BUILD: add with a check for 2.6.X
headers in /usr/include/linux.
- * j2sdk-1_4_2-smgl.patch: disable some deprecated Linuxthreads calls
+ * j2sdk-1_4_2-smgl.patch: disable some deprecated Linuxthreads calls
that caused problems with some gcc and glibc versions.
* BUILD: swap POOPY for MOZPLUG.

2004-01-08 hgg <hgreig AT bigpond.net.au>
- * PRE_BUILD: 2.6 kernel uses different /proc interface. Check for
+ * PRE_BUILD: 2.6 kernel uses different /proc interface. Check for
kernel version before checking for free space bug #5486.
* j2sdk-1_4_2-smgl.patch: fix for alsa 1.0.0rc2.

@@ -113,7 +116,7 @@
* POST_INSTALL: deleted (see above).

2003-11-28 hgg <hgreig AT bigpond.net.au>
- * DEPENDS: change to X11-LIBS now I have fixed the xfree86-libs and
+ * DEPENDS: change to X11-LIBS now I have fixed the xfree86-libs and
xdirectfb spell.

2003-11-25 hgg <hgreig AT bigpond.net.au>
@@ -126,19 +129,19 @@
* PROVIDES: Uppercase provides.

2003-10-29 hgg <hgreig AT bigpond.net.au>
- * DETAILS: Update to 1.4.2. Remove LFS patches, remove extra sources.
- * DEPENDS: add alsa-libs and unixODBC and X11-SERVER (wants to link
to
+ * DETAILS: Update to 1.4.2. Remove LFS patches, remove extra sources.
+ * DEPENDS: add alsa-libs and unixODBC and X11-SERVER (wants to link to
libXi.so, which is not provided by xfree86-libs spell).
- * PREBUILD,CONFIGURE,DETAILS: remove sun's binary bootstrap version
from
- this spell the j2sdk-bin spell is just fine for bootstrapping if no
- system version is installed change "available swap" check to
the currently
+ * PREBUILD,CONFIGURE,DETAILS: remove sun's binary bootstrap version
from
+ this spell the j2sdk-bin spell is just fine for bootstrapping if no
+ system version is installed change "available swap" check to
the currently
needed size and use awk (thanks dufflebunk).
- * BUILD: turn off verbose make, add HOTSPOT_BUILD_JOBS for systems
with
- MAKE_NJOBS>1 clean up and move non-system specific stuff into a
single
- patch, change one of the plugin links. Change MILESTONE to
just SMGL, and
- make BUILD_NUMBER sane if you are unlucky enough to cast it
twice in the
+ * BUILD: turn off verbose make, add HOTSPOT_BUILD_JOBS for systems
with
+ MAKE_NJOBS>1 clean up and move non-system specific stuff into a
single
+ patch, change one of the plugin links. Change MILESTONE to
just SMGL, and
+ make BUILD_NUMBER sane if you are unlucky enough to cast it
twice in the
same day.
- * j2sdk-1_4_2-smgl.patch: my patch to take care of paths, gcc3.3.X
errors,
+ * j2sdk-1_4_2-smgl.patch: my patch to take care of paths, gcc3.3.X
errors,
make system checks.
* j2sdk-1_4_2-use-lesstif.patch: my patch to allow use of lesstif
libXm.a.

@@ -150,17 +153,17 @@
* DETAILS: Updated so everyone has to rebuild and track it (security
feature).

2003-09-19 hgg <hgreig AT bigpond.net.au>
- * CONFLICTS: Removed CONFLICTS so j2sdk-bin can be the bootstrap
+ * CONFLICTS: Removed CONFLICTS so j2sdk-bin can be the bootstrap
compiler (now dispelled in BUILD).

2003-09-10 hgg <hgreig AT bigpond.net.au>
- * PREPARE,CONFIGURE,PREBUILD: Moved PREPARE to CONFIGURE, moved
binary setup
- to PRE_BUILD, redid JAVA_HOME to also check for a working javac,
added
- check to PREPARE to start configure if the latest changes
aren't in
- $SPELL_CONFIG.
+ * PREPARE,CONFIGURE,PREBUILD: Moved PREPARE to CONFIGURE, moved
binary setup
+ to PRE_BUILD, redid JAVA_HOME to also check for a working javac,
added
+ check to PREPARE to start configure if the latest changes aren't in
+ $SPELL_CONFIG.

2003-09-09 hgg <hgreig AT bigpond.net.au>
- * BUILD: Now builds in "sane" mode so a failure causes an exit and it
doesn't
+ * BUILD: Now builds in "sane" mode so a failure causes an exit and it
doesn't
bundle up the debug image.

2003-04-18 Seth Woolley <seth AT tautology.org>
@@ -170,15 +173,15 @@
* DETAILS: Modified DETAILS to correct MD5.

2003-01-25 Jose Bernardo Silva <jbernardo AT sourcemage.org>
- * BUILD: Fixed the last small things in BUILD, including a "rm -f
j2sdk"
+ * BUILD: Fixed the last small things in BUILD, including a "rm -f
j2sdk"
because "ln -sf" doesn't replace existing links as it should.

2003-01-19 Jose Bernardo Silva <jbernardo AT sourcemage.org>
- * BUILD,DETAILS: Updated the spell to 1.4.1, according with the
latest LFS
+ * BUILD,DETAILS: Updated the spell to 1.4.1, according with the
latest LFS
hints. Fixed the "second cast only" bug.

2002-12-11 Geoffrey Derber <gderber AT sourcemage.org>
- * DETAILS: added zero_the_hero's website as a mirror of some of the
download
+ * DETAILS: added zero_the_hero's website as a mirror of some of the
download
files.

2002-12-09 Geoffrey Derber <gderber AT sourcemage.org>
diff --git a/z-java/j2sdk/INSTALL b/z-java/j2sdk/INSTALL
index 650776f..4806918 100755
--- a/z-java/j2sdk/INSTALL
+++ b/z-java/j2sdk/INSTALL
@@ -6,12 +6,12 @@ then
install -d /usr/java
&&
cp -av j2sdk-image /usr/java/$SPELL-$VERSION-${BUILD_NUMBER} &&
cd /usr/java &&
-
+
for i in *;
do
[ "$i" = "$SPELL-$VERSION-${BUILD_NUMBER}" ] || rm -rf $i;
done &&
-
+
# I want to track the 30+ MB we just installed and this turns
installwatch back on
#
ln -snf $SPELL-$VERSION-${BUILD_NUMBER} j2sdk &&
@@ -23,7 +23,7 @@ then
mkdir -p /etc/.java
&&
chmod a+w /etc/.java
&&
PLUG=/usr/lib/mozilla/plugins/
&&
-
+
if [ -d $PLUG ]
then
echo "Installing for Mozilla" &&
@@ -57,20 +57,20 @@ then
ln -sf
$TRACK_ROOT/usr/java/j2sdk/jre/plugin/i386/ns610/libjavaplugin_oji.so
$PLUG/libjavaplugin_oji.so &&
ln -sf
$TRACK_ROOT/usr/java/j2sdk/jre/plugin/i386/ns4/libjavaplugin.so
$PLUG/libjavaplugin.so &&

- # now remove j2sdk-bin bootstrap compiler if installed
+ # now remove j2sdk-bin bootstrap compiler if installed
#
if spell_ok j2sdk-bin
then
dispel j2sdk-bin &&
BOOTSTRAP=system &&
sedit "s/j2sdk\:j2sdk-bin\:on\:required\:\://g"
$DEPENDS_STATUS
- fi
+ fi

mkdir -p ${INSTALL_ROOT}/etc/profile.d/ &&
install -m 0644 $SECTION_DIRECTORY/java.sh
${INSTALL_ROOT}/etc/profile.d/ &&
ln -sfn ${INSTALL_ROOT}/usr/lib/j2sdk$VER/
${INSTALL_ROOT}/usr/lib/j2sdk

-else
+else
message "${WARNING}SORRY, JAVA APPEARS TO HAVE FAILED
BUILDING${DEFAULT_COLOR}" &&
rm -rf /opt/java/
&&
false
diff --git a/z-java/j2sdk/PRE_BUILD b/z-java/j2sdk/PRE_BUILD
index af2dc2b..d149f94 100755
--- a/z-java/j2sdk/PRE_BUILD
+++ b/z-java/j2sdk/PRE_BUILD
@@ -1,11 +1,11 @@
-if [[ $(get_running_kernel_version) == 2.6.* ]]; then
+if [[ $(get_running_kernel_version) == 2.6.* ]]; then
if [ $(cat /proc/meminfo | grep SwapFree |awk '$1=="SwapFree:"{print $2;}')
-gt "1300000000" ] ;
- then mk_source_dir $SOURCE_DIRECTORY 2g
+ then mk_source_dir $SOURCE_DIRECTORY 2g
else export TMPFS=off &&
mk_source_dir $SOURCE_DIRECTORY
fi
elif [ $(cat /proc/meminfo |awk '$1=="Swap:"{print $NF;}') -gt "1300000000"
] ;
- then mk_source_dir $SOURCE_DIRECTORY 2g
+ then mk_source_dir $SOURCE_DIRECTORY 2g
else export TMPFS=off &&
mk_source_dir $SOURCE_DIRECTORY
fi &&
@@ -14,9 +14,9 @@ unpack_file &&
unpack_file 2 &&
unpack_file 3 &&
if [ "$CERT" = "yes" ]
-then unpack_file 5
+then unpack_file 5
fi &&
-# apply patches
+# apply patches
patch -p1 < $SCRIPT_DIRECTORY/j2sdk-1_4_2-smgl.patch &&
if grep UTS_RELEASE /usr/include/linux/version.h | grep -q \"2.6; then
patch -p1 < $SCRIPT_DIRECTORY/j2sdk-1_4_2-kernel2.6.patch
@@ -24,4 +24,4 @@ fi &&
# JAVA_HOME mightn't be set if j2sdk-bin has just been installed
if spell_ok j2sdk-bin; then
export JAVA_HOME=/usr/lib/j2sdk${BIN_VERSION}
-fi
+fi
diff --git a/z-java/jdk1.5-bin/DEPENDS b/z-java/jdk1.5-bin/DEPENDS
index b85a552..71ddebd 100755
--- a/z-java/jdk1.5-bin/DEPENDS
+++ b/z-java/jdk1.5-bin/DEPENDS
@@ -1,4 +1,4 @@
-depends unixodbc &&
+depends ODBC-MGR &&
depends alsa-lib &&

optional_depends X11-LIBS "" "" "To run gui applications" &&
diff --git a/z-java/jdk1.5-bin/DETAILS b/z-java/jdk1.5-bin/DETAILS
index c92a74c..f8f6f14 100755
--- a/z-java/jdk1.5-bin/DETAILS
+++ b/z-java/jdk1.5-bin/DETAILS
@@ -37,7 +37,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/jdk$VER
SHORT="jdk1.5-bin is the Java Software Development Kit"
cat << EOF
The Java Development Kit is a feature-complete development and
-deployment platform. The JDK contains the Java Plug-In for Netscape 4.x
+deployment platform. The JDK contains the Java Plug-In for Netscape 4.x
and Mozilla/Netscape 6.x.

The DLJ license allows linux distributions to distribute the JDK. One must
diff --git a/z-java/jdk1.5-bin/HISTORY b/z-java/jdk1.5-bin/HISTORY
index f649738..622a5c1 100644
--- a/z-java/jdk1.5-bin/HISTORY
+++ b/z-java/jdk1.5-bin/HISTORY
@@ -1,3 +1,6 @@
+2010-02-17 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on any provider of ODBC-MGR now
+
2009-11-31 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 1.5.0_22 / 5.0u22

@@ -72,7 +75,8 @@
We just dont' have a way to select which one would be active...

2006-12-24 David Kowis <dkowis AT shlrm.org>
- * DEPENDS: Changed X11-LIBS to optional, because it's only needed to
run guis. not everything
+ * DEPENDS: Changed X11-LIBS to optional, because it's only needed to
run
+ guis. not everything

2006-12-10 David Brown <dmlb2000 AT gmail.com>
* DETAILS: updated to 1.5.0.10
@@ -147,5 +151,5 @@
* INSTALL: fixed symbolic link

2004-10-10 Eric Schabell <eschabell AT sourcemage.org>
- * ALL: new spell for version 1.5.0 jdk, thanks to Robin Cook.
+ * ALL: new spell for version 1.5.0 jdk, thanks to Robin Cook.

diff --git a/z-java/jdk1.5-bin/INSTALL b/z-java/jdk1.5-bin/INSTALL
index e8fce29..603b6ef 100755
--- a/z-java/jdk1.5-bin/INSTALL
+++ b/z-java/jdk1.5-bin/INSTALL
@@ -8,7 +8,7 @@ then
fi

if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]
-then
+then
if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]
then
ln -sf
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/plugin/i386/ns7/libjavaplugin_oji.so \
diff --git a/z-java/jdk1.5-bin/PRE_BUILD b/z-java/jdk1.5-bin/PRE_BUILD
index b65c931..03df2dc 100755
--- a/z-java/jdk1.5-bin/PRE_BUILD
+++ b/z-java/jdk1.5-bin/PRE_BUILD
@@ -1 +1 @@
-unpack_file ''
+unpack_file ''
diff --git a/z-java/jdk6-bin/DEPENDS b/z-java/jdk6-bin/DEPENDS
index 7d51724..2343910 100755
--- a/z-java/jdk6-bin/DEPENDS
+++ b/z-java/jdk6-bin/DEPENDS
@@ -4,4 +4,4 @@ depends libx11 &&
depends libxext &&
depends libxt &&
depends libxtst &&
-depends unixodbc
+depends ODBC-MGR
diff --git a/z-java/jdk6-bin/DETAILS b/z-java/jdk6-bin/DETAILS
index 70a93df..8ca9200 100755
--- a/z-java/jdk6-bin/DETAILS
+++ b/z-java/jdk6-bin/DETAILS
@@ -36,6 +36,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/jdk${VER}
SHORT="Java Software Development Kit"
cat << EOF
The Java Development Kit is a feature-complete development and
-deployment platform. The JDK contains the Java Plug-In for Netscape 4.x
+deployment platform. The JDK contains the Java Plug-In for Netscape 4.x
and Mozilla/Netscape 6.x, if you've installed the i586.
EOF
diff --git a/z-java/jdk6-bin/HISTORY b/z-java/jdk6-bin/HISTORY
index c1fdf39..f09daeb 100644
--- a/z-java/jdk6-bin/HISTORY
+++ b/z-java/jdk6-bin/HISTORY
@@ -1,3 +1,6 @@
+2010-02-17 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on any provider of ODBC-MGR now
+
2010-01-20 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 6u18

diff --git a/z-java/jdk6-bin/INSTALL b/z-java/jdk6-bin/INSTALL
index 4ef8d47..af427e9 100755
--- a/z-java/jdk6-bin/INSTALL
+++ b/z-java/jdk6-bin/INSTALL
@@ -7,7 +7,7 @@ then
fi

if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]
-then
+then
if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]
then
ln -sf
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/plugin/i386/ns7/libjavaplugin_oji.so \
diff --git a/z-java/jre1.5-bin/DEPENDS b/z-java/jre1.5-bin/DEPENDS
index b85a552..71ddebd 100755
--- a/z-java/jre1.5-bin/DEPENDS
+++ b/z-java/jre1.5-bin/DEPENDS
@@ -1,4 +1,4 @@
-depends unixodbc &&
+depends ODBC-MGR &&
depends alsa-lib &&

optional_depends X11-LIBS "" "" "To run gui applications" &&
diff --git a/z-java/jre1.5-bin/HISTORY b/z-java/jre1.5-bin/HISTORY
index 667fc1d..5a755e3 100644
--- a/z-java/jre1.5-bin/HISTORY
+++ b/z-java/jre1.5-bin/HISTORY
@@ -1,3 +1,6 @@
+2010-02-17 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on any provider of ODBC-MGR now
+
2009-08-25 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 1_5_0_20

@@ -99,4 +102,5 @@
* INSTALL: fixed symbolic link

2004-10-10 Eric Schabell <eschabell AT sourcemage.org>
- * ALL: new spell for version 1.5.0 jdk, thanks to Robin Cook.
+ * ALL: new spell for version 1.5.0 jdk, thanks to Robin Cook.
+
diff --git a/z-java/jre1.5-bin/INSTALL b/z-java/jre1.5-bin/INSTALL
index 7620691..a2ad73c 100755
--- a/z-java/jre1.5-bin/INSTALL
+++ b/z-java/jre1.5-bin/INSTALL
@@ -8,8 +8,8 @@ then
fi &&

if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]
-then
-message "${MESSAGE_COLOR}Determine which browser plugins to
install${DEFAULT_COLOR}" &&
+then
+ message "${MESSAGE_COLOR}Determine which browser plugins to
install${DEFAULT_COLOR}" &&
if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]
then
message "${MESSAGE_COLOR}Installing plugin for
mozilla${DEFAULT_COLOR}" &&
diff --git a/z-java/jre1.5-bin/JAVA_WARNING b/z-java/jre1.5-bin/JAVA_WARNING
index 9b282a5..ff889f1 100644
--- a/z-java/jre1.5-bin/JAVA_WARNING
+++ b/z-java/jre1.5-bin/JAVA_WARNING
@@ -10,5 +10,5 @@ ${MESSAGE_COLOR}so cast will find it.\n${DEFAULT_COLOR}" &&
if ! query "HAVE YOU DOWNLOADED THE SOURCES AND WISH TO CONTINUE CASTING?" n;
then
message "${MESSAGE_COLOR}Please recast when you have the
sources!\n${DEFAULT_COLOR}"
- return 1
+ return 1
fi
diff --git a/z-java/jre1.5-bin/PRE_BUILD b/z-java/jre1.5-bin/PRE_BUILD
index b65c931..03df2dc 100755
--- a/z-java/jre1.5-bin/PRE_BUILD
+++ b/z-java/jre1.5-bin/PRE_BUILD
@@ -1 +1 @@
-unpack_file ''
+unpack_file ''
diff --git a/z-java/jre6-bin/DEPENDS b/z-java/jre6-bin/DEPENDS
index c394e0e..fcde561 100755
--- a/z-java/jre6-bin/DEPENDS
+++ b/z-java/jre6-bin/DEPENDS
@@ -1,4 +1,4 @@
-depends unixodbc &&
+depends ODBC-MGR &&
depends alsa-lib &&

if [[ "$JRE6_BIN_X" == "y" ]]; then
diff --git a/z-java/jre6-bin/HISTORY b/z-java/jre6-bin/HISTORY
index 3699579..ae033a4 100644
--- a/z-java/jre6-bin/HISTORY
+++ b/z-java/jre6-bin/HISTORY
@@ -1,3 +1,6 @@
+2010-02-17 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on any provider of ODBC-MGR now
+
2009-11-21 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 6u17

@@ -50,3 +53,4 @@
2008-04-20 Julien "_kaze_" ROZO <julien AT rozo.org>
* BUILD, CONFIGURE, CONFLICTS, DEPENDS, DETAILS, FINAL, INSTALL,
java.sh,
JAVA_WARNING, PRE_BUILD, PROVIDES, UNATTEND_SAFE: created this spell
+
diff --git a/z-java/jre6-bin/INSTALL b/z-java/jre6-bin/INSTALL
index 1443dd9..a14b701 100755
--- a/z-java/jre6-bin/INSTALL
+++ b/z-java/jre6-bin/INSTALL
@@ -9,7 +9,7 @@ then
fi &&

if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]
-then
+then
message "${MESSAGE_COLOR}Determine which browser plugins to
install${DEFAULT_COLOR}" &&
if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]
then
diff --git a/z-java/jre6-bin/JAVA_WARNING b/z-java/jre6-bin/JAVA_WARNING
index d4056c8..237e559 100644
--- a/z-java/jre6-bin/JAVA_WARNING
+++ b/z-java/jre6-bin/JAVA_WARNING
@@ -9,5 +9,5 @@ ${DEFAULT_COLOR}/var/spool/sorcery/ \
${MESSAGE_COLOR}so cast will find it.\n${DEFAULT_COLOR}" &&

message "${MESSAGE_COLOR}Please recast when you have the
sources!\n${DEFAULT_COLOR}"
- return 1
+ return 1
fi
diff --git a/z-java/jre6-bin/PRE_BUILD b/z-java/jre6-bin/PRE_BUILD
index b65c931..03df2dc 100755
--- a/z-java/jre6-bin/PRE_BUILD
+++ b/z-java/jre6-bin/PRE_BUILD
@@ -1 +1 @@
-unpack_file ''
+unpack_file ''



  • [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (526b8709491c5b98a3c59c8d65fecaa9d90406c6), Eric Sandall, 02/18/2010

Archive powered by MHonArc 2.6.24.

Top of Page