. Add ${LOCALBASE}/lib to the default search path for libraries when using

JNI.

XXX: Maybe ${X11BASE}/lib and /lib (5.x dynamic root support) should also
     be added?  /lib is part of the default search path on Linux.

Requested by:	marcus

java/jdk13/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk13.html
@@ -48,6 +48,7 @@ JDK_PATCHSET_VERSION=	9
 
 ONLY_FOR_ARCHS=	i386
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 RESTRICTED=	"Redistribution of pre-compiled binaries is not permitted"
 NO_CDROM=	"Redistribution of pre-compiled binaries is not permitted"
 MAKE_ENV=	ALT_BOOTDIR="${JDK13DIR}" \
@@ -86,7 +87,6 @@ PLIST_SUB+=	DEBUG:=""
 .if defined(WITH_NATIVE_THREADS) || defined(WITH_HOTSPOT)
 PLIST_SUB+=	NATIVE:=""
 MAKE_ARGS+=	HPIS="green native"
-USE_REINPLACE=	yes
 .else
 PLIST_SUB+=	NATIVE:="@comment "
 .endif
@@ -191,6 +191,8 @@ pre-patch:
 
 post-patch:
 	@-${FIND} ${WRKDIR} -name SCCS -exec ${RM} -rf {} \;
+	@${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \
+		${WRKSRC}/../src/solaris/javavm/runtime/javai_md.c
 .if defined(WITH_NATIVE_THREADS) || defined(WITH_HOTSPOT)
 	@for file in ${PTHREAD_FILES}; do \
 		${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g" ${WRKSRC}/$${file}; \

java/jdk13/files/patch-javai_md.c

@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- ../src/solaris/javavm/runtime/javai_md.c	24 Jul 2003 07:06:56 -0000	1.7
++++ ../src/solaris/javavm/runtime/javai_md.c	15 Jan 2004 07:37:23 -0000
+@@ -137,7 +137,7 @@
+ #ifdef __linux__
+ #define DEFAULT_LD_LIBRARY_PATH "/usr/lib:/lib" /* See ld.so(8) */
+ #else
+-#define DEFAULT_LD_LIBRARY_PATH "/usr/lib" /* See ld.so.1(1) */
++#define DEFAULT_LD_LIBRARY_PATH "/usr/lib:%%LOCALBASE%%/lib" /* See ld.so.1(1) */
+ #endif
+     {
+ 	/* Get the user setting of LD_LIBRARY_PATH */