From owner-svn-ports-head@FreeBSD.ORG  Thu Oct 10 16:49:03 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 20092491;
 Thu, 10 Oct 2013 16:49:03 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0D9CB2A9D;
 Thu, 10 Oct 2013 16:49:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9AGn2Zn037680;
 Thu, 10 Oct 2013 16:49:02 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9AGn2VQ037679;
 Thu, 10 Oct 2013 16:49:02 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201310101649.r9AGn2VQ037679@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 10 Oct 2013 16:49:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r330018 - head/java/openjdk6
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Oct 2013 16:49:03 -0000

Author: jkim
Date: Thu Oct 10 16:49:02 2013
New Revision: 330018
URL: http://svnweb.freebsd.org/changeset/ports/330018

Log:
  - Remove redundant bsd.port.pre.mk.
  - Convert LIB_DEPENDS to new formats.
  
  Submitted by:	bar

Modified:
  head/java/openjdk6/Makefile

Modified: head/java/openjdk6/Makefile
==============================================================================
--- head/java/openjdk6/Makefile	Thu Oct 10 16:43:16 2013	(r330017)
+++ head/java/openjdk6/Makefile	Thu Oct 10 16:49:02 2013	(r330018)
@@ -25,7 +25,7 @@ LICENSE_DISTFILES=	${DISTNAME}${EXTRACT_
 BUILD_DEPENDS=	${LOCALBASE}/bin/zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
 		${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-client
-LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
 		${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
 
@@ -69,8 +69,6 @@ JTREG_BUILD=	b05_29_nov_2012
 JTREGFILE=	jtreg-4.1-bin-${JTREG_BUILD}.zip
 UPDATE_VERSION=	32
 
-.include <bsd.port.pre.mk>
-
 .if ${PORT_OPTIONS:MIPV6}
 CATEGORIES+=	ipv6
 .endif
@@ -147,7 +145,7 @@ MAKE_ENV+=	DONT_ENABLE_IPV6="YES"
 
 .if ${PORT_OPTIONS:MSOUND}
 EXTRA_PATCHES+=	${FILESDIR}/alsa-enable.patch
-LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
 RUN_DEPENDS+=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
 .else
 EXTRA_PATCHES+=	${FILESDIR}/alsa-disable.patch