$NetBSD: patch-ak,v 1.7 2014/07/25 20:35:14 ryoon Exp $

Additional rpaths.

--- jdk/make/common/Defs-bsd.gmk.orig	2014-06-14 20:38:28.000000000 +0000
+++ jdk/make/common/Defs-bsd.gmk
@@ -328,8 +328,8 @@ Z_ORIGIN_FLAG/zero  = -Xlinker -z -Xlink
 
 LDFLAG_Z_ORIGIN = $(Z_ORIGIN_FLAG/$(ARCH_FAMILY))
 
-LDFLAGS_COMMON += $(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN
-LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=$(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN/%)
+LDFLAGS_COMMON += -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH}/server -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH}
+
 
 #
 # -L paths for finding and -ljava
@@ -380,6 +380,11 @@ endif
 
 # Using map files currently break compilation on FreeBSD during shared library
 # checks for some of the AWT native libraries.
+ifeq ($(OS_VENDOR), DragonFly)
+LDNOMAP=true
+endif
+
+#
 ifeq ($(OS_VENDOR), FreeBSD)
 LDNOMAP=true
 endif
@@ -391,7 +396,7 @@ endif
 # the library itself should not.
 #
 VM_NAME         = server
-JVMLIB          = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
+JVMLIB          = -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH} -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
 JAVALIB         = -ljava $(JVMLIB)
 
 #
@@ -454,6 +459,14 @@ ifeq ($(OS_VENDOR), OpenBSD)
   SYSTEM_ZLIB = true
 endif
 
+ifeq ($(OS_VENDOR), NetBSD)
+  SYSTEM_ZLIB = true
+endif
+
+ifeq ($(OS_VENDOR), DragonFlyBSD)
+  SYSTEM_ZLIB = true
+endif
+
 #
 # Japanese manpages
 #
