From nobody Tue Sep 3 14:34:57 2024 X-Original-To: dev-commits-ports-main@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 4Wyp755yMQz5PdTK; Tue, 03 Sep 2024 14:34:57 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wyp755DGwz4vW9; Tue, 3 Sep 2024 14:34:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725374097; 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=zPt+8ZkpA+1hNI5214jm+EEMcFUSfJethT1GLEZ22UM=; b=yFeV/D+IQ/whjkeN4cpVnHNcSF9z56hTSs94baQUSsx72NZRSl9pXojKNSgpN6v/IJ+5LK PiaJyXKt3q0MoxmBXG2mDs7H0MTxZlhpIDAEGM6knNJ1XS9VbYrS6q8oMWXCwqwBvzAdkx 3P9xKI4rUihw4NRDXkG6dw+jCK5OoBVJ9xpCIR8qnMUWoXQndGBXvr7Iyb9J8OOyNGQ3y1 AQQB+OOtJixH7l/S6PG30Cgi38VoeVrLxXo0sQKq0yNlTe19GyDhk0Lsrh1XZX/bt9/UZ6 3X7hcYeROjywq8yNJerFjaU02r+RICmWrxhCm/ixDmukQBzYoHwUKxDeSfTliw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725374097; a=rsa-sha256; cv=none; b=Kdb8CnhWk9jOcNbgLKQRfSDESF/3vzmlQLZ+Be0+HWVYZBrzuJIwQTnn9cTXipb2Ymemh2 gYZ1O1n2L9pvgd1Wk6EVGkxphl62lIkvvTIaJlRCIv9Yq9AJebEonWI+nPxRznBsbgbrSA GegKb3yBRbWh+G3GtlTTKeCgDqVWbrdm5YBIBZoBNg8itn8WRUrS8uH8X9bCp9PzOEyDje jkaO/xqB+fEQ9QcxK2+Ozhaz3eyxVdwv4ny69M99r/Rx2sKl1BH7ZSt3eESEtPT2vKL0LF XcsEZmYl/rwTzJKRSmo4r0bX5QpTeKGJkgpoFnBOKKg8PksceK7s8qzqAgZ0Zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725374097; 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=zPt+8ZkpA+1hNI5214jm+EEMcFUSfJethT1GLEZ22UM=; b=IrbRlp0oAaHysIw3CFfrFE2cywd3dJIV86MWPA5Yh3dfre6z0Y0XznULqYBTMoMW/EeTMT TBnyGkchj6CMDdfvuTdYx9ns9X40EcIsleWxwhkqsmlW5neqVWOVum28ouH1gTn2D+kYSF YT4wyybe3GtH40Ui4zoYXwsagF1VayL+UvjKBPpf+HmH5vlmm7E7OHnpVgeSWk+42KfWim S0ZdnMZsXXpn0xcNT+SXsQ624Yvt8Ivn3zF8IQAz4dpAyYfUCSsxtCbT1agP3cTOLntHIW uSWtEtlvVywi4IKsJdfDL6w5nkz7RVImuspyv1XoheWeev08GFphe8rc/hc41Q== 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 4Wyp754nPGzlJ8; Tue, 3 Sep 2024 14:34:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 483EYv8v036725; Tue, 3 Sep 2024 14:34:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483EYv7e036722; Tue, 3 Sep 2024 14:34:57 GMT (envelope-from git) Date: Tue, 3 Sep 2024 14:34:57 GMT Message-Id: <202409031434.483EYv7e036722@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ronald Klop Subject: git: 014e6556ac4c - main - sysutils/facter: support openjdk11 and up List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ronald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 014e6556ac4c6b96e441337c792020ca90180ec1 Auto-Submitted: auto-generated The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=014e6556ac4c6b96e441337c792020ca90180ec1 commit 014e6556ac4c6b96e441337c792020ca90180ec1 Author: Ronald Klop AuthorDate: 2024-09-03 14:27:28 +0000 Commit: Ronald Klop CommitDate: 2024-09-03 14:34:25 +0000 sysutils/facter: support openjdk11 and up Adjusted the patch from the issue to target jdk 8 instead of 7. Target 8 is supported by all current openjdk version in ports. PR: 237990 Tested by: poudriere Approved by: maintainer timeout --- sysutils/facter/Makefile | 2 +- sysutils/facter/files/patch-CMakeLists.txt | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/sysutils/facter/Makefile b/sysutils/facter/Makefile index b834570b48df..5eec488bb1c5 100644 --- a/sysutils/facter/Makefile +++ b/sysutils/facter/Makefile @@ -1,6 +1,6 @@ PORTNAME= facter PORTVERSION= 3.14.24 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES?= sysutils MASTER_SITES= https://downloads.puppetlabs.com/facter/ diff --git a/sysutils/facter/files/patch-CMakeLists.txt b/sysutils/facter/files/patch-CMakeLists.txt index 246444a7eb8c..05e68a065e7d 100644 --- a/sysutils/facter/files/patch-CMakeLists.txt +++ b/sysutils/facter/files/patch-CMakeLists.txt @@ -1,6 +1,15 @@ ---- CMakeLists.txt.orig 2024-02-25 16:48:32 UTC +--- CMakeLists.txt.orig 2022-07-18 15:00:22 UTC +++ CMakeLists.txt -@@ -233,7 +233,7 @@ add_test(NAME "facter\\ smoke" COMMAND facter) +@@ -121,7 +121,7 @@ if (NOT WITHOUT_JRUBY AND NOT WIN32) + + if (Java_JAVAC_EXECUTABLE) + set(JRUBY_SUPPORT TRUE) +- set(CMAKE_JAVA_COMPILE_FLAGS -source 1.6 -target 1.6) ++ set(CMAKE_JAVA_COMPILE_FLAGS -source 8 -target 8) + add_definitions(-DUSE_JRUBY_SUPPORT) + endif() + endif() +@@ -233,7 +233,7 @@ endif() add_test(NAME "facter\\ smoke" COMMAND facter) # Install the man page