From owner-cvs-all@FreeBSD.ORG  Fri Dec  2 22:24:02 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1244B16A41F;
	Fri,  2 Dec 2005 22:24:02 +0000 (GMT)
	(envelope-from glewis@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CCF4F43D6A;
	Fri,  2 Dec 2005 22:24:01 +0000 (GMT)
	(envelope-from glewis@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB2MO1k3089678;
	Fri, 2 Dec 2005 22:24:01 GMT
	(envelope-from glewis@repoman.freebsd.org)
Received: (from glewis@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB2MO1LG089677;
	Fri, 2 Dec 2005 22:24:01 GMT (envelope-from glewis)
Message-Id: <200512022224.jB2MO1LG089677@repoman.freebsd.org>
From: Greg Lewis <glewis@FreeBSD.org>
Date: Fri, 2 Dec 2005 22:24:01 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/java/jdk15 Makefile ports/java/jdk15/files
 patch-j2se::zlib-1.1.3::zconf.h
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Dec 2005 22:24:02 -0000

glewis      2005-12-02 22:24:01 UTC

  FreeBSD ports repository

  Modified files:
    java/jdk15           Makefile 
  Added files:
    java/jdk15/files     patch-j2se::zlib-1.1.3::zconf.h 
  Log:
  . "Privatise" the symbols in libzip.so to avoid conflicting with those
    in the systems libz.so.  This conflict broke applications such as
    Eclipse which is linked with libz.so (via gtk+ I believe).
  
    This is a slightly modified version of the submitter's patch.
  
    A better solution may be to link with the system's libz.so and remove
    the JDK's internal zlib code altogether, but I'd like to test that a
    little more first.  Until then this solves the problem.
  . Bump PORTREVISION since Eclipse seems to be quite widely used.
  
  Submitted by:   "Arno J. Klaassen" <arno@heho.snv.jussieu.fr>
  
  Revision  Changes    Path
  1.97      +1 -1      ports/java/jdk15/Makefile
  1.1       +85 -0     ports/java/jdk15/files/patch-j2se::zlib-1.1.3::zconf.h (new)