From f14fd9fdfd6b8744d2266a30ae62be7dea9b84b2 Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Sat, 17 Dec 2005 16:14:48 +0000 Subject: [PATCH] . USE_ICONV is required whether we're building the web parts or not. PR: 89512 Submitted by: girgen --- java/jdk15/Makefile | 3 ++- java/jdk16/Makefile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile index 9e24158785cf..b44b94c0ac22 100644 --- a/java/jdk15/Makefile +++ b/java/jdk15/Makefile @@ -29,6 +29,8 @@ RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper WITHOUT_WEB= yes .endif +USE_ICONV= yes + .if defined(WITHOUT_WEB) MAKE_ENV+= DONT_BUILD_DEPLOY="YES" .else @@ -43,7 +45,6 @@ BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/mozilla-plugin.pc:${PORTSDIR}/www/m RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/mozilla-plugin.pc:${PORTSDIR}/www/mozilla MAKE_ENV+= BROWSER=mozilla .endif -USE_ICONV= yes MAKE_ENV+= ALT_MOZILLA_HEADERS_PATH="${X11BASE}/include" .endif diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile index 9e24158785cf..b44b94c0ac22 100644 --- a/java/jdk16/Makefile +++ b/java/jdk16/Makefile @@ -29,6 +29,8 @@ RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper WITHOUT_WEB= yes .endif +USE_ICONV= yes + .if defined(WITHOUT_WEB) MAKE_ENV+= DONT_BUILD_DEPLOY="YES" .else @@ -43,7 +45,6 @@ BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/mozilla-plugin.pc:${PORTSDIR}/www/m RUN_DEPENDS+= ${X11BASE}/libdata/pkgconfig/mozilla-plugin.pc:${PORTSDIR}/www/mozilla MAKE_ENV+= BROWSER=mozilla .endif -USE_ICONV= yes MAKE_ENV+= ALT_MOZILLA_HEADERS_PATH="${X11BASE}/include" .endif