Index: head/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk
===================================================================
--- head/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk	(revision 392604)
+++ head/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk	(revision 392605)
@@ -1,20 +1,20 @@
 --- jdk/make/lib/Awt2dLibraries.gmk.orig	2015-07-18 14:30:01.000000000 -0700
 +++ jdk/make/lib/Awt2dLibraries.gmk	2015-07-18 14:30:08.000000000 -0700
 @@ -1259,7 +1259,7 @@
    else ifeq ($(OPENJDK_TARGET_OS), bsd)
      LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -I$(PACKAGE_PATH)/include
      ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd)
 -      LIBSPLASHSCREEN_CFLAGS += -DLIBICONV_PLUG
 +      LIBSPLASHSCREEN_CFLAGS += %%ICONV_CPPFLAGS%%
      endif
    else
      LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
 @@ -1285,7 +1285,7 @@
      # Solaris still uses OPENWIN_LIB ..
      LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread
    else ifeq ($(OPENJDK_TARGET_OS), bsd)
 -    LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -L$(PACKAGE_PATH)/lib -liconv -pthread
-+    LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -L$(PACKAGE_PATH)/lib %%ICONV_LDFLAGS%% -pthread
++    LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) %%ICONV_LDFLAGS%% -pthread
    else	# .. all other Unixes can use X_LIBS
      LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread
    endif
Index: head/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk
===================================================================
--- head/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk	(revision 392604)
+++ head/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk	(revision 392605)
@@ -1,16 +1,20 @@
 --- jdk/make/lib/CoreLibraries.gmk.orig	2015-07-18 14:40:01.000000000 -0700
 +++ jdk/make/lib/CoreLibraries.gmk	2015-07-18 14:40:47.000000000 -0700
-@@ -523,11 +523,11 @@
-     CFLAGS := $(CFLAGS_JDKLIB) \
-         -I$(JDK_TOPDIR)/src/share/npt \
-         -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \
--    CFLAGS_bsd := $(BSD_ICONV_CFLAGS), \
-+    CFLAGS_bsd := %%ICONV_CPPFLAGS%%, \
+@@ -510,7 +510,7 @@
+ ifeq ($(OPENJDK_TARGET_OS), bsd)
+   BSD_ICONV_CFLAGS:= -I$(PACKAGE_PATH)/include
+   ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd)
+-    BSD_ICONV_CFLAGS += -DLIBICONV_PLUG
++    BSD_ICONV_CFLAGS += %%ICONV_CPPFLAGS%%
+   endif
+ endif
+ 
+@@ -527,7 +527,7 @@
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnpt/mapfile-vers, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
 -    LDFLAGS_bsd := -L$(PACKAGE_PATH)/lib -liconv, \
 +    LDFLAGS_bsd := %%ICONV_LDFLAGS%%, \
      LDFLAGS_macosx := -liconv, \
      LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \
      LDFLAGS_SUFFIX_solaris := -lc, \
Index: head/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk
===================================================================
--- head/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk	(revision 392604)
+++ head/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk	(revision 392605)
@@ -1,20 +1,20 @@
 --- jdk/make/lib/ServiceabilityLibraries.gmk.orig	2015-07-18 14:43:00.000000000 -0700
 +++ jdk/make/lib/ServiceabilityLibraries.gmk	2015-07-18 14:44:25.000000000 -0700
-@@ -269,7 +269,7 @@
-     CFLAGS := $(LIBINSTRUMENT_CFLAGS), \
-     CFLAGS_debug := -DJPLIS_LOGGING, \
-     CFLAGS_release := -DNO_JPLIS_LOGGING, \
--    CFLAGS_bsd := $(BSD_ICONV_CFLAGS), \
-+    CFLAGS_bsd := %%ICONV_CPPFLAGS%%, \
-     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \
-     LDFLAGS := $(LDFLAGS_JDKLIB) \
-         $(call SET_SHARED_LIBRARY_ORIGIN) \
+@@ -255,7 +255,7 @@
+   endif
+   BSD_ICONV_CFLAGS:= -I$(PACKAGE_PATH)/include
+   ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd)
+-    BSD_ICONV_CFLAGS += -DLIBICONV_PLUG
++    BSD_ICONV_CFLAGS += %%ICONV_CPPFLAGS%%
+   endif
+ endif
+ 
 @@ -283,7 +283,7 @@
      LDFLAGS_SUFFIX_solaris := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc, \
      LDFLAGS_SUFFIX_linux := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL), \
      LDFLAGS_SUFFIX_aix := $(LIBZ) -L$(JDK_OUTPUTDIR)/objs -ljli_static $(LIBDL),\
 -    LDFLAGS_SUFFIX_bsd := -L$(PACKAGE_PATH)/lib -liconv $(LIBZ), \
 +    LDFLAGS_SUFFIX_bsd := %%ICONV_LDFLAGS%% $(LIBZ), \
      VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
      RC_FLAGS := $(RC_FLAGS) \
          -D "JDK_FNAME=instrument.dll" \