New commits:
commit 50ca3cae10e1dbba15db18c0827c97b3ff714f50
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
icedtea-web: icedtea java browser plugin
Needs more work for browsers other than firefox
commit ceadd0740bfae2a9d03b1530e72f8e56b335a9f9
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
npapi-sdk: New spell, headers need to build firefox plugins
commit 34991b7d2ef532ea5f6c3868ea0c7abd687f6929
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
icedtea6: New Spell, OpenJDK build using autotools
commit bfebc77766a64f0cb11fb948a9c30c2aa9a3c0a9
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
rhino: new spell, javascript implemented in java
commit 869224d8c830f975c561d10bc27d6e79a49503c5
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
libxp: adding back as needed to build openjdk
commit e9876ffda1f631bcfa99631e94fc3458faf12625
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>
printproto: adding back to grimoire as needed by openjdk
diff --git a/ChangeLog b/ChangeLog
index 4f05c8b..d37f71e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-12-07 Robin Cook <rcook AT wyrms.net>
+ * xorg-proto/printproto: added back as needed to build openjdk
+ * xorg-lib/libxp: added back as needed to build openjdk
+ * java/rhino: New Spell, javascript implemented in java
+ * java/icedtea6: New Spell, openjdk build using autotools
+ * http/npapi-sdk: New Spell, Headers neede to build firefox plugins
+ * java/icedtea-web: New Spell, icedtea java browser plugin
+
2011-11-27 Ladislav Hagara <hgr AT vabo.cz>
* libs/json-c: new spell, JSON implementation in C
diff --git a/http/npapi-sdk/DETAILS b/http/npapi-sdk/DETAILS
new file mode 100755
index 0000000..581cd6e
--- /dev/null
+++ b/http/npapi-sdk/DETAILS
@@ -0,0 +1,21 @@
+ SPELL=npapi-sdk
+ if [[ "$NSAPISDK_AUTOUPDATE" == "y" ]]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=git
+ fi
+ SOURCE=$SPELL-git.tar.bz2
+ SOURCE_URL[0]=git://github.com/mgorny/npapi-sdk.git:$SPELL-git
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD="on"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git
+ LICENSE[0]=BSD
+ WEB_SITE=https://code.google.com/p/npapi-sdk/
+ KEYWORDS="http plugin"
+ ENTERED=20111118
+ SHORT="reference NPAPI headers"
+cat << EOF
+Set of reference NPAPI headers which all browser and plugin projects can
use.
+Additionally it will contain utility code and sample code to make life
easier
+for NPAPI developers.
+EOF
diff --git a/http/npapi-sdk/HISTORY b/http/npapi-sdk/HISTORY
new file mode 100644
index 0000000..903441f
--- /dev/null
+++ b/http/npapi-sdk/HISTORY
@@ -0,0 +1,2 @@
+2011-11-18 Robin Cook <rcook AT wyrms.net>
+ * New Spell: DETAILS, PREPARE, PRE_BUILD
diff --git a/http/npapi-sdk/PREPARE b/http/npapi-sdk/PREPARE
new file mode 100755
index 0000000..85c2674
--- /dev/null
+++ b/http/npapi-sdk/PREPARE
@@ -0,0 +1,2 @@
+config_query NSAPI_SDK_AUTOUPDATE \
+ "Automatically update $SPELL on system-update?" n
diff --git a/http/npapi-sdk/PRE_BUILD b/http/npapi-sdk/PRE_BUILD
new file mode 100755
index 0000000..5345e7a
--- /dev/null
+++ b/http/npapi-sdk/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+autoreconf -f -i
diff --git a/java/icedtea-web/BUILD b/java/icedtea-web/BUILD
new file mode 100755
index 0000000..a99682f
--- /dev/null
+++ b/java/icedtea-web/BUILD
@@ -0,0 +1,8 @@
+OPTS="$ICEDTEAWEB_DOCS \
+ $ICEDTEAWEB_PLUGIN \
+ --with-jdk-home=$JAVA_HOME \
+ --with-jar=$JAVA_HOME/bin/jar \
+ --with-javadoc=$JAVA_HOME/bin/javadoc \
+ $OPTS" &&
+
+default_build
diff --git a/java/icedtea-web/CONFIGURE b/java/icedtea-web/CONFIGURE
new file mode 100755
index 0000000..5d76e1d
--- /dev/null
+++ b/java/icedtea-web/CONFIGURE
@@ -0,0 +1,6 @@
+config_query_option ICEDTEAWEB_DOCS "Build Javadoc documentation?" y \
+ "--enable-docs" "--disable-docs" &&
+
+config_query_option ICEDTEAWEB_PLUGIN "Build browser plugin?" y \
+ "--enable-plugin" "--disable-plugin"
+
diff --git a/java/icedtea-web/DEPENDS b/java/icedtea-web/DEPENDS
new file mode 100755
index 0000000..827b66f
--- /dev/null
+++ b/java/icedtea-web/DEPENDS
@@ -0,0 +1,15 @@
+depends gcc "--with-gcj=/usr/bin/gcj --with-ecj-jar=/usr/share/java/ecj.jar"
&&
+depends -sub CXX gcc &&
+depends -sub JAVA gcc &&
+depends -sub JAVAHOME gcc &&
+depends icedtea6 &&
+depends libx11 &&
+depends zlib &&
+depends firefox &&
+depends npapi-sdk &&
+
+optional_depends rhino \
+ "--with-rhino=/usr/lib/java/other/lib/js.jar" \
+ "--without-rhino" \
+ "Enable support for proxy auto config files?"
+
diff --git a/java/icedtea-web/DETAILS b/java/icedtea-web/DETAILS
new file mode 100755
index 0000000..e81068a
--- /dev/null
+++ b/java/icedtea-web/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=icedtea-web
+ VERSION=1.1.4
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://icedtea.classpath.org/download/source/$SOURCE
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ LICENSE[0]=GPL
+ KEYWORDS="java"
+ WEB_SITE=http://icedtea.classpath.org/wiki/IcedTea-Web
+ ENTERED=20111118
+ SHORT='Java browser plugin'
+cat << EOF
+Free Software web browser plugin running applets written in the Java
+programming language and an implementation of Java Web Start, originally
based
+on the NetX project.
+EOF
diff --git a/java/icedtea-web/HISTORY b/java/icedtea-web/HISTORY
new file mode 100644
index 0000000..5cfe68c
--- /dev/null
+++ b/java/icedtea-web/HISTORY
@@ -0,0 +1,2 @@
+2011-11-18 Robin Cook <rcook AT wyrms.net>
+ * NEW SPELL: DETAILS, DEPENDS, CONFIGURE, BUILD, INSTALL
diff --git a/java/icedtea-web/INSTALL b/java/icedtea-web/INSTALL
new file mode 100755
index 0000000..0e13bb5
--- /dev/null
+++ b/java/icedtea-web/INSTALL
@@ -0,0 +1,3 @@
+default_install &&
+
+ln -sfn $INSTALL_ROOT/usr/lib/IcedTeaPlugin.so
$INSTALL_ROOT/usr/lib/firefox/plugins
diff --git a/java/icedtea-web/icedtea-web-1.1.4.tar.gz.sig
b/java/icedtea-web/icedtea-web-1.1.4.tar.gz.sig
new file mode 100644
index 0000000..444ad6b
Binary files /dev/null and b/java/icedtea-web/icedtea-web-1.1.4.tar.gz.sig
differ
diff --git a/java/icedtea6/BUILD b/java/icedtea6/BUILD
new file mode 100755
index 0000000..6d5a5e1
--- /dev/null
+++ b/java/icedtea6/BUILD
@@ -0,0 +1,12 @@
+export PATH_HOLD="${PATH}" &&
+export JAVA_HOME="$BUILD_DIRECTORY/icedtea6-bin-1.10.4" &&
+export CLASSPATH=".:/usr/share/java" &&
+export PATH="${PATH}:${JAVA_HOME}/bin" &&
+
+OPTS="$ICEDTEA6_DOCS $ICEDTEA6_OPT $ICEDTEA6_PARA $OPTS" &&
+OPTS="--with-tzdata-dir=/usr/share/zoneinfo $OPTS" &&
+OPTS="--with-jdk-home=$BUILD_DIRECTORY/icedtea6-bin-1.10.4 $OPTS" &&
+
+unset JAVA_HOME &&
+
+default_build
diff --git a/java/icedtea6/CONFIGURE b/java/icedtea6/CONFIGURE
new file mode 100755
index 0000000..25110cc
--- /dev/null
+++ b/java/icedtea6/CONFIGURE
@@ -0,0 +1,11 @@
+config_query_option ICEDTEA6_DOCS "Generate Documentation?" y \
+ "--enable-docs" \
+ "--disable-docs" &&
+
+config_query_option ICEDTEA6_OPT "Enable build optimizations?" y \
+ "--enable-optimizations" \
+ "--disable-optimizations" &&
+
+config_query_option ICEDTEA6_PARA "Use parallel build?" n \
+ "--with-parallel-jobs" \
+ "--without-parallel-jobs"
diff --git a/java/icedtea6/CONFLICTS b/java/icedtea6/CONFLICTS
new file mode 100755
index 0000000..0e66666
--- /dev/null
+++ b/java/icedtea6/CONFLICTS
@@ -0,0 +1,6 @@
+conflicts j2sdk &&
+conflicts j2sdk-bin &&
+conflicts jre1.5-bin &&
+conflicts jre6-bin &&
+conflicts jdk1.5-bin &&
+conflicts jdk6-bin
diff --git a/java/icedtea6/DEPENDS b/java/icedtea6/DEPENDS
new file mode 100755
index 0000000..fe59933
--- /dev/null
+++ b/java/icedtea6/DEPENDS
@@ -0,0 +1,44 @@
+depends gcc "--with-gcj=/usr/bin/gcj --with-ecj-jar=/usr/share/java/ecj.jar"
&&
+depends -sub CXX gcc
&&
+depends -sub JAVA gcc
&&
+depends -sub JAVAHOME gcc
&&
+depends lsb-release
&&
+depends pkgconfig
&&
+depends zip
&&
+depends unzip
&&
+depends libxslt
&&
+depends ant "--with-ant-home=/opt/ant"
&&
+depends cups
&&
+depends JPEG
&&
+depends libpng
&&
+depends alsa-lib
&&
+depends xproto
&&
+depends libx11
&&
+depends libxt
&&
+depends libxp
&&
+depends libxinerama
&&
+depends freetype2
&&
+depends gtk+2
&&
+depends ca-certificates "--enable-cacerts"
&&
+
+optional_depends rhino
\
+ "--with-rhino=/usr/lib/java/other/lib/js.jar"
\
+ "--without-rhino"
\
+ "Add javascript support?"
&&
+
+optional_depends pulseaudio
\
+ "--enable-pulse-java"
\
+ "--disable-pulse-java"
\
+ "Enable pulse-java - an audio mixer spi that uses
PulseAudio?" &&
+
+optional_depends libxrender
\
+ "--enable-xrender"
\
+ "--disable-xrender"
\
+ "Enable inclusion of xrender pipeline?"
&&
+
+optional_depends nss
\
+ "--enable-nss"
\
+ "--disable-nss"
\
+ "Enable inclusion of NSS security provider?"
&&
+
+optional_depends fastjar "" "" "Use fashjar instead of slow jar?"
diff --git a/java/icedtea6/DETAILS b/java/icedtea6/DETAILS
new file mode 100755
index 0000000..18a68c3
--- /dev/null
+++ b/java/icedtea6/DETAILS
@@ -0,0 +1,69 @@
+ SPELL=icedtea6
+if [ "$ICEDTEA6_BRANCH" == "scm" ]; then
+ if [ "$ICEDTEA6_AUTOUPDATE" == "y" ]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=hg
+ fi
+ SOURCE=$SPELL-hg.tar.bz2
+ SOURCE3=openjdk-6-src-b24-14_nov_2011.tar.gz
+ SOURCE5=jaxp144_03.zip
+ SOURCE6=jdk6-jaxws2_1_6-2011_06_13.zip
+FORCE_DOWNLOAD[1]=on
+ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-hg
+ SOURCE_URL[0]=hg_http://icedtea.classpath.org/hg/$SPELL:$SPELL-hg
+ SOURCE3_URL[0]=http://download.java.net/openjdk/jdk6/promoted/b24/$SOURCE3
+ SOURCE_IGNORE=volatile
+ PATCHLEVEL=1
+else
+ VERSION=1.10.4
+ SOURCE=$SPELL-$VERSION.tar.gz
+ SOURCE2=$SOURCE.sig
+ SOURCE3=openjdk-6-src-b22-28_feb_2011.tar.gz
+ SOURCE5=jaxp144_01.zip
+ SOURCE6=jdk6-jaxws-b20.zip
+ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_GPG="icedtea.gpg:${SOURCE2}:UPSTREAM_KEY"
+ SOURCE2_IGNORE=signature
+ SOURCE_URL[0]=http://icedtea.classpath.org/download/source/$SOURCE
+ SOURCE2_URL[0]=http://icedtea.classpath.org/download/source/$SOURCE2
+ SOURCE3_URL[0]=http://download.java.net/openjdk/jdk6/promoted/b22/$SOURCE3
+fi
+ SOURCE4=jdk6-jaf-b20.zip
+case "${SMGL_COMPAT_ARCHS[0]}" in
+ ia32|32)
+ SOURCE7=icedtea6-bin-core-1.10.4-x86.tar.bz2
+ ;;
+ x86-64|64)
+ if [[ "${SMGL_COMPAT_ARCHS[@]/32/}" == "${SMGL_COMPAT_ARCHS[@]}" ]]; then
+ SOURCE7=icedtea6-bin-core-1.10.4-amd64.tar.bz2
+ else
+ SOURCE7=icedtea6-bin-core-1.10.4-x86.tar.bz2
+ fi
+ ;;
+esac
+ SOURCE3_GPG="gurus.gpg:${SOURCE3}.sig"
+ SOURCE4_GPG="gurus.gpg:${SOURCE4}.sig"
+ SOURCE5_GPG="gurus.gpg:${SOURCE5}.sig"
+ SOURCE6_GPG="gurus.gpg:${SOURCE6}.sig"
+ SOURCE7_GPG="gurus.gpg:${SOURCE7}.sig"
+ SOURCE4_URL[0]=http://icedtea.classpath.org/download/drops/$SOURCE4
+ SOURCE5_URL[0]=http://icedtea.classpath.org/download/drops/$SOURCE5
+ SOURCE6_URL[0]=http://icedtea.classpath.org/download/drops/$SOURCE6
+ SOURCE7_URL[0]=http://distfiles.gentoo.org/distfiles/$SOURCE7
+ LICENSE[0]=GPL
+ KEYWORDS="JAVA"
+ WEB_SITE=http://icedtea.classpath.org/wiki/Main_Page
+ ENTERED=20111023
+ SHORT='Harness to build OpenJDK with Free Software build tools'
+cat << EOF
+The IcedTea project provides a harness to build the source code from
+http://openjdk.java.net using Free Software build tools and adds a number of
key
+features to the upstream OpenJDK codebase:
+
+A Free 64-bit plugin with LiveConnect and Java Web Start support
+(see IcedTea-Web).
+Support for additional platforms via a pure interpreted mode in HotSpot
(Zero)
+or the alternative CACAO virtual machine. Experimental JIT support for Zero
is
+also available via Shark.
+EOF
diff --git a/java/icedtea6/FINAL b/java/icedtea6/FINAL
new file mode 100755
index 0000000..1b4e0f1
--- /dev/null
+++ b/java/icedtea6/FINAL
@@ -0,0 +1,5 @@
+default_final &&
+rm -rf $BUILD_DIRECTORY/doc &&
+rm -rf $BUILD_DIRECTORY/icedtea6-bin-1.10.4 &&
+export PATH="$PATH_HOLD"
+
diff --git a/java/icedtea6/INSTALL b/java/icedtea6/INSTALL
new file mode 100755
index 0000000..50fc51e
--- /dev/null
+++ b/java/icedtea6/INSTALL
@@ -0,0 +1,10 @@
+cp -R openjdk.build/j2sdk-image ${INSTALL_ROOT}/usr/lib/icedtea6-${VERSION}
&&
+chown -R root:root ${INSTALL_ROOT}/usr/lib/icedtea6-${VERSION}
&&
+mkdir -p ${INSTALL_ROOT}/etc/profile.d/
&&
+install -m 0644 $SCRIPT_DIRECTORY/java.sh ${INSTALL_ROOT}/etc/profile.d/
&&
+cd ${INSTALL_ROOT}/usr/lib
&&
+ln -sfn icedtea6-${VERSION}/ j2sdk
&&
+ln -sfn icedtea6-${VERSION}/ java6
&&
+cd $SOURCE_DIRCETORY
+
+
diff --git a/java/icedtea6/PREPARE b/java/icedtea6/PREPARE
new file mode 100755
index 0000000..83f15d3
--- /dev/null
+++ b/java/icedtea6/PREPARE
@@ -0,0 +1,3 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
+
diff --git a/java/icedtea6/PRE_BUILD b/java/icedtea6/PRE_BUILD
new file mode 100755
index 0000000..609977f
--- /dev/null
+++ b/java/icedtea6/PRE_BUILD
@@ -0,0 +1,29 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+mkdir drops &&
+verify_file 3 &&
+cp $SOURCE_CACHE/$SOURCE3 ./ &&
+verify_file 4 &&
+cp $SOURCE_CACHE/$SOURCE4 ./drops &&
+verify_file 5 &&
+cp $SOURCE_CACHE/$SOURCE5 ./drops &&
+verify_file 6 &&
+cp $SOURCE_CACHE/$SOURCE6 ./drops &&
+
+
+if [ "$ICEDTEA6_BRANCH" == "scm" ]; then
+ patch -p1 < $SCRIPT_DIRECTORY/icedtea6-hg-generate_cacerts-1.patch
&&
+ patch -p1 < $SCRIPT_DIRECTORY/icedtea6-hg-fixed_paths.patch