From owner-svn-ports-head@freebsd.org  Thu Mar 28 23:19:01 2019
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C17DA154E652;
 Thu, 28 Mar 2019 23:19:01 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 2ECD669FAC;
 Thu, 28 Mar 2019 23:19:01 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1592B262ED;
 Thu, 28 Mar 2019 23:19:01 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2SNJ0f9063723;
 Thu, 28 Mar 2019 23:19:00 GMT (envelope-from jkim@FreeBSD.org)
Received: (from jkim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2SNJ0OT063720;
 Thu, 28 Mar 2019 23:19:00 GMT (envelope-from jkim@FreeBSD.org)
Message-Id: <201903282319.x2SNJ0OT063720@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jkim set sender to
 jkim@FreeBSD.org using -f
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 28 Mar 2019 23:19:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r497060 - in head/java/openjdk11: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: jkim
X-SVN-Commit-Paths: in head/java/openjdk11: . files
X-SVN-Commit-Revision: 497060
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 2ECD669FAC
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.96 / 15.00];
 local_wl_from(0.00)[FreeBSD.org];
 NEURAL_HAM_MEDIUM(-1.00)[-0.997,0];
 NEURAL_HAM_SHORT(-0.96)[-0.962,0];
 NEURAL_HAM_LONG(-1.00)[-1.000,0];
 ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Mar 2019 23:19:02 -0000

Author: jkim
Date: Thu Mar 28 23:19:00 2019
New Revision: 497060
URL: https://svnweb.freebsd.org/changeset/ports/497060

Log:
  Refine r496923.
  
  libinstrument.so and libjdwp.so do not need anything from $LOCALBASE but
  libsplashscreen.so does.  For example,
  
  % cd /usr/local/openjdk11
  % bin/java -jar demo/jfc/SwingSet2/SwingSet2.jar
  ld-elf.so.1: /usr/local/openjdk11/lib/libsplashscreen.so: Undefined symbol
  "libiconv_open"
  
  PR:		236759

Modified:
  head/java/openjdk11/Makefile
  head/java/openjdk11/files/patch-make_autoconf_libraries.m4

Modified: head/java/openjdk11/Makefile
==============================================================================
--- head/java/openjdk11/Makefile	Thu Mar 28 22:51:35 2019	(r497059)
+++ head/java/openjdk11/Makefile	Thu Mar 28 23:19:00 2019	(r497060)
@@ -2,7 +2,7 @@
 
 PORTNAME=	openjdk
 PORTVERSION=	${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 MASTER_SITES=	https://github.com/battleblow/openjdk-jdk11u/archive/
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
@@ -111,10 +111,11 @@ BUILD_DEPENDS+=		${BOOTSTRAPJDKDIR}/bin/javac:java/boo
 JDK_BUILD_JVM=	server
 
 .if empty(ICONV_LIB)
-ICONV_CPPFLAGS=	-DLIBICONV_PLUG
+ICONV_CFLAGS=	-DLIBICONV_PLUG
 .else
-ICONV_CPPFLAGS=	-I${LOCALBASE}/include
-ICONV_LDFLAGS=	-L${LOCALBASE}/lib ${ICONV_LIB}
+ICONV_CFLAGS=	-I${LOCALBASE}/include
+ICONV_LDFLAGS=	-L${LOCALBASE}/lib
+ICONV_LIBS=	${ICONV_LIB}
 .endif
 
 post-patch:
@@ -123,6 +124,10 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/configure \
 		${WRKSRC}/src/hotspot/os/bsd/os_bsd.cpp
+	@${REINPLACE_CMD} -e 's|%%ICONV_CFLAGS%%|${ICONV_CFLAGS}|' \
+		-e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \
+		-e 's|%%ICONV_LIBS%%|${ICONV_LIBS}|' \
+		${WRKSRC}/make/autoconf/libraries.m4
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${INSTALLDIR}

Modified: head/java/openjdk11/files/patch-make_autoconf_libraries.m4
==============================================================================
--- head/java/openjdk11/files/patch-make_autoconf_libraries.m4	Thu Mar 28 22:51:35 2019	(r497059)
+++ head/java/openjdk11/files/patch-make_autoconf_libraries.m4	Thu Mar 28 23:19:00 2019	(r497060)
@@ -1,11 +1,17 @@
 --- make/autoconf/libraries.m4
 +++ make/autoconf/libraries.m4
-@@ -182,8 +182,8 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
+@@ -181,9 +181,13 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
+   LIBS="$save_LIBS"
  
    if test "x$OPENJDK_TARGET_OS" = "xbsd"; then
-     if test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.openbsd"; then
+-    if test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.openbsd"; then
 -      ICONV_CFLAGS="-I$PACKAGE_PATH/include"
 -      ICONV_LDFLAGS="-L$PACKAGE_PATH/lib"
++    if test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.freebsd"; then
++      ICONV_CFLAGS=%%ICONV_CFLAGS%%
++      ICONV_LDFLAGS=%%ICONV_LDFLAGS%%
++      ICONV_LIBS=%%ICONV_LIBS%%
++    elif test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.openbsd"; then
 +      ICONV_CFLAGS="-I/usr/local/include"
 +      ICONV_LDFLAGS="-L/usr/local/lib"
        ICONV_LIBS=-liconv