From nobody Thu May 19 05:30:07 2022 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 0B79C1AE3A66; Thu, 19 May 2022 05:30:08 +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 4L3djC6rZWz4SZh; Thu, 19 May 2022 05:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652938208; 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=aaehb0zw556gF2q9yQoMr9MVNmlJz2U9Q1VNUUq/oNg=; b=dqx4zztjA8D8z84z8/VR505BF9XHuT1GstiQslwrlhFyaD+FRIXh+ajQ/RU70LgBW6a/Sd hp3uZmS8A2zyZeZ6+mIuDDtcq/TffgjocYCnuwYFxl1SYQWr8W9/sl8uOEFgnBCnTrMqyN KL1W7U0OSEH1l6PMeDpOa7xsa1gZU8rVpOeH2a5lGgM3+sjiwAv/GWdG34f84MC1XVDZVu B36s5lT0GlyqL3PGgaIKnChMt9yAdMZ5VUrGIch79Fl15RsvU8WXKfd8fU+hrz6XW8yc9X w+G4bDfb7dGkiJTgWd/sEWBAWrhTstX7dYYzzIoDNNOskubx0ay6mUqZFXXdzA== 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 C74D117969; Thu, 19 May 2022 05:30:07 +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 24J5U7Qw028682; Thu, 19 May 2022 05:30:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24J5U7mW028679; Thu, 19 May 2022 05:30:07 GMT (envelope-from git) Date: Thu, 19 May 2022 05:30:07 GMT Message-Id: <202205190530.24J5U7mW028679@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikhail Teterin Subject: git: c0eef0ceec76 - main - java/jxgrabkey: overwrite source- and target-versions on command-line. 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: mi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0eef0ceec76f8e99a152aca04e938dcb12f7261 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652938208; 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=aaehb0zw556gF2q9yQoMr9MVNmlJz2U9Q1VNUUq/oNg=; b=YuXJPY96k+DtkAzHLhNs+FtosvromMfPcElvv2U7UibG4//2UKmPD40/oaS012rZGJ+1Ov 9uYhCoyQLGe9oJ/CfBsW1RR/m/fnbHLlt7VfmeVhLvcbT6XwWNeU+a+Dfr70qV34vl+QHZ P5f1CaBHUExBjPjDWv+PvF1yK1Oz7qzewvRprrY1P/yS6m1TzIt0bbuh5QBinqRYP/XNUI EIuMAbP0oYppFNJCwAbPjMun8oBcYO9TpkG63Rd1PfmUe4HwM2PNimTZe4s+yYyTE20ZrK n3bCcfmM1T7OtiM7cNw4SX9IojzMxalnzikmUcJCHKVeonyH5St1j0OAuE7DOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652938208; a=rsa-sha256; cv=none; b=b8hpIvHAttr3D1lEDYDwAq89qJ1DwqbTxBfYvAASljiJ9TjmLPO03F4xCDfFUx+nnBWk5I DwBa37lg2y6Cm6xcYnpaWnERC+5dQFePcmLabt6aeeAkI5DhGspG8FEcRAs8f9qu2juOpE inXLF/YzCKbF8IDTpJ8ydeKcwDdye+uv5xfVt3EUN0vdpwmCYayihx5SqJdhUykvGnoNBt zcyhyIgJL83B6kCujvHsYZc2MyGqicSFU0K5vXYW2wTTCZtGmU1oVf+cMtdoBndG3whIi5 QiCtT4+kyeSFbqOCRtab3T+lX3RLzDRNMCqa2tUsbIbilL2Kx3yTM6L2rSh4Qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mi: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0eef0ceec76f8e99a152aca04e938dcb12f7261 commit c0eef0ceec76f8e99a152aca04e938dcb12f7261 Author: Mikhail Teterin AuthorDate: 2022-05-19 05:27:51 +0000 Commit: Mikhail Teterin CommitDate: 2022-05-19 05:27:51 +0000 java/jxgrabkey: overwrite source- and target-versions on command-line. The author's properties file (from 2010) sets source- and target-versions to 1.5, which is too old for JDK-1.7, for example. Instead of patching the properties-file, overwrite the two settings on command-line. Use the conservative value of 1.7... --- java/jxgrabkey/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java/jxgrabkey/Makefile b/java/jxgrabkey/Makefile index 9b882e200b0f..f7e195b72c1f 100644 --- a/java/jxgrabkey/Makefile +++ b/java/jxgrabkey/Makefile @@ -20,11 +20,12 @@ TEST_BUILD_DEPENDS= ${JAVALIBDIR}/junit.jar:java/junit \ MAKE_ENV+= JAVA_HOME=${JAVA_HOME} OPSYS=${OPSYS} PLIST_FILES= %%JAVAJARDIR%%/JXGrabKey.jar lib/libJXGrabKey.so USE_LDCONFIG= yes +ANT_ARGS= -Djavac.source=1.7 -Djavac.target=1.7 do-build: ${SETENV} ${MAKE_ENV} ${MAKE} -C ${WRKSRC}/JXGrabKey/C++ \ -f ${FILESDIR}/Makefile.JXGrabKey libJXGrabKey.so - cd ${WRKSRC}/JXGrabKey/Java && ${ANT} -verbose jar + cd ${WRKSRC}/JXGrabKey/Java && ${ANT} -verbose jar ${ANT_ARGS} do-install: ${INSTALL_LIB} ${WRKSRC}/JXGrabKey/C++/libJXGrabKey.so ${STAGEDIR}${PREFIX}/lib/ @@ -36,6 +37,7 @@ do-test-TEST-on: build ${SETENV} CLASSPATH=${JAVALIBDIR}/junit.jar:${JAVALIBDIR}/hamcrest.jar \ LD_LIBRARY_PATH=${WRKSRC}/JXGrabKey/C++ \ ${ANT} -Djavac.classpath=${JAVALIBDIR}/junit.jar \ + ${ANT_ARGS} \ test .include