svn commit: r428241 - in head/java: openjdk7 openjdk8

[Adam Weinberger]

> On 9 Dec, 2016, at 13:48, Alan Somers <asomers at freebsd.org> wrote:
> 
> On Fri, Dec 9, 2016 at 1:42 PM, Adam Weinberger <adamw at adamw.org> wrote:
>>> On 9 Dec, 2016, at 13:30, Alan Somers <asomers at freebsd.org> wrote:
>>> 
>>> Author: asomers (src committer)
>>> Date: Fri Dec  9 20:30:53 2016
>>> New Revision: 428241
>>> URL: https://svnweb.freebsd.org/changeset/ports/428241
>>> 
>>> Log:
>>> Add an X11 option to java/openjdk[78]
>>> 
>>> It defaults to on.  Disabling it will remove X support from Java, and reduce
>>> X-related dependencies.
>>> 
>>> PR:          210000
>>> Reviewed by: brd
>>> Approved by: brd (ports)
>>> Approved by: glewis (maintainer timeout)
>>> Sponsored by:        Spectra Logic Corp
>>> Differential Revision:       https://reviews.freebsd.org/D6698
>>> 
>>> Modified:
>>> head/java/openjdk7/Makefile
>>> head/java/openjdk8/Makefile
>>> 
>>> Modified: head/java/openjdk7/Makefile
>>> ==============================================================================
>>> --- head/java/openjdk7/Makefile       Fri Dec  9 20:18:38 2016        (r428240)
>>> +++ head/java/openjdk7/Makefile       Fri Dec  9 20:30:53 2016        (r428241)
>>> @@ -3,7 +3,7 @@
>>> 
>>> PORTNAME=     openjdk
>>> PORTVERSION=  ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER}
>>> -PORTREVISION=        1
>>> +PORTREVISION=        2
>>> PORTEPOCH=    1
>>> CATEGORIES=   java devel
>>> MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \
>>> @@ -41,11 +41,25 @@ LICENSE=  GPLv2
>>> WRKSRC=               ${WRKDIR}/${PORTNAME}
>>> 
>>> USES=         compiler dos2unix iconv gmake zip
>>> -USE_XORG+=   x11 xext xi xrender xt xtst
>>> +# Even when not building with X11 support, openjdk7 requires Xrender, X11, and
>>> +# Xt headers.
>>> +X11_BUILD_DEPENDS_OFF+=      ${LOCALBASE}/libdata/pkgconfig/x11.pc:x11/libX11
>>> +X11_BUILD_DEPENDS_OFF+=      ${LOCALBASE}/libdata/pkgconfig/xext.pc:x11/libXext
>>> +X11_BUILD_DEPENDS_OFF+=      ${LOCALBASE}/libdata/pkgconfig/xrender.pc:x11/libXrender
>>> +X11_BUILD_DEPENDS_OFF+=      ${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt
>>> +# Add more X11 build deps and runtime deps when X11 is enabled
>>> +X11_LIB_DEPENDS+=    libX11.so.6:x11/libX11
>>> +X11_LIB_DEPENDS+=    libXext.so.6:x11/libXext
>>> +X11_LIB_DEPENDS+=    libXi.so.6:x11/libXi
>>> +X11_LIB_DEPENDS+=    libXrender.so.1:x11/libXrender
>>> +X11_LIB_DEPENDS+=    libXt.so.6:x11-toolkits/libXt
>>> +X11_LIB_DEPENDS+=    libXtst.so.6:x11/libXtst
>>> +X11_MAKE_ENV_OFF=    BUILD_HEADLESS_ONLY=1
>> 
>> Hi Alan,
>> 
>> You lose the benefit of USE_XORG here. I think what you're looking for is:
>> X11_USE=        XORG=x11,xext,xi,xrender,xt,xtst
>> X11_USE_OFF=    XORG=x11,xext,xrender,xt
>> 
>> # Adam
> 
> That doesn't quite do what I want.  It would still leave four X
> packages as run dependencies of openjdk[78], even though they only
> need to be build dependencies.

Oh! I totally missed that they were build depends.

# Adam


-- 
Adam Weinberger
adamw at adamw.org
https://www.adamw.org