Fix missing symbols after re-appearance of converters/libiconv on 10+. This

actually fixes java/icedtea-web because libsplashscreen.so was looking for
libiconv_open() and libiconv_close() from libiconv instead of iconv_open()
and iconv_close() from libc.  Tidy up compiler/linker flags while I am here.

2 files changed, 25 insertions, 26 deletions

diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile
index 9468073c283f..e96a33c3c685 100644
--- a/java/openjdk6/Makefile
+++ b/java/openjdk6/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openjdk6
 PORTVERSION=	b30
-PORTREVISION?=	1
+PORTREVISION?=	2
 PORTEPOCH=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} \
@@ -184,14 +184,13 @@ COPYFILES=	\
 
 .include <bsd.port.pre.mk>
 
-.if ${ICONV_PREFIX} == "/usr"
-ICONV_INCLUDE=
-ICONV_LIBS=
+.if empty(ICONV_LIB)
+ICONV_CPPFLAGS=	-DLIBICONV_PLUG
 .else
-ICONV_INCLUDE=	-I${LOCALBASE}/include
-ICONV_LIBS=	-L${LOCALBASE}/lib ${ICONV_LIB}
+ICONV_CPPFLAGS=	-I${LOCALBASE}/include
+ICONV_LDFLAGS=	-L${LOCALBASE}/lib ${ICONV_LIB}
 .endif
-ZLIB_LIBS?=	-lz
+ZLIB_LDFLAGS?=	-lz
 
 .if ${COMPILER_TYPE} == "clang"
 MAKE_ENV+=	USE_CLANG=true
@@ -224,7 +223,7 @@ post-extract:
 	    -e s/Linux/FreeBSD/g {} \;
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|%%CXX_LIBS%%|${CXX_LIBS}|" \
+	@${REINPLACE_CMD} -e "s|%%CXX_LDFLAGS%%|${CXX_LDFLAGS}|" \
 	    ${WRKSRC}/corba/make/common/Defs-bsd.gmk \
 	    ${WRKSRC}/jdk/make/common/Defs-bsd.gmk
 .if ${COMPILER_TYPE} == "clang"
@@ -233,12 +232,12 @@ post-patch:
 	    ${WRKSRC}/hotspot/make/bsd/makefiles/amd64.make \
 	    ${WRKSRC}/jdk/make/common/Defs-bsd.gmk
 .endif
-	@${REINPLACE_CMD} -e "s|%%ICONV_INC%%|${ICONV_INCLUDE}|" \
-	    -e "s|%%ICONV_LIB%%|${ICONV_LIBS}|" \
+	@${REINPLACE_CMD} -e "s|%%ICONV_CPPFLAGS%%|${ICONV_CPPFLAGS}|" \
+	    -e "s|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|" \
 	    ${WRKSRC}/Makefile ${WRKSRC}/jdk/make/java/instrument/Makefile \
 	    ${WRKSRC}/jdk/make/java/npt/Makefile \
 	    ${WRKSRC}/jdk/make/sun/splashscreen/Makefile
-	@${REINPLACE_CMD} -e "s|%%ZLIB_LIBS%%|${ZLIB_LIBS}|" \
+	@${REINPLACE_CMD} -e "s|%%ZLIB_LDFLAGS%%|${ZLIB_LDFLAGS}|" \
 	    ${WRKSRC}/jdk/make/com/sun/java/pack/Makefile \
 	    ${WRKSRC}/jdk/make/common/Program.gmk \
 	    ${WRKSRC}/jdk/make/java/jli/Makefile \
diff --git a/java/openjdk6/files/patch-set b/java/openjdk6/files/patch-set
index ab9e6d2b3d75..ecc0e8d1560d 100644
--- a/java/openjdk6/files/patch-set
+++ b/java/openjdk6/files/patch-set
@@ -10,8 +10,8 @@
 +    OTHER_LDLIBS += -liconv
 +  else
 +    ifneq ($(OS_NAME), netbsd)
-+      CPPFLAGS += %%ICONV_INC%%
-+      OTHER_LDLIBS += %%ICONV_LIB%%
++      CPPFLAGS += %%ICONV_CPPFLAGS%%
++      OTHER_LDLIBS += %%ICONV_LDFLAGS%%
 +    endif
 +  endif
 +endif
@@ -128,7 +128,7 @@
  override LIBCXX                  = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic
  else
 -override LIBCXX                  = -lstdc++
-+override LIBCXX                  = %%CXX_LIBS%%
++override LIBCXX                  = %%CXX_LDFLAGS%%
  endif
  override LIBPOSIX4               =
  override LIBSOCKET               =
@@ -3070,7 +3070,7 @@
    OTHER_CXXFLAGS += $(ZINCLUDE)
    LDDFLAGS += $(ZIPOBJS)
 + else
-+  LDDFLAGS += %%ZLIB_LIBS%%
++  LDDFLAGS += %%ZLIB_LDFLAGS%%
 +  OTHER_CXXFLAGS += -DSYSTEM_ZLIB
 + endif
  else
@@ -3309,7 +3309,7 @@
  override LIBCXX                  = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic
  else
 -override LIBCXX                  = -lstdc++
-+override LIBCXX                  = %%CXX_LIBS%%
++override LIBCXX                  = %%CXX_LDFLAGS%%
  endif
  override LIBPOSIX4               =
  override LIBSOCKET               =
@@ -3413,7 +3413,7 @@
 +    LDFLAGS += -Wl,--export-dynamic
 +  endif
 +  ifeq ($(SYSTEM_ZLIB),true)
-+      OTHER_LDLIBS += %%ZLIB_LIBS%%
++      OTHER_LDLIBS += %%ZLIB_LDFLAGS%%
 +  endif
 +endif
  ifneq (,$(findstring $(PLATFORM), linux solaris))	# UNIX systems
@@ -3862,8 +3862,8 @@
 +    LDFLAGS += -Wl,--no-whole-archive
 +  endif
 +# Use CPPFLAGS instead of OTHER_INCLUDES to force this last
-+  CPPFLAGS += %%ICONV_INC%%
-+  OTHER_LDLIBS += %%ICONV_LIB%%
++  CPPFLAGS += %%ICONV_CPPFLAGS%%
++  OTHER_LDLIBS += %%ICONV_LDFLAGS%%
 +else
    LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli
    OTHER_LDLIBS += -ljli
@@ -4014,7 +4014,7 @@
 +ifneq ($(SYSTEM_ZLIB),true)
 +  OTHER_INCLUDES += -I$(ZIP_SRC)
 +else
-+  LDLIBS += %%ZLIB_LIBS%%
++  LDLIBS += %%ZLIB_LDFLAGS%%
 +endif
  
  #
@@ -4175,8 +4175,8 @@
 +    OTHER_LDLIBS += -liconv
 +  else
 +    ifneq ($(OS_NAME), netbsd)
-+      CPPFLAGS += %%ICONV_INC%%
-+      OTHER_LDLIBS += %%ICONV_LIB%%
++      CPPFLAGS += %%ICONV_CPPFLAGS%%
++      OTHER_LDLIBS += %%ICONV_LDFLAGS%%
 +    endif
 +  endif
 +endif
@@ -4283,7 +4283,7 @@
  # Link to JVM library for JVM_Zip* functions
  #
 +ifeq ($(SYSTEM_ZLIB),true)
-+OTHER_LDLIBS = %%ZLIB_LIBS%%
++OTHER_LDLIBS = %%ZLIB_LDFLAGS%%
 +else
  OTHER_LDLIBS = $(JVMLIB)
 +endif
@@ -4665,8 +4665,8 @@
 +    CFLAGS += -DPNG_NO_MMX_CODE
 +    CPPFLAGS += -I$(OPENWIN_HOME)/include \
 +                -I$(OPENWIN_HOME)/include/X11/extensions
-+    CPPFLAGS += %%ICONV_INC%%
-+    OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext %%ICONV_LIB%% $(LIBM) -pthread
++    CPPFLAGS += %%ICONV_CPPFLAGS%%
++    OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext %%ICONV_LDFLAGS%% $(LIBM) -pthread
 +  else
 +    CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
 +    OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
@@ -4767,7 +4767,7 @@
 -      FT_OPTIONS += -Wl,-rpath -Wl,$(FT_LIB) -lfreetype
 +  else 
 +    ifeq ($(PLATFORM), bsd)
-+      FT_OPTIONS += -lfreetype %%ZLIB_LIBS%%
++      FT_OPTIONS += -lfreetype %%ZLIB_LDFLAGS%%
 +    else # linux
 +        FT_OPTIONS += -Wl,-rpath -Wl,$(FREETYPE_LIB_PATH) -lfreetype
 +    endif