From owner-svn-ports-head@freebsd.org Fri Dec 9 20:42:24 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 184FEC6E443; Fri, 9 Dec 2016 20:42:24 +0000 (UTC) (envelope-from adamw@adamw.org) Received: from anoxia.adamw.org (anoxia.adamw.org [104.225.8.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "anoxia.adamw.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 857A4E64; Fri, 9 Dec 2016 20:42:23 +0000 (UTC) (envelope-from adamw@adamw.org) Received: by anoxia.adamw.org (OpenSMTPD) with ESMTPSA id a3ab39f1 TLS version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Fri, 9 Dec 2016 13:42:21 -0700 (MST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 10.1 \(3251\)) Subject: Re: svn commit: r428241 - in head/java: openjdk7 openjdk8 From: Adam Weinberger In-Reply-To: <201612092030.uB9KUrnO051491@repo.freebsd.org> Date: Fri, 9 Dec 2016 13:42:19 -0700 Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <138FB883-C7BF-47AF-8FED-E6FC50B57C22@adamw.org> References: <201612092030.uB9KUrnO051491@repo.freebsd.org> To: Alan Somers X-Mailer: Apple Mail (2.3251) X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Dec 2016 20:42:24 -0000 > On 9 Dec, 2016, at 13:30, Alan Somers wrote: >=20 > Author: asomers (src committer) > Date: Fri Dec 9 20:30:53 2016 > New Revision: 428241 > URL: https://svnweb.freebsd.org/changeset/ports/428241 >=20 > Log: > Add an X11 option to java/openjdk[78] >=20 > It defaults to on. Disabling it will remove X support from Java, and = reduce > X-related dependencies. >=20 > 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 >=20 > Modified: > head/java/openjdk7/Makefile > head/java/openjdk8/Makefile >=20 > Modified: head/java/openjdk7/Makefile > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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 @@ >=20 > PORTNAME=3D openjdk > PORTVERSION=3D = ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER} > -PORTREVISION=3D 1 > +PORTREVISION=3D 2 > PORTEPOCH=3D 1 > CATEGORIES=3D java devel > MASTER_SITES=3D = http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSI= ON}/promoted/b${JDK_BUILD_NUMBER}/ \ > @@ -41,11 +41,25 @@ LICENSE=3D GPLv2 > WRKSRC=3D ${WRKDIR}/${PORTNAME} >=20 > USES=3D compiler dos2unix iconv gmake zip > -USE_XORG+=3D x11 xext xi xrender xt xtst > +# Even when not building with X11 support, openjdk7 requires Xrender, = X11, and > +# Xt headers. > +X11_BUILD_DEPENDS_OFF+=3D = ${LOCALBASE}/libdata/pkgconfig/x11.pc:x11/libX11 > +X11_BUILD_DEPENDS_OFF+=3D = ${LOCALBASE}/libdata/pkgconfig/xext.pc:x11/libXext > +X11_BUILD_DEPENDS_OFF+=3D = ${LOCALBASE}/libdata/pkgconfig/xrender.pc:x11/libXrender > +X11_BUILD_DEPENDS_OFF+=3D = ${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt > +# Add more X11 build deps and runtime deps when X11 is enabled > +X11_LIB_DEPENDS+=3D libX11.so.6:x11/libX11 > +X11_LIB_DEPENDS+=3D libXext.so.6:x11/libXext > +X11_LIB_DEPENDS+=3D libXi.so.6:x11/libXi > +X11_LIB_DEPENDS+=3D libXrender.so.1:x11/libXrender > +X11_LIB_DEPENDS+=3D libXt.so.6:x11-toolkits/libXt > +X11_LIB_DEPENDS+=3D libXtst.so.6:x11/libXtst > +X11_MAKE_ENV_OFF=3D BUILD_HEADLESS_ONLY=3D1 Hi Alan, You lose the benefit of USE_XORG here. I think what you're looking for = is: X11_USE=3D XORG=3Dx11,xext,xi,xrender,xt,xtst X11_USE_OFF=3D XORG=3Dx11,xext,xrender,xt # Adam --=20 Adam Weinberger adamw@adamw.org https://www.adamw.org