$OpenBSD: patch-j2se_make_common_Program_gmk,v 1.1 2008/12/22 13:16:56 kurt Exp $
--- j2se/make/common/Program.gmk.orig	Sun Dec 21 09:15:57 2008
+++ j2se/make/common/Program.gmk	Sun Dec 21 17:56:38 2008
@@ -56,6 +56,9 @@ ifeq ($(PLATFORM), bsd)
         LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
         LDFLAGS += -Wl,--no-whole-archive
     endif
+    ifeq ($(SYSTEM_ZLIB),true)
+        OTHER_LDLIBS += -lz
+    endif
 endif
 ifneq (,$(findstring $(PLATFORM), linux solaris))	# UNIX systems
     LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli
@@ -242,7 +245,9 @@ OTHER_CPPFLAGS += -DHAVE_GETHRTIME
 endif
 
 OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)/bin -I$(LAUNCHER_PLATFORM_SRC)/bin
+ifneq ($(SYSTEM_ZLIB),true)
 OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+endif
 
 # this may not be necessary...
 ifeq ($(PLATFORM), windows)
