$NetBSD$

--- jdk/make/sun/Makefile.orig	2014-01-25 07:34:08.000000000 +0000
+++ jdk/make/sun/Makefile
@@ -54,7 +54,7 @@ ifneq ($(PLATFORM), windows)
       endif
     endif
   endif
-  HEADLESS_SUBDIR = headless
+#  HEADLESS_SUBDIR = headless
   XAWT_SUBDIR     = xawt
 endif
 
@@ -78,8 +78,9 @@ endif
 # nio need to be compiled before awt to have all charsets ready
 SUBDIRS            = jar security javazic misc net nio text launcher
 
+BUILD_HEADLESS_ONLY=true
 ifdef BUILD_HEADLESS_ONLY
-  DISPLAY_LIBS = awt $(HEADLESS_SUBDIR)
+  DISPLAY_LIBS = $(HEADLESS_SUBDIR)
   DISPLAY_TOOLS = 
 else
   DISPLAY_LIBS = awt splashscreen $(XAWT_SUBDIR) $(HEADLESS_SUBDIR)
@@ -87,7 +88,7 @@ else
 endif
 SUBDIRS_desktop    = audio $(RENDER_SUBDIR) image \
                      $(LWAWT_PRE_SUBDIR) $(DISPLAY_LIBS) $(DGA_SUBDIR) $(LWAWT_SUBDIR) \
-                     jawt font jpeg cmm $(DISPLAY_TOOLS) beans
+                    
 SUBDIRS_management = management
 SUBDIRS_misc       = $(ORG_SUBDIR) rmi $(JDBC_SUBDIR) tracing
 SUBDIRS_tools      = native2ascii serialver tools jconsole
