svn commit: r330018 - head/java/openjdk6

[Jason Helfman]

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 at 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 at FreeBSD.org     | http://people.freebsd.org/~jgh  | The Power to Serve