From owner-svn-ports-head@freebsd.org Fri Dec 9 20:48:21 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 6AC79C6E6D4; Fri, 9 Dec 2016 20:48:21 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-qk0-x242.google.com (mail-qk0-x242.google.com [IPv6:2607:f8b0:400d:c09::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2F44812A3; Fri, 9 Dec 2016 20:48:21 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by mail-qk0-x242.google.com with SMTP id n204so3683979qke.2; Fri, 09 Dec 2016 12:48:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=Ao1sI6aBayFzCSjScZeyDmm6bziDFYgjczWpvoptTbs=; b=PR+uL8s9rWnKiuQ+N3aSYBuT8odjpgu/LFYcahw8D89//3LS+MPYsdJChFOIzjH6z0 mUuWd4gvEZ9WGAyOyRKlt/esQW+g55b/q+5fglBGKpJZ7QBZxcWVAml8aH4npXISbdzz Cjin0nJVAQ2dsnFuQx4LcTekDIuYyChdMtS0yJjz21nGK54eFjWfYNiJXpCAvAONIjQ+ aGnxkfZvI8NJUhaIIsuZsQN5DdTGjHDTkI660SCRTIT4blVLy/BEpteVZ9B2uDJ8TFf8 ISgMSOxLV36RnHBUVE73/qqqJ3GtVsH13jChHH6tPl47wMswLuIWcKXyY6ypZgN/ZwLt YgtA== 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:from :date:message-id:subject:to:cc; bh=Ao1sI6aBayFzCSjScZeyDmm6bziDFYgjczWpvoptTbs=; b=O4P/VZyOM24mbNPmHGajQG97f41dHgzo1tOqb6LJbliuh9NWGBfOdOW498NtD8W4p/ Zt1XJr589t0xH3EJsFLVFvNyRgt841e/NfPXBgNEZcXahx2hLrqIf/uc/yUAevacB5X8 KV6v/NFuxLlhjllMur/Oh2DFHT/8633nmLLHW9qrr47y1157ka8AGYTbWDtIQjzrX+dZ pp8B+HNvv7yVp1IPN9EQzb/8TVk4mhGaa86pnCv1YupOCtVwyTGq2wD8Bape9MZmYOZc ukk4GkbZg+c/DGbKKiKPPIkw+YPEpNXpCveVFn4eIM2K1JKF+xyPlOTUJ56HmSkkbSpD 2hMA== X-Gm-Message-State: AKaTC01hUp3auV0laB8tO+afb9JVIocBPR+RbuxQa+0u1ucyLIZBCvD7KZdKz4JNThX5O7xDqPtdE1TINJGhcA== X-Received: by 10.55.118.65 with SMTP id r62mr9825889qkc.21.1481316500291; Fri, 09 Dec 2016 12:48:20 -0800 (PST) MIME-Version: 1.0 Sender: asomers@gmail.com Received: by 10.12.174.145 with HTTP; Fri, 9 Dec 2016 12:48:19 -0800 (PST) In-Reply-To: <138FB883-C7BF-47AF-8FED-E6FC50B57C22@adamw.org> References: <201612092030.uB9KUrnO051491@repo.freebsd.org> <138FB883-C7BF-47AF-8FED-E6FC50B57C22@adamw.org> From: Alan Somers Date: Fri, 9 Dec 2016 13:48:19 -0700 X-Google-Sender-Auth: 6R2IrvZ7hYREvFZJQR395dts21w Message-ID: Subject: Re: svn commit: r428241 - in head/java: openjdk7 openjdk8 To: Adam Weinberger Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Content-Type: text/plain; charset=UTF-8 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:48:21 -0000 On Fri, Dec 9, 2016 at 1:42 PM, Adam Weinberger wrote: >> On 9 Dec, 2016, at 13:30, Alan Somers 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. -Alan