Received: by mail.netbsd.org (Postfix, from userid 605) id F1A6C84D31; Tue, 29 Jun 2021 17:32:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 35DC984D2F for ; Tue, 29 Jun 2021 17:32:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id u5FDAITlGp9z for ; Tue, 29 Jun 2021 17:32:52 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id B3FB484CE1 for ; Tue, 29 Jun 2021 17:32:52 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 60839FA95; Tue, 29 Jun 2021 17:32:52 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1624987972205870" MIME-Version: 1.0 Date: Tue, 29 Jun 2021 17:32:52 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/lang/openjdk8 To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20210629173252.60839FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1624987972205870 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Tue Jun 29 17:32:52 UTC 2021 Modified Files: pkgsrc/lang/openjdk8: Makefile Log Message: openjdk8: backport kqueue fix from openjdk11 Although 8 doesn't seem to use kqueue by default the class is still compiled so it's a good idea to have the correct values. Bump PKGREVISION for this and recent changes. To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 pkgsrc/lang/openjdk8/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1624987972205870 Content-Disposition: inline Content-Length: 1371 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/openjdk8/Makefile diff -u pkgsrc/lang/openjdk8/Makefile:1.107 pkgsrc/lang/openjdk8/Makefile:1.108 --- pkgsrc/lang/openjdk8/Makefile:1.107 Sun Jun 27 14:54:40 2021 +++ pkgsrc/lang/openjdk8/Makefile Tue Jun 29 17:32:52 2021 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.107 2021/06/27 14:54:40 tnn Exp $ +# $NetBSD: Makefile,v 1.108 2021/06/29 17:32:52 tnn Exp $ DISTNAME= openjdk-jdk8u-${GITHUB_TAG} PKGNAME= openjdk8-1.8.${GITHUB_TAG:C/.*u([0-9]+).*/\1/} +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GITHUB:=battleblow/} MASTER_SITES+= ${MASTER_SITE_LOCAL:=openjdk7/} # for bootstrap kits @@ -161,6 +162,16 @@ SUBST_FILES.zlibpath+= jdk/make/lib/Awt SUBST_VARS.zlibpath= COMPILER_RPATH_FLAG BUILDLINK_PREFIX.zlib SUBST_VARS.zlibpath+= BUILDLINK_PREFIX.iconv +.if ${OPSYS} == "NetBSD" +# NetBSD's EVFILT_* are different from FreeBSD/OpenBSD's values. +SUBST_CLASSES+= kqueue +SUBST_STAGE.kqueue= pre-configure +SUBST_MESSAGE.kqueue= fixing kqueue filter values +SUBST_FILES.kqueue= jdk/src/solaris/classes/sun/nio/ch/KQueue.java +SUBST_SED.kqueue= -e 's/static final int EVFILT_READ = -1;/static final int EVFILT_READ = 0;/' +SUBST_SED.kqueue+= -e 's/static final int EVFILT_WRITE = -2;/static final int EVFILT_WRITE = 1;/' +.endif + PLIST_VARS+= i386 .if ${MACHINE_ARCH} == "i386" PLIST.i386= yes --_----------=_1624987972205870--