From owner-svn-ports-all@freebsd.org Thu Aug 13 22:36:09 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 E21EC3AE3EF; Thu, 13 Aug 2020 22:36:09 +0000 (UTC) (envelope-from truckman@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 4BSLyK645hz3gct; Thu, 13 Aug 2020 22:36:09 +0000 (UTC) (envelope-from truckman@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 B4BA324980; Thu, 13 Aug 2020 22:36:09 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07DMa9RH039731; Thu, 13 Aug 2020 22:36:09 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07DMa8jC039725; Thu, 13 Aug 2020 22:36:08 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <202008132236.07DMa8jC039725@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Thu, 13 Aug 2020 22:36:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r544854 - in head/devel/opengrok: . files X-SVN-Group: ports-head X-SVN-Commit-Author: truckman X-SVN-Commit-Paths: in head/devel/opengrok: . files X-SVN-Commit-Revision: 544854 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.33 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: Thu, 13 Aug 2020 22:36:09 -0000 Author: truckman Date: Thu Aug 13 22:36:08 2020 New Revision: 544854 URL: https://svnweb.freebsd.org/changeset/ports/544854 Log: Upgrade devel/opengrok to version 1.3.16, unbreak, undeprecate, and unexpire. Take maintainership. Tomcat < 8.0 is no longer supported. Upstream is silent on resin, but claims that glassfish is supported. Upstream says to use uctags. Upgrading requires re-indexing. Added: head/devel/opengrok/files/patch-doc_logging.properties (contents, props changed) head/devel/opengrok/pkg-message (contents, props changed) Modified: head/devel/opengrok/Makefile head/devel/opengrok/distinfo head/devel/opengrok/pkg-descr head/devel/opengrok/pkg-plist Modified: head/devel/opengrok/Makefile ============================================================================== --- head/devel/opengrok/Makefile Thu Aug 13 22:35:16 2020 (r544853) +++ head/devel/opengrok/Makefile Thu Aug 13 22:36:08 2020 (r544854) @@ -1,23 +1,28 @@ # $FreeBSD$ PORTNAME= opengrok -PORTVERSION= 1.0 -PORTREVISION= 1 +PORTVERSION= 1.3.16 CATEGORIES= devel java MASTER_SITES= https://github.com/oracle/opengrok/releases/download/${PORTVERSION}/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= truckman@FreeBSD.org COMMENT= Fast and powerful code search and cross-reference engine -BROKEN= unfetchable -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2020-08-26 - -LICENSE= CDDL APACHE20 +LICENSE= CDDL ADAIC BSD3CLAUSE EPL ECMA MIT RUBY LICENSE_COMB= multi -LICENSE_FILE= ${WRKSRC}/doc/LICENSE.txt +LICENSE_FILE_CDDL= ${WRKSRC}/doc/LICENSE.txt +LICENSE_FILE_ADAIC= ${WRKSRC}/doc/LICENSE-adaic.org.txt +LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/doc/LICENSE-scala.txt +LICENSE_FILE_EPL= ${WRKSRC}/doc/LICENSE-eclipse.txt +LICENSE_FILE_ECMA= ${WRKSRC}/doc/LICENSE-ecma.txt +LICENSE_FILE_MIT= ${WRKSRC}/doc/LICENSE-mandoc.txt +LICENSE_FILE_RUBY= ${WRKSRC}/doc/LICENSE-ruby.txt +LICENSE_NAME_ADAIC= Ada Reference Manual, ISO/IEC 8652:2007(E) Ed. 3 +LICENSE_PERMS_ADAIC= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +LICENSE_NAME_ECMA= Ecma International +LICENSE_PERMS_ECMA= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -RUN_DEPENDS= exctags:devel/ctags +RUN_DEPENDS= uctags:devel/universal-ctags USE_JAVA= yes JAVA_VERSION= 1.8+ @@ -25,7 +30,7 @@ SHAREOWN= www SHAREGRP= www NO_BUILD= yes NO_ARCH= yes -PORTDOCS= CHANGES.txt EXAMPLE.txt README.txt NOTICE.txt +PORTDOCS= README.md logging.properties.template paths.tsv SUB_FILES= opengrok SUB_LIST+= LIBFILES="${LIBFILES:S,^,${DATADIR}/lib/,}" \ JARFILE="${JARFILE}" @@ -34,30 +39,76 @@ PLIST_SUB= T=${WEBAPP_HOME:S|^${LOCALBASE}/||} \ OPTIONS_DEFINE= DOCS OPTIONS_SINGLE= AS -OPTIONS_SINGLE_AS= TOMCAT85 TOMCAT7 RESIN3 +OPTIONS_SINGLE_AS= GLASSFISH TOMCAT85 TOMCAT9 OPTIONS_DEFAULT= TOMCAT85 -TOMCAT7_VARS= WEBAPP_HOME=${LOCALBASE}/apache-tomcat-7.0 +GLASSFISH_DESC?= Glassfish support + +GLASSFISH_VARS= WEBAPP_HOME=${LOCALBASE}/glassfish-5.1.0/glassfish TOMCAT85_VARS= WEBAPP_HOME=${LOCALBASE}/apache-tomcat-8.5 -RESIN3_VARS= WEBAPP_HOME=${LOCALBASE}/resin3 +TOMCAT9_VARS= WEBAPP_HOME=${LOCALBASE}/apache-tomcat-9.0 -TOMCAT7_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat7 -TOMCAT7_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat7 +GLASSFISH_BUILD_DEPENDS=${WEBAPP_HOME}/modules/glassfish.jar:www/glassfish +GLASSFISH_RUN_DEPENDS= ${WEBAPP_HOME}/modules/glassfish.jar:www/glassfish TOMCAT85_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat85 TOMCAT85_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat85 -RESIN3_BUILD_DEPENDS= ${WEBAPP_HOME}/lib/resin.jar:www/resin3 -RESIN3_RUN_DEPENDS= ${WEBAPP_HOME}/lib/resin.jar:www/resin3 +TOMCAT9_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat9 +TOMCAT9_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat9 JARFILE= ${DATADIR}/opengrok.jar -LIBFILES= ant.jar \ - bcel-6.0.jar \ - jrcs.jar \ - lucene-analyzers-common-6.5.0.jar \ - lucene-core-6.5.0.jar \ - lucene-queryparser-6.5.0.jar \ - lucene-suggest-6.5.0.jar \ - swing-layout-0.9.jar \ - json-simple-1.1.1.jar +LIBFILES= activation-1.1.1.jar \ + ant-1.10.1.jar \ + ant-launcher-1.10.1.jar \ + aopalliance-repackaged-2.6.1.jar \ + bcel-6.4.1.jar \ + classmate-1.3.4.jar \ + commons-compress-1.19.jar \ + commons-lang3-3.9.jar \ + cron-utils-7.0.2.jar \ + hibernate-validator-6.0.17.Final.jar \ + hk2-api-2.6.1.jar \ + hk2-locator-2.6.1.jar \ + hk2-utils-2.6.1.jar \ + jackson-annotations-2.10.1.jar \ + jackson-core-2.10.1.jar \ + jackson-databind-2.10.1.jar \ + jackson-module-jaxb-annotations-2.10.1.jar \ + jakarta.activation-api-1.2.1.jar \ + jakarta.annotation-api-1.3.5.jar \ + jakarta.el-3.0.2.jar \ + jakarta.el-api-3.0.3.jar \ + jakarta.inject-2.6.1.jar \ + jakarta.validation-api-2.0.2.jar \ + jakarta.ws.rs-api-2.1.6.jar \ + jakarta.xml.bind-api-2.3.2.jar \ + javassist-3.25.0-GA.jar \ + jaxb-api-2.3.0.jar \ + jaxb-core-2.3.0.jar \ + jaxb-impl-2.3.0.jar \ + jboss-logging-3.3.2.Final.jar \ + jersey-bean-validation-2.30.1.jar \ + jersey-client-2.30.1.jar \ + jersey-common-2.30.1.jar \ + jersey-entity-filtering-2.30.1.jar \ + jersey-hk2-2.30.1.jar \ + jersey-media-jaxb-2.30.1.jar \ + jersey-media-json-jackson-2.30.1.jar \ + jersey-server-2.30.1.jar \ + lucene-analyzers-common-8.5.2.jar \ + lucene-backward-codecs-8.5.2.jar \ + lucene-core-8.5.2.jar \ + lucene-highlighter-8.5.2.jar \ + lucene-join-8.5.2.jar \ + lucene-memory-8.5.2.jar \ + lucene-queries-8.5.2.jar \ + lucene-queryparser-8.5.2.jar \ + lucene-sandbox-8.5.2.jar \ + lucene-suggest-8.5.2.jar \ + opengrok-1.3.16.jar \ + org.suigeneris.jrcs.diff-0.4.2.jar \ + org.suigeneris.jrcs.rcs-0.4.2.jar \ + osgi-resource-locator-1.0.3.jar \ + slf4j-api-1.7.12.jar WEBAPPS_DIR= ${WEBAPP_HOME:S|^${LOCALBASE}/||}/webapps @@ -66,8 +117,9 @@ post-extract: @${TAR} -xf ${WRKSRC}/lib/source.war -C ${WRKSRC}/lib/opengrok do-install: - @${MKDIR} ${STAGEDIR}${DATADIR}/lib \ - ${STAGEDIR}${PREFIX}/${WEBAPPS_DIR}/${PORTNAME} + @${MKDIR} ${STAGEDIR}${DATADIR}/etc ${STAGEDIR}${DATADIR}/lib \ + ${STAGEDIR}${PREFIX}/${WEBAPPS_DIR}/${PORTNAME} \ + ${STAGEDIR}/var/log/opengrok (cd ${WRKSRC}/lib/opengrok && ${COPYTREE_SHARE} . \ ${STAGEDIR}${PREFIX}/${WEBAPPS_DIR}/${PORTNAME}) (cd ${STAGEDIR}${PREFIX}/${WEBAPPS_DIR}/${PORTNAME}/WEB-INF && \ @@ -75,6 +127,8 @@ do-install: ${INSTALL_DATA} ${LIBFILES:S,^,${WRKSRC}/lib/lib/,} \ ${STAGEDIR}${DATADIR}/lib/ ${INSTALL_DATA} ${WRKSRC}/lib/opengrok.jar ${STAGEDIR}${DATADIR}/ + ${INSTALL_DATA} ${WRKSRC}/lib/source.war ${STAGEDIR}${DATADIR}/ + ${INSTALL_DATA} ${WRKSRC}/doc/logging.properties ${STAGEDIR}${DATADIR}/etc/logging.properties.sample ${INSTALL_SCRIPT} ${WRKDIR}/opengrok ${STAGEDIR}${PREFIX}/bin do-install-DOCS-on: Modified: head/devel/opengrok/distinfo ============================================================================== --- head/devel/opengrok/distinfo Thu Aug 13 22:35:16 2020 (r544853) +++ head/devel/opengrok/distinfo Thu Aug 13 22:36:08 2020 (r544854) @@ -1,3 +1,3 @@ -TIMESTAMP = 1497689239 -SHA256 (opengrok-1.0.tar.gz) = d86dd30be7b957f57b0f65deb9a4aa56d353d5b0e47ea04fca746fe7c4073b97 -SIZE (opengrok-1.0.tar.gz) = 16487516 +TIMESTAMP = 1597089207 +SHA256 (opengrok-1.3.16.tar.gz) = 72496b9d2d731a618507c41d8339282c72d9083d6f36477a4e412a22c7091a7f +SIZE (opengrok-1.3.16.tar.gz) = 55244095 Added: head/devel/opengrok/files/patch-doc_logging.properties ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/opengrok/files/patch-doc_logging.properties Thu Aug 13 22:36:08 2020 (r544854) @@ -0,0 +1,11 @@ +--- doc/logging.properties.orig 2020-06-08 11:13:44 UTC ++++ doc/logging.properties +@@ -39,7 +39,7 @@ handlers= java.util.logging.FileHandler, java.util.log + + # default file output is in user's home directory. + #java.util.logging.FileHandler.pattern = %hjava%u.log +-java.util.logging.FileHandler.pattern = opengrok%g.%u.log ++java.util.logging.FileHandler.pattern = /var/log/opengrok/opengrok%g.%u.log + java.util.logging.FileHandler.limit = 52428800 + java.util.logging.FileHandler.count = 3 + java.util.logging.FileHandler.level = ALL Modified: head/devel/opengrok/pkg-descr ============================================================================== --- head/devel/opengrok/pkg-descr Thu Aug 13 22:35:16 2020 (r544853) +++ head/devel/opengrok/pkg-descr Thu Aug 13 22:36:08 2020 (r544854) @@ -5,4 +5,4 @@ Mercurial, Git, SCCS, RCS, CVS, Subversion, Teamware, and Bazaar. In other words it lets you grok (profoundly understand) the open source, hence the name OpenGrok. It is written in Java. -WWW: http://opengrok.github.io/OpenGrok/ +WWW: https://opengrok.github.io/OpenGrok/ Added: head/devel/opengrok/pkg-message ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/opengrok/pkg-message Thu Aug 13 22:36:08 2020 (r544854) @@ -0,0 +1,8 @@ +[ +{ type: upgrade + message: <