From owner-svn-ports-all@freebsd.org Wed Dec 30 13:23:31 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 76B704C34EC; Wed, 30 Dec 2020 13:23:31 +0000 (UTC) (envelope-from otis@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D5X6W2yRsz3PDQ; Wed, 30 Dec 2020 13:23:31 +0000 (UTC) (envelope-from otis@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4DCA81EC42; Wed, 30 Dec 2020 13:23:31 +0000 (UTC) (envelope-from otis@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BUDNVp4034079; Wed, 30 Dec 2020 13:23:31 GMT (envelope-from otis@FreeBSD.org) Received: (from otis@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BUDNUrv034077; Wed, 30 Dec 2020 13:23:30 GMT (envelope-from otis@FreeBSD.org) Message-Id: <202012301323.0BUDNUrv034077@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: otis set sender to otis@FreeBSD.org using -f From: Juraj Lutter Date: Wed, 30 Dec 2020 13:23:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r559659 - head/textproc/elasticsearch7 X-SVN-Group: ports-head X-SVN-Commit-Author: otis X-SVN-Commit-Paths: head/textproc/elasticsearch7 X-SVN-Commit-Revision: 559659 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Dec 2020 13:23:31 -0000 Author: otis Date: Wed Dec 30 13:23:30 2020 New Revision: 559659 URL: https://svnweb.freebsd.org/changeset/ports/559659 Log: textproc/elasticsearch7: Update to 7.10.1 Changelog at: https://www.elastic.co/guide/en/elasticsearch/reference/current/release-notes-7.10.1.html And while here, also reformat Makefile according to portfmt and portclippy Reviewed by: osa (mentor) Approved by: osa (mentor) Differential Revision: https://reviews.freebsd.org/D27820 Modified: head/textproc/elasticsearch7/Makefile head/textproc/elasticsearch7/distinfo Modified: head/textproc/elasticsearch7/Makefile ============================================================================== --- head/textproc/elasticsearch7/Makefile Wed Dec 30 13:21:02 2020 (r559658) +++ head/textproc/elasticsearch7/Makefile Wed Dec 30 13:23:30 2020 (r559659) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= elasticsearch -PORTVERSION= 7.10.0 +PORTVERSION= 7.10.1 CATEGORIES= textproc java devel MASTER_SITES= https://artifacts.elastic.co/downloads/${PORTNAME}/ PKGNAMESUFFIX= 7 -DISTNAME= ${PORTNAME}-${PORTVERSION}-no-jdk-linux-x86_64 +DISTNAME= ${PORTNAME}-${PORTVERSION}-no-jdk-darwin-x86_64 MAINTAINER= elastic@FreeBSD.org COMMENT= Full-text search engine for Java @@ -18,70 +18,44 @@ RUN_DEPENDS= bash>0:shells/bash \ jna>0:devel/jna USES= cpe shebangfix +USE_JAVA= yes +JAVA_VERSION= 8+ +USE_RC_SUBR= ${PORTNAME} +SHEBANG_FILES= bin/elasticsearch bin/elasticsearch-certgen \ + bin/elasticsearch-certutil bin/elasticsearch-cli \ + bin/elasticsearch-croneval bin/elasticsearch-env \ + bin/elasticsearch-env-from-file bin/elasticsearch-keystore \ + bin/elasticsearch-migrate bin/elasticsearch-node \ + bin/elasticsearch-plugin bin/elasticsearch-saml-metadata \ + bin/elasticsearch-setup-passwords bin/elasticsearch-shard \ + bin/elasticsearch-sql-cli bin/elasticsearch-syskeygen \ + bin/elasticsearch-users bin/x-pack-env bin/x-pack-security-env \ + bin/x-pack-watcher-env + CONFLICTS= elasticsearch[56]-[0-9]* NO_ARCH= yes -USE_JAVA= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -JAVA_VERSION= 8+ -USE_RC_SUBR= ${PORTNAME} -SHEBANG_FILES= bin/elasticsearch \ - bin/elasticsearch-certgen \ - bin/elasticsearch-certutil \ - bin/elasticsearch-cli \ - bin/elasticsearch-croneval \ - bin/elasticsearch-env \ - bin/elasticsearch-env-from-file \ - bin/elasticsearch-keystore \ - bin/elasticsearch-migrate \ - bin/elasticsearch-node \ - bin/elasticsearch-plugin \ - bin/elasticsearch-saml-metadata \ - bin/elasticsearch-setup-passwords \ - bin/elasticsearch-shard \ - bin/elasticsearch-sql-cli \ - bin/elasticsearch-syskeygen \ - bin/elasticsearch-users \ - bin/x-pack-env \ - bin/x-pack-security-env \ - bin/x-pack-watcher-env OPTIONS_DEFINE= DOCS .include -CONFIG_FILES= elasticsearch.yml \ - jvm.options \ - log4j2.properties \ - role_mapping.yml \ - roles.yml -BINS= elasticsearch \ - elasticsearch-certgen \ - elasticsearch-certutil \ - elasticsearch-cli \ - elasticsearch-croneval \ - elasticsearch-env \ - elasticsearch-env-from-file \ - elasticsearch-keystore \ - elasticsearch-migrate \ - elasticsearch-node \ - elasticsearch-plugin \ - elasticsearch-saml-metadata \ - elasticsearch-setup-passwords \ - elasticsearch-shard \ - elasticsearch-sql-cli \ +CONFIG_FILES= elasticsearch.yml jvm.options log4j2.properties \ + role_mapping.yml roles.yml +BINS= elasticsearch elasticsearch-certgen elasticsearch-certutil \ + elasticsearch-cli elasticsearch-croneval elasticsearch-env \ + elasticsearch-env-from-file elasticsearch-keystore \ + elasticsearch-migrate elasticsearch-node elasticsearch-plugin \ + elasticsearch-saml-metadata elasticsearch-setup-passwords \ + elasticsearch-shard elasticsearch-sql-cli \ elasticsearch-sql-cli-${PORTVERSION}.jar \ - elasticsearch-syskeygen \ - elasticsearch-users \ - x-pack-env \ - x-pack-security-env \ - x-pack-watcher-env + elasticsearch-syskeygen elasticsearch-users x-pack-env \ + x-pack-security-env x-pack-watcher-env -PORTDOCS= LICENSE.txt \ - NOTICE.txt \ - README.asciidoc +PORTDOCS= LICENSE.txt NOTICE.txt README.asciidoc SIGAR_ARCH= ${ARCH:S|i386|x86|} SEARCHUSER?= elasticsearch @@ -89,12 +63,13 @@ SEARCHGROUP?= ${SEARCHUSER} USERS= ${SEARCHUSER} GROUPS= ${SEARCHGROUP} -SUB_LIST= ETCDIR=${ETCDIR} JAVA_HOME=${JAVA_HOME} SUB_FILES= pkg-message +SUB_LIST= ETCDIR=${ETCDIR} \ + JAVA_HOME=${JAVA_HOME} post-patch: ${RM} ${WRKSRC}/lib/jna-*.jar - # ML plugin not supported on FreeBSD +# ML plugin not supported on FreeBSD ${RM} -rf ${WRKSRC}/modules/x-pack/x-pack-ml do-install: Modified: head/textproc/elasticsearch7/distinfo ============================================================================== --- head/textproc/elasticsearch7/distinfo Wed Dec 30 13:21:02 2020 (r559658) +++ head/textproc/elasticsearch7/distinfo Wed Dec 30 13:23:30 2020 (r559659) @@ -1,3 +1,3 @@ -TIMESTAMP = 1605452048 -SHA256 (elasticsearch-7.10.0-no-jdk-linux-x86_64.tar.gz) = 446e810113f51c048212b9b89b1e7f35ea37ce6292312d60f678266fdd43409a -SIZE (elasticsearch-7.10.0-no-jdk-linux-x86_64.tar.gz) = 164353416 +TIMESTAMP = 1609277185 +SHA256 (elasticsearch-7.10.1-no-jdk-darwin-x86_64.tar.gz) = 269189ce606b071a30724fa678cca42dcbdea88134770070d043927b2a748dac +SIZE (elasticsearch-7.10.1-no-jdk-darwin-x86_64.tar.gz) = 162046388