Date: Thu, 10 Oct 2013 09:52:46 -0700 From: Jason Helfman <jgh@FreeBSD.org> To: Jung-uk Kim <jkim@freebsd.org> Cc: "svn-ports-head@freebsd.org" <svn-ports-head@freebsd.org>, "svn-ports-all@freebsd.org" <svn-ports-all@freebsd.org>, "ports-committers@freebsd.org" <ports-committers@freebsd.org> Subject: Re: svn commit: r330018 - head/java/openjdk6 Message-ID: <CAMuy=%2Bj=5E=548fUx1eCu7_dwEdxzVa-bpnoJ0HWCYLhVWQZ1A@mail.gmail.com> In-Reply-To: <201310101649.r9AGn2VQ037679@svn.freebsd.org> References: <201310101649.r9AGn2VQ037679@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <jkim@freebsd.org> 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 <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 > > -- Jason Helfman | FreeBSD Committer jgh@FreeBSD.org | http://people.freebsd.org/~jgh | The Power to Serve
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMuy=%2Bj=5E=548fUx1eCu7_dwEdxzVa-bpnoJ0HWCYLhVWQZ1A>