From owner-svn-ports-all@FreeBSD.ORG Thu Oct 10 16:52:52 2013 Return-Path: Delivered-To: svn-ports-all@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 8B0AC657 for ; Thu, 10 Oct 2013 16:52:52 +0000 (UTC) (envelope-from bsd-src@helfman.org) Received: from mail-pa0-f48.google.com (mail-pa0-f48.google.com [209.85.220.48]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 62C882AED for ; Thu, 10 Oct 2013 16:52:52 +0000 (UTC) Received: by mail-pa0-f48.google.com with SMTP id bj1so3015120pad.35 for ; Thu, 10 Oct 2013 09:52:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=qs2EJ/pSYJClkEAgS2GyBSkfVNcFehSSm8acvKBir1w=; b=eQ4TZ0dDxYPvTGCGkoGmGCo1lbY1p5xsy4Em5fdRP9EGZbzTb2JdsFX7ESPuCym7D1 FzFtRUaLDABQux5Se/a6bGVJS6A0qoFrD9FohfhG97Y65DlHvrM8iU7LfhgR8Cisg3Me OJzJbWTBCii59c+BNdyTg+XSpkF8yhL7tUtrzJvI1sssvAff3xCHiqvp4RHqsp17kQme 9DCA+/4+eBa6mix9lXFg+MlG2EoGiRRx1UWGCNQp0RP5CKKaj+kEP8WP7r9Xy4a8J1HB iNqK2P4ot/XKThTlDYjtuQW+NFF+QDg8g42w7hrGO0YYCKsN1V/U8qJ1J10Vbj5rQu8C J/qQ== X-Gm-Message-State: ALoCoQlroU3//jFapq0QZBL5a3B/36FPzolDpXnW0xF/NdJDCgdbDW44Vmv0K2U54uYMEeH3QSTj MIME-Version: 1.0 X-Received: by 10.68.34.105 with SMTP id y9mr15154076pbi.15.1381423966380; Thu, 10 Oct 2013 09:52:46 -0700 (PDT) Sender: bsd-src@helfman.org Received: by 10.70.100.165 with HTTP; Thu, 10 Oct 2013 09:52:46 -0700 (PDT) In-Reply-To: <201310101649.r9AGn2VQ037679@svn.freebsd.org> References: <201310101649.r9AGn2VQ037679@svn.freebsd.org> Date: Thu, 10 Oct 2013 09:52:46 -0700 X-Google-Sender-Auth: Dqkwq1-MpD0Bsh31vmVGiS16OF0 Message-ID: Subject: Re: svn commit: r330018 - head/java/openjdk6 From: Jason Helfman To: Jung-uk Kim Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: "svn-ports-head@freebsd.org" , "svn-ports-all@freebsd.org" , "ports-committers@freebsd.org" X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Oct 2013 16:52:52 -0000 It is my understanding, and experience, that If you are checking options then bsd.port.options.mk needs to be included. -jgh On Thu, Oct 10, 2013 at 9:49 AM, Jung-uk Kim wrote: > 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 > - > .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 > > -- Jason Helfman | FreeBSD Committer jgh@FreeBSD.org | http://people.freebsd.org/~jgh | The Power to Serve