From nobody Sat Apr 15 04:44:45 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pz1260nfvz45WCp; Sat, 15 Apr 2023 04:44:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pz1255p93z3L1G; Sat, 15 Apr 2023 04:44:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681533885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=08HNo6yxN/yzdWd5iG1R+rW2avZBXDypA2LvDaeP3B0=; b=UsiC3vRntMllanaSxhSLh5tqYM4lS1FiloVEusUzEHWhIa5jGFPoZ1+coJJtlpSPXdDzX+ b2l6InFTbgQTv6EHCnjumWYtUCCsEB3mH4BJpNGBbOJQaj60fmlqc8haDX15JkK49eJkTB vTwPcD3ODdtm1+6u0P6kHL9GtOGvXiBIqO0mTifnNxfmlU/gY7IesMi/z6SWBMBad85QFT 1OmJiH7zmwQxeqURpqnqMCt1FvYZDKvK0N+tXXOhXWiIsyX3TAFUAA8WT+yAH1UmqZrX1e kTFFo7SpTSoj9su4k9uk6JfdqdpO381M2TTdM/ie+92/DLyF/ca+lHIMdT58Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681533885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=08HNo6yxN/yzdWd5iG1R+rW2avZBXDypA2LvDaeP3B0=; b=FABEHem/aQ4sVHUYw6qZUITV3pLWmxJY7CkL0kGJzBpOKOop3rDWERqrofxutn+9iCJP/w DCUzo9zTI7ZteSanoar93KGNwgRlHGHqFARd7VJ8rd0ogiTQSNW9FIDuY4nk9ANBNhEzs/ /Spi+oYBcLsjHYw/shGqm1tUcLCP9ahToFBNMq8CkRIa190jg0NSbvoeTN8MTZLtq/jXg/ 7EODJLkiX6g2O68DbsjOLq9R0ra3dirvNSL0J9FB1+/YvMArr+sIDNPMuLaZiFUnBNOuGJ vuIPzJba7YpRYqgQDYzasJxwPmBST9mloztY9c2HGV2Salw1Ib3M23r1tBd5qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681533885; a=rsa-sha256; cv=none; b=YHvHEM3emI42yQJGx957vnMMWzhBQCjozxUiL5Jxwr4kQ2TifED55BmPTMHTV/kVqRacax ExB0zIrEGRxdn//2x1Xf1/XKbvd1ex1T/6UzP7vlkdtl1wzx+wiFlM5AO3PZPkrDrhrDPe LSZuQ8olLsB9Yk7bclwVgULLdanozo/HyY4/icNmaLsH/FhloAA1p7tTAjgoEKcC/HGjev keGXbDYFA58c2K4xyM1DtoKmiMecJyp/AORgOqddvP54qex1UAbtglAGwt47LUK83UbnYh YUWH3IonE15EJEuJsxRjTD0fuvyIOvZWnjE0PddMO20aRiONG8b37cQ3ZsUm3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pz1254vpbzsJT; Sat, 15 Apr 2023 04:44:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33F4ijoO040859; Sat, 15 Apr 2023 04:44:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33F4ijSK040858; Sat, 15 Apr 2023 04:44:45 GMT (envelope-from git) Date: Sat, 15 Apr 2023 04:44:45 GMT Message-Id: <202304150444.33F4ijSK040858@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Eugene Grosbein Subject: git: 3f3975ef8c26 - main - java/openjdk11: add new CUPS port option List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f3975ef8c2692cc0aedf26becd3ee6d2754fb81 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f3975ef8c2692cc0aedf26becd3ee6d2754fb81 commit 3f3975ef8c2692cc0aedf26becd3ee6d2754fb81 Author: Eugene Grosbein AuthorDate: 2023-04-15 04:27:37 +0000 Commit: Eugene Grosbein CommitDate: 2023-04-15 04:27:37 +0000 java/openjdk11: add new CUPS port option UniFi controller is headless Java application that requires OpenJDK that depends on full CUPS port. In fact, the latter originally required cups-client port only that was later removed and merged to full cups port, so openjdk11 now requires full CUPS. However, OpenJDK really needs only some header files out of CUPS distribution and officially supports building --with-cups-include instead of --with-cups. This change introduces new CUPS port option to java/openjdk11 that defaults to ON to preserve current behaviour. With CUPS option turned OFF it skips build dependency on full cups: instead, it downloads and extracts its distfile and builds --with-cups-include pointing to extracted cups distfile. Default build not affected, so PORTREVISION not changed. PR: 264792 Approved by: java (maintainer timeout, over 7 months) --- java/openjdk11/Makefile | 15 +++++++++++++-- java/openjdk11/distinfo | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index 841d76ecb151..424e96ac8010 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -16,7 +16,6 @@ ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le BUILD_DEPENDS= zip:archivers/zip \ autoconf>0:devel/autoconf \ - ${LOCALBASE}/include/cups/cups.h:print/cups \ bash:shells/bash \ gsed:textproc/gsed LIB_DEPENDS= libasound.so:audio/alsa-lib \ @@ -69,6 +68,15 @@ BSD_JDK_VERSION= 1 JDK_BUG_URL= https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Ports%20%26%20Packages&component=Individual%20Port(s)&short_desc=java/${PORTNAME}${JDK_MAJOR_VERSION}%3A%20 +OPTIONS_DEFINE= CUPS +OPTIONS_DEFAULT= CUPS + +CUPS_CONFIGURE_ON= --with-cups=${LOCALBASE} +CUPS_CONFIGURE_OFF= --with-cups-include=${WRKDIR}/cups-${CUPS_INC_VER} +CUPS_BUILD_DEPENDS= ${LOCALBASE}/include/cups/cups.h:print/cups +CUPS_INC_VER= 2.4.2 +CUPS_DISTFILES_OFF= OpenPrinting-cups-v${CUPS_INC_VER}_GH0.tar.gz:cups + GNU_CONFIGURE= yes CONFIGURE_ENV= CC=${CC} \ CXX=${CXX} \ @@ -80,7 +88,6 @@ CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \ --disable-hotspot-gtest \ --with-jvm-features=shenandoahgc \ --with-alsa=${LOCALBASE} \ - --with-cups=${LOCALBASE} \ --with-fontconfig=${LOCALBASE} \ --with-freetype=system \ --with-freetype-include=${LOCALBASE}/include/freetype2 \ @@ -113,6 +120,10 @@ JDK_BUILD_TYPE= release .include +.if !${PORT_OPTIONS:MCUPS} +MASTER_SITES+= https://codeload.github.com/OpenPrinting/cups/tar.gz/v${CUPS_INC_VER}?dummy=/:cups +.endif + BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk11 \ ${LOCALBASE}/bootstrap-openjdk11 diff --git a/java/openjdk11/distinfo b/java/openjdk11/distinfo index 6c7115771807..8b8d70389a07 100644 --- a/java/openjdk11/distinfo +++ b/java/openjdk11/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1674431160 +SHA256 (OpenPrinting-cups-v2.4.2_GH0.tar.gz) = 7095b2977bb728ded5566a5c802866062840d6541fd027836865949a407c3682 +SIZE (OpenPrinting-cups-v2.4.2_GH0.tar.gz) = 8173207 SHA256 (battleblow-jdk11u-jdk-11.0.18+10-1_GH0.tar.gz) = 605a5c602f8078445a6a8c094d81a56b9ea8928d1aefccc83bdf1587f8492693 SIZE (battleblow-jdk11u-jdk-11.0.18+10-1_GH0.tar.gz) = 123497196