--- patches/icedtea-copy-plugs.patch	2008-05-30 15:39:55.000000000 +0200
+++ patches/icedtea-copy-plugs.patch	2008-06-01 14:20:18.000000000 +0200
@@ -35,7 +35,7 @@
                  if (paramTypes.length != propertyNames.length) {
 --- openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk	2008-02-28 04:39:40.000000000 -0500
 +++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk	2008-02-29 14:28:47.000000000 -0500
-@@ -51,28 +51,19 @@
+@@ -49,33 +49,30 @@
  com/sun/jmx/snmp/SnmpDataTypeEnums.class \
  com/sun/jmx/snmp/SnmpDefinitions.class \
  com/sun/jmx/snmp/SnmpOid.class \
@@ -47,7 +47,7 @@
  com/sun/jmx/snmp/SnmpParameters.class \
  com/sun/jmx/snmp/SnmpPduPacket.class \
  com/sun/jmx/snmp/SnmpPeer.class \
-+rt/com/sun/jmx/snmp/SnmpSession.class \
++com/sun/jmx/snmp/SnmpSession.class \
  com/sun/jmx/snmp/SnmpTimeticks.class \
  com/sun/jmx/snmp/SnmpVarBind.class \
  com/sun/jmx/snmp/SnmpVarBindList.class \
@@ -64,10 +64,6 @@
 -com/sun/jmx/snmp/daemon/WaitQ.class
 +com/sun/jmx/snmp/daemon/SnmpSession.class
  
- PLUG_SOUND_CLASS_NAMES = \
- com/sun/media/sound/AbstractPlayer.class \
-@@ -128,8 +119,14 @@
- 
  # Class list temp files (used by both import and export of plugs)
  
 +PLUG_GNU_CLASS_NAMES = gnu
@@ -77,14 +73,14 @@
 +PLUG_NETX_CLASS_NAMES = net
 +
  PLUG_TEMPDIR=$(ABS_TEMPDIR)/plugs
--PLUG_CLASS_AREAS = jmf sound
-+PLUG_CLASS_AREAS = jmf sound gnu javax netx
+-PLUG_CLASS_AREAS = jmf
++PLUG_CLASS_AREAS = jmf gnu javax netx
  PLUG_CLISTS = $(PLUG_CLASS_AREAS:%=$(PLUG_TEMPDIR)/%.clist)
  
  # Create jargs file command
-@@ -152,6 +149,21 @@
- 	@for i in $(PLUG_SOUND_CLASS_NAMES) ; do \
- 	  $(ECHO) "$$i" >> $@ ; \
+@@ -93,11 +90,32 @@
+ 	@for i in $(PLUG_JMF_CLASS_NAMES) ; do \
+ 	  $(ECHO) "$$i" >> $@; \
  	done
 +$(PLUG_TEMPDIR)/gnu.clist:
 +	@$(prep-target)
@@ -104,9 +100,7 @@
  $(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS)
  	@$(prep-target)
  	$(CAT) $(PLUG_CLISTS) > $@
-@@ -159,6 +171,12 @@
- 	$(plug-create-jargs)
- $(PLUG_TEMPDIR)/sound.jargs: $(PLUG_TEMPDIR)/sound.clist
+ $(PLUG_TEMPDIR)/jmf.jargs: $(PLUG_TEMPDIR)/jmf.clist
  	$(plug-create-jargs)
 +$(PLUG_TEMPDIR)/gnu.jargs: $(PLUG_TEMPDIR)/gnu.clist
 +	$(plug-create-jargs)
@@ -117,7 +111,7 @@
  $(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist
  	$(plug-create-jargs)
  
-@@ -188,9 +206,9 @@
+@@ -125,9 +143,9 @@
  # Import classes command
  
  define import-binary-plug-classes
@@ -129,10 +123,10 @@
  endef # import-binary-plug-classes
  
  else # IMPORT_BINARY_PLUGS
-@@ -220,12 +238,21 @@
+@@ -153,11 +171,20 @@
+ 
+ import-binary-plug-jmf-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/jmf.clist
  	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/jmf.clist)
- import-binary-plug-sound-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/sound.clist
- 	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/sound.clist)
 +import-binary-plug-gnu-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/gnu.clist
 +	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/gnu.clist)
 +import-binary-plug-javax-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/javax.clist
@@ -143,12 +137,11 @@
  # Import all classes from the jar file
  
  import-binary-plug-jar: \
- 	     import-binary-plug-jmf-classes \
--	     import-binary-plug-sound-classes
-+	     import-binary-plug-sound-classes \
+-	     import-binary-plug-jmf-classes
++	     import-binary-plug-jmf-classes \
 +	     import-binary-plug-gnu-classes \
 +	     import-binary-plug-javax-classes \
-+	     import-binary-plug-netx-classes \
++	     import-binary-plug-netx-classes
  
- # Import native libraries
+ # Binary plug start/complete messages
  
--- patches/icedtea-gervill.patch	2008-06-01 14:40:43.000000000 +0200
+++ patches/icedtea-gervill.patch	2008-06-01 14:42:37.000000000 +0200
@@ -1,33 +1,14 @@
 # Adds the provides defined by gervill (and removes non-existing ones).
 # Gervill can be found in the overlays under
 # openjdk/jdk/src/share/classes/com/sun/media/sound
---- openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider.orig	2008-04-30 16:12:37.000000000 +0200
-+++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider	2008-04-30 16:06:18.000000000 +0200
-@@ -1,5 +1,5 @@
- # Providers for midi devices
--com.sun.media.sound.MixerSynthProvider
- com.sun.media.sound.RealTimeSequencerProvider
- com.sun.media.sound.MidiOutDeviceProvider
- com.sun.media.sound.MidiInDeviceProvider
-+com.sun.media.sound.SoftProvider
 --- openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader.orig	2008-04-30 16:13:18.000000000 +0200
 +++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader	2008-04-30 16:07:16.000000000 +0200
-@@ -1,2 +1,6 @@
+@@ -1,4 +1,5 @@
  # Providers for Soundbanks
--com.sun.media.sound.HsbParser
 +com.sun.media.sound.PATSoundbankReader
-+com.sun.media.sound.DLSSoundbankReader
-+com.sun.media.sound.JARSoundbankReader
-+com.sun.media.sound.AudioFileSoundbankReader
-+com.sun.media.sound.SF2SoundbankReader
---- openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader.orig	2008-04-30 16:13:58.000000000 +0200
-+++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader	2008-04-30 16:01:27.000000000 +0200
-@@ -2,3 +2,5 @@
- com.sun.media.sound.AuFileReader
- com.sun.media.sound.AiffFileReader
- com.sun.media.sound.WaveFileReader
-+com.sun.media.sound.WaveFloatFileReader
-+com.sun.media.sound.SoftMidiAudioFileReader
+ com.sun.media.sound.SF2SoundbankReader
+ com.sun.media.sound.DLSSoundbankReader
+ com.sun.media.sound.AudioFileSoundbankReader
 --- /home/mark/src/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider	2008-04-13 01:05:30.000000000 +0200
 +++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider	2008-05-09 02:54:26.000000000 +0200
 @@ -2,3 +2,4 @@
--- Makefile.am.orig	2008-06-01 14:52:05.000000000 +0200
+++ Makefile.am	2008-06-01 14:52:28.000000000 +0200
@@ -1,6 +1,6 @@
-OPENJDK_DATE = 11_apr_2008
-OPENJDK_MD5SUM = 9ef5b6e83ec0c7a32bffd1a4de50fe5c
-OPENJDK_VERSION = b09
+OPENJDK_DATE = 30_may_2008
+OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f
+OPENJDK_VERSION = b10
 
 if NETX_PLUGIN
 NETX_PATCH = patches/icedtea-netx-plugin.patch
@@ -303,16 +303,13 @@
 	patches/icedtea-zero-build.patch \
 	patches/icedtea-print-lsb-release.patch \
 	patches/icedtea-jpegclasses.patch \
-	patches/icedtea-xinerama.patch \
 	patches/icedtea-arm-uname.patch \
 	patches/icedtea-ia64-fdlibm.patch \
 	patches/icedtea-LCMS-setTagData.patch \
 	patches/icedtea-color-createcontext.patch \
-	patches/icedtea-color-profiles.patch \
 	patches/icedtea-fonts.patch \
 	patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
-	patches/icedtea-hat-spl-gpl.patch \
 	patches/icedtea-sparc.patch \
 	patches/icedtea-override-redirect-metacity.patch \
 	$(GCC_PATCH) \