From d47ea7d65632826006a46449f176e19e9bfd4f93 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 10 Mar 2014 16:54:26 +0100
Subject: [PATCH] OpenJDK: remove outdated and broken recipe.

The one Ingo wrote looks lore solid, but needs support for building as
an hybrid.
---
 dev-lang/openjdk/openjdk-1.7.recipe   | 186 --------------------------
 dev-lang/openjdk/openjdk_setup_env.sh |  41 ------
 2 files changed, 227 deletions(-)
 delete mode 100644 dev-lang/openjdk/openjdk-1.7.recipe
 delete mode 100644 dev-lang/openjdk/openjdk_setup_env.sh

diff --git a/dev-lang/openjdk/openjdk-1.7.recipe b/dev-lang/openjdk/openjdk-1.7.recipe
deleted file mode 100644
index 151eeb701..000000000
--- a/dev-lang/openjdk/openjdk-1.7.recipe
+++ /dev/null
@@ -1,186 +0,0 @@
-DESCRIPTION="openjdk"
-HOMEPAGE="http://openjdk.java.net/"
-SRC_URI="http://ports-space.haiku-files.org/source/openjdk/j2sdk-april-2013.tar"
-REVISION="3"
-STATUS_HAIKU="stable"
-DEPEND="app-arch/cpio 	= 2.10
-	media-libs/freetype 	>= 2.4.9"
-
-CHECKSUM_MD5="e38b939c34b04427336245397fa43c9c"
-
-BUILD()
-{
-	OPENJDK_DIR=`haikuporter -t`/dev-lang/openjdk/work
-
-	# Get and build Apache Ant.
-	# Making a separate .bep file for it wasn't such a good idea.
-
-	wget -nc http://archive.apache.org/dist/ant/source/apache-ant-1.8.4-src.tar.gz
-	tar xvfz apache-ant-1.8.4-src.tar.gz
-	export LIBRARY_PATH=${OPENJDK_DIR}/j2sdk-image/jre/lib/i386/:$LIBRARY_PATH
-	export JAVA_HOME=${OPENJDK_DIR}/j2sdk-image
-	export ANT_HOME=${OPENJDK_DIR}/ant
-	cd apache-ant-1.8.4
-	sed -i 's/depends=\"jars,test-jar\"/depends=\"jars\"/' build.xml
-	sh build.sh install-lite
-	unset JAVA_HOME
-	cd ..
-
-	# Clone latest JDK repositories.
-	if [ "$(ls -A jdk)" ]; then
-		echo "jdk directory is not empty"
-	else
-		hg clone http://hg.openjdk.java.net/haiku/haiku jdk --debug
-	fi
-
-	if [ "$(ls -A jdk/corba)" ]; then
-		echo "jdk/corba directory is not empty"
-	else
-		hg clone http://hg.openjdk.java.net/haiku/haiku/corba jdk/corba --debug
-	fi
-
-	if [ "$(ls -A jdk/hotspot)" ]; then
-		echo "jdk/hotspot directory is not empty"
-	else
-		hg clone http://hg.openjdk.java.net/haiku/haiku/hotspot jdk/hotspot --debug
-	fi
-
-	if [ "$(ls -A jdk/jaxp)" ]; then
-		echo "jdk/jaxp directory is not empty"
-	else
-		hg clone http://hg.openjdk.java.net/haiku/haiku/jaxp jdk/jaxp --debug
-	fi
-
-	if [ "$(ls -A jdk/jaxws)" ]; then
-		echo "jdk/jaxws directory is not empty"
-	else
-		hg clone http://hg.openjdk.java.net/haiku/haiku/jaxws jdk/jaxws --debug
-	fi
-
-	if [ "$(ls -A jdk/jdk)" ]; then
-		echo "jdk/jdk directory is not empty"
-	else
-		hg clone http://hg.openjdk.java.net/haiku/haiku/jdk jdk/jdk --debug
-	fi
-
-	if [ "$(ls -A jdk/langtools)" ]; then
-		echo "jdk/langtools directory is not empty"
-	else
-		hg clone http://hg.openjdk.java.net/haiku/haiku/langtools jdk/langtools --debug
-	fi
-
-	export ALT_BOOTDIR=${OPENJDK_DIR}/j2sdk-image
-
-	# don't set ALT_JDK_IMPORT for a full build
-	# set jdk/README-build.html
-	# export ALT_JDK_IMPORT_PATH=${OPENJDK_DIR}/j2sdk-image
-
-	export ANT=${OPENJDK_DIR}/ant
-	export ALT_OUTPUTDIR=${OPENJDK_DIR}/output
-
-	# set jdk/README-build.html
-	export LANG=C
-
-	# add $ANT_HOME/bin to PATH
-	export PATH=$PATH:$ANT_HOME/bin
-
-	# use PATH to search commands rather than explicitly set path for each commands
-	# so that grep, egrep & readelf are automaticly found
-	# see Defs-haiku.gmk
-	export ALT_UNIXCOMMAND_PATH=
-
-	# mandatory GCC4 [requires at least 4.5.3]
-	setgcc gcc4
-
-	mkdir -p ${ALT_OUTPUTDIR}
-
-	# some sources downloaded while building have moved
-	# so we have to provide a directory where they have to reside to
-	export ALT_DROPS_DIR=${OPENJDK_DIR}/drop
-	mkdir -p ${ALT_DROPS_DIR}
-	export ALLOW_DOWNLOADS=false
-
-	# grab relocated sources
-	cd ${ALT_DROPS_DIR}
-	wget -nc http://ports-space.haiku-files.org/source/openjdk/jaxp145_01.zip
-	wget -nc http://ports-space.haiku-files.org/source/openjdk/jdk7-jaf-2010_08_19.zip
-	wget -nc http://ports-space.haiku-files.org/source/openjdk/jdk7-jaxws2_2_4-b03-2011_05_27.zip
-	cd ..
-
-	# Deploy certain headers, if they are missing.
-
-	HEADERS_DIR=`finddir B_SYSTEM_HEADERS_DIRECTORY`
-	MEDIA_DIR=${HEADERS_DIR}/os/media
-
-	if [ -e ${MEDIA_DIR}/SoundConsumer.h ] ;
-	then
-		echo SoundConsumer.h exists.
-	else
-		cp SoundConsumer.h ${MEDIA_DIR}/SoundConsumer.h
-		SOUND_CONSUMER_H=1
-		echo SoundConsumer.h was not found. Deployed private file instead.
-	fi
-
-	if [ -e ${MEDIA_DIR}/SoundUtils.h ] ;
-	then
-		echo SoundUtils.h exists.
-	else
-		cp SoundUtils.h ${MEDIA_DIR}/SoundUtils.h
-		declare SOUND_UTILS_H=1
-		echo SoundUtils.h was not found. Deployed private file instead.
-	fi
-
-	# small patch allowing to finish build without errors
-	# this modification already exists in another dev branch
-	# if someone fix it in current branch, using sed rathan than patch should not brake
-	# the whole build
-	if [ -e jdk/make/Defs-internal.gmk.org ];
-	then
-		echo Defs-internal exists.
-	else
-		mv jdk/make/Defs-internal.gmk jdk/make/Defs-internal.gmk.org
-	fi
-	cat jdk/make/Defs-internal.gmk.org | sed s/'$(PRINTF) "--'/'$(PRINTF) -- "--'/ >jdk/make/Defs-internal.gmk
-
-	# Build.
-	cd jdk
-	make
-
-	# Cleanup private files, if any were deployed.
-	# I don't really think it would harm anyone if we don't clean them up after compiling.
-
-#	if [ ${SOUND_CONSUMER_H} == 1 ] ;
-#	then
-#		rm -f ${MEDIA_DIR}/SoundConsumer.h
-#		echo Removed private SoundConsumer.h
-#	fi
-#
-#	if [ ${SOUND_UTILS_H} == 1 ] ;
-#	then
-#		rm -f ${MEDIA_DIR}/SoundUtils.h
-#		echo Removed private SoundUtils.h
-#	fi
-}
-
-INSTALL()
-{
-	# install
-	mkdir -p `finddir B_COMMON_DIRECTORY`/jdk
-	cp -r -f -v output/j2sdk-image/* `finddir B_COMMON_DIRECTORY`/jdk
-	# setup env
-	$(haikuporter -t)/dev-lang/openjdk/openjdk_setup_env.sh
-
-	# build distro
-	mkdir -p ${DESTDIR}`finddir B_COMMON_DIRECTORY`/jdk
-	cp -r -f -v output/j2sdk-image/* ${DESTDIR}`finddir B_COMMON_DIRECTORY`/jdk
-	mkdir -p ${DESTDIR}/boot/common/boot/post_install
-	cp -f $(haikuporter -t)/dev-lang/openjdk/openjdk_setup_env.sh ${DESTDIR}/boot/common/boot/post_install
-}
-
-TEST()
-{
-	echo "OpenJDK tests are not yet ported to Haiku."
-}
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2005, 2006, Oracle and/or its affiliates"
diff --git a/dev-lang/openjdk/openjdk_setup_env.sh b/dev-lang/openjdk/openjdk_setup_env.sh
deleted file mode 100644
index ef1cd2f39..000000000
--- a/dev-lang/openjdk/openjdk_setup_env.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-_progress () {
-	notify --type progress --group openJDK \
-		--icon /boot/system/kernel_x86 \
-		--messageID $0_$$ \
-		--title "Set OpenJDK env..." \
-		--progress "$1" "$2" >/dev/null
-}
-
-_progress 0.2 ".profile"
-cd
-if [ -e .profile ];
-then
-	echo
-else
-	touch .profile
-fi
-
-_progress 0.4 "JAVA_HOME"
-grep "export JAVA_HOME=" .profile >/dev/null
-if [ $? == 1 ];
-then
-	echo "export JAVA_HOME=\`finddir B_COMMON_DIRECTORY\`/jdk" >>.profile
-fi
-
-_progress 0.6 "PATH"
-grep "export PATH=\$JAVA_HOME/bin:\$PATH" .profile >/dev/null
-if [ $? == 1 ];
-then
-	echo "export PATH=\$JAVA_HOME/bin:\$PATH" >>.profile
-fi
-
-_progress 0.8 "LIBRARY_PATH"
-export _SEARCH=$JAVA_HOME/jre/lib/i386
-echo $_SEARCH | grep $LIBRARY_PATH >/dev/null
-grep "export LIBRARY_PATH=\$JAVA_HOME/jre/lib/i386:\$LIBRARY_PATH" .profile >/dev/null
-if [ $? == 1 ];
-then
-	echo "export LIBRARY_PATH=\$JAVA_HOME/jre/lib/i386:\$LIBRARY_PATH" >>.profile
-fi
-_progress 1.0 "done"