From nobody Sat May 21 23:02:18 2022 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 0E0C71B4F08F; Sat, 21 May 2022 23:02:19 +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 4L5JyL71rbz3pDb; Sat, 21 May 2022 23:02:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653174139; 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=2fnML/2YDWCyf9ag69GrftAeoZ9WrHRyGLRlgFLMEUg=; b=yETjKx57x3uI3LLANiZrFh+Wb+HTzV+azc8Du0+dUqlphOcAes02f2mP/GjzeurzjW/aiC Hsv+6Ww8coNNdxe8E8D1ctmHFeZZmy/JoQC2QhyD8Wn4MbrsQBG3n0ongC/Tb/X6qddiQ+ ddCXsoGJr5ifKGCeo6E8rMYZvmPc50XlLgfHadvfLCZHfP6ViSv0AXsve11HK+93PLYeAZ Z/mGd+HwfrvMxfAbpa1TlHTjUeclKL0KEoEjvauztjp4oP4Kw9a6oX7TOphdK6gIFf+br6 daWk1EGM8O5WJxOJd9WJaLxzhOzCUez6b44QMYekd4VjkyBuUMUTZ9vnxSeHog== 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 D19237D2C; Sat, 21 May 2022 23:02:18 +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 24LN2IgK060573; Sat, 21 May 2022 23:02:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24LN2Iu4060572; Sat, 21 May 2022 23:02:18 GMT (envelope-from git) Date: Sat, 21 May 2022 23:02:18 GMT Message-Id: <202205212302.24LN2Iu4060572@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: 17cd2716cd27 - main - java/berkeley-db: upgrade from 6.2.31 to 7.5.11 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 17cd2716cd27c7b8675f3acc7f6412b69a47ae5b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653174139; 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=2fnML/2YDWCyf9ag69GrftAeoZ9WrHRyGLRlgFLMEUg=; b=BXcYn/w3sI/MAByWpDjDw56bjzO1pbJn61IScUfuDWFDWsHRPhktobin4zempk9PiiEzUe +yow+2mj5pgEuu8+pZkw6w1yHfdTk569FPUJFUxxzdbnbDay4V/ESllQf/wP7OW8Irw6GI cx62xtpGpcUwjS1WjdFFYQZxnqgkBHo+coX4XtAfZ0f6r6DbJi12MEmOkzzKRqmL2upiLv jW8SFO5yryswxpBlwZaqjb+mmhNTgscScREhK+kOX7ZDF1BmaknWQnCgDscS5ZRT+7qgGU fP6WIHsZbWVgr/CS3N8mLHS+pUJ/JqtjCJL7IZAwlc9wjtBlNcXeeNxugy1OEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653174139; a=rsa-sha256; cv=none; b=jIASLcauZKnLq/bOgfdpD6/CnD6mgTzYLshibTbcY7BwpowlPBq1O1re4x7XIf6ri11LQo czpIXsWI1HZdp4BM85y1VPSKHAL7WxxWUxb2eiNU0BvUWecwFJ8IRrcwpPIpoMqLzO4C+M 0scKoy4MJ3uhQtlNKZsmqRpMopzOeRlgXuFvD+ifzn5HU4mQ/7F3MP6NLRrdOHnpGXOX8Z XM6rsQk1MKeGWO3NhR9a1hq2NdBcRkf1kvbFo0uISrWUbKoXpCAyJYlK2Som7nEw2wLgmo TX+aXoy/mxlu9Jvmr37EGvnjBa+qwPgvIusZPIjxYcF6En3jNKVl71QTMHZ6SA== 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=17cd2716cd27c7b8675f3acc7f6412b69a47ae5b commit 17cd2716cd27c7b8675f3acc7f6412b69a47ae5b Author: Mikhail Teterin AuthorDate: 2022-05-21 23:00:07 +0000 Commit: Mikhail Teterin CommitDate: 2022-05-21 23:00:07 +0000 java/berkeley-db: upgrade from 6.2.31 to 7.5.11 Changelog: https://docs.oracle.com/cd/E17277_02/html/changelog.html Set LICENSE and otherwise pet portlint. Limit Java to 8 -- newer versions are rejected by the vendor's code... --- java/berkeley-db/Makefile | 26 +++++++++++++++++--------- java/berkeley-db/distinfo | 5 +++-- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/java/berkeley-db/Makefile b/java/berkeley-db/Makefile index 0fe504a9a91e..efc4808c4c7d 100644 --- a/java/berkeley-db/Makefile +++ b/java/berkeley-db/Makefile @@ -1,7 +1,7 @@ # Created by: Mikhail Teterin PORTNAME= je -PORTVERSION= 6.2.31 +PORTVERSION= 7.5.11 CATEGORIES= java databases MASTER_SITES= http://download.oracle.com/berkeley-db/ \ http://download-east.oracle.com/berkeley-db/ \ @@ -10,20 +10,21 @@ MASTER_SITES= http://download.oracle.com/berkeley-db/ \ MAINTAINER= mi@aldan.algebra.com COMMENT= Berkeley DB Java Edition -BUILD_DEPENDS= ${JAVALIBDIR}/junit.jar:java/junit +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_armv6= fails to build: build.xml: Java returned: 1 -BROKEN_armv7= fails to build: build.xml: Java returned: 1 +BUILD_DEPENDS= ${JAVALIBDIR}/junit.jar:java/junit OPTIONS_DEFINE= DOCS EXAMPLES TEST -USE_JAVA= yes +USE_JAVA= 8 USE_ANT= yes MAKE_ENV+= JAVALIBDIR="${JAVALIBDIR}" MAKE_ARGS+= -cp ${JAVALIBDIR}/junit.jar +EXTRACT_AFTER_ARGS+= --exclude '*.jar' -PLIST_FILES= %%JAVAJARDIR%%/je.jar - +PLIST_FILES= ${JAVAJARDIR:S,^${PREFIX}/,,}/je-${PORTVERSION}.jar \ + ${JAVAJARDIR:S,^${PREFIX}/,,}/je.jar PORTDOCS= * PORTEXAMPLES= * @@ -31,7 +32,7 @@ regression-test check test: build # # Running the vendor-provided self-tests. This may take a while # - if ! (cd ${BUILD_WRKSRC} ; ${MAKE_ENV} ${ANT} ${MAKE_ARGS} test) ; \ + @if ! (cd ${BUILD_WRKSRC} ; ${MAKE_ENV} ${ANT} ${MAKE_ARGS} test) ; \ then \ ${ECHO_MSG} Please, review test failures and consider \ reporting them via \ @@ -62,11 +63,18 @@ post-build: post-patch: @${REINPLACE_CMD} "s,/usr/local,${PREFIX}," ${WRKSRC}/build.xml + ${FIND} ${WRKSRC} -type f -name \*.java | ${XARGS} \ + ${REINPLACE_CMD} -i "" -E 's,[^[:print:]]+, ,g' do-install: - ${INSTALL_DATA} ${WRKSRC}/build/lib/je.jar ${STAGEDIR}${JAVAJARDIR} + ${INSTALL_DATA} ${WRKSRC}/build/lib/je.jar ${STAGEDIR}${JAVAJARDIR}/je-${PORTVERSION}.jar + ${LN} -s -f je-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/je.jar + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) + +post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) diff --git a/java/berkeley-db/distinfo b/java/berkeley-db/distinfo index 5fc874fa33ac..c6896f61a834 100644 --- a/java/berkeley-db/distinfo +++ b/java/berkeley-db/distinfo @@ -1,2 +1,3 @@ -SHA256 (je-6.2.31.tar.gz) = d8854f6385e8369232c9805ef94232c8e9c4800ec0c60ff79a6e60d00036b969 -SIZE (je-6.2.31.tar.gz) = 11198631 +TIMESTAMP = 1653092902 +SHA256 (je-7.5.11.tar.gz) = f82505e66dff5a97dc0d2e4eaed3c09dde5cad790a91528fcf5154894acd6f4c +SIZE (je-7.5.11.tar.gz) = 12073401