diff --git a/devel/opengrok/Makefile b/devel/opengrok/Makefile index d57f4e2a32c8..b0f36fa42225 100644 --- a/devel/opengrok/Makefile +++ b/devel/opengrok/Makefile @@ -1,78 +1,80 @@ PORTNAME= opengrok -DISTVERSION= 1.14.19 +DISTVERSION= ${OPENGROK_DISTVERSION} +PORTREVISION= 1 CATEGORIES= devel java # Doesn't currently work with portscout, but the release tarball is required. MASTER_SITES= https://github.com/oracle/opengrok/releases/download/${DISTVERSION}/ MAINTAINER= siva@FreeBSD.org COMMENT= Fast and powerful code search and cross-reference engine WWW= https://opengrok.github.io/OpenGrok/ LICENSE= CDDL ADAIC BSD3CLAUSE EPL ECMA MIT RUBY LICENSE_COMB= multi LICENSE_NAME_ADAIC= Ada Reference Manual, ISO/IEC 8652:2007(E) Ed. 3 LICENSE_NAME_ECMA= Ecma International 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_PERMS_ADAIC= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_ECMA= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -RUN_DEPENDS= uctags:devel/universal-ctags +RUN_DEPENDS= uctags:devel/universal-ctags \ + opengrok:devel/py-opengrok-tools@${PY_FLAVOR} -USES= cpe java +USES= cpe java python:env CPE_VENDOR= oracle JAVA_VERSION= 21+ SHAREOWN= www SHAREGRP= www NO_BUILD= yes NO_ARCH= yes PORTDOCS= README.md logging.properties.template -SUB_FILES= opengrok pkg-message +SUB_FILES= pkg-message SUB_LIST+= JARFILE="${JARFILE}" PLIST_SUB= T=${WEBAPP_HOME:S|^${LOCALBASE}/||} \ OWNER=${SHAREOWN} GROUP=${SHAREGRP} OPTIONS_DEFINE= DOCS OPTIONS_SINGLE= AS OPTIONS_SINGLE_AS= GLASSFISH TOMCAT101 OPTIONS_DEFAULT= TOMCAT101 GLASSFISH_DESC= Glassfish support GLASSFISH_VARS= WEBAPP_HOME=${LOCALBASE}/glassfish-5.1.0/glassfish TOMCAT101_VARS= WEBAPP_HOME=${LOCALBASE}/apache-tomcat-10.1 GLASSFISH_BUILD_DEPENDS=${WEBAPP_HOME}/modules/glassfish.jar:www/glassfish GLASSFISH_RUN_DEPENDS= ${WEBAPP_HOME}/modules/glassfish.jar:www/glassfish TOMCAT101_BUILD_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat101 TOMCAT101_RUN_DEPENDS= ${WEBAPP_HOME}/bin/bootstrap.jar:www/tomcat101 WEBAPPS_DIR= ${WEBAPP_HOME:S|^${LOCALBASE}/||}/webapps -JARFILE= ${LOCALBASE}/${WEBAPPS_DIR}/opengrok/WEB-INF/lib/opengrok-${PORTVERSION}.jar +JARFILE= ${LOCALBASE}/${WEBAPPS_DIR}/opengrok/WEB-INF/lib/opengrok-${DISTVERSION}.jar post-extract: @${MKDIR} ${WRKSRC}/lib/opengrok @${TAR} -xf ${WRKSRC}/lib/source.war -C ${WRKSRC}/lib/opengrok @${RM} ${WRKSRC}/lib/opengrok/WEB-INF/classes/sample.c # clean cruft do-install: @${MKDIR} ${STAGEDIR}${DATADIR}/etc \ ${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 && \ ${MV} web.xml web.xml.sample) ${INSTALL_DATA} ${WRKSRC}/doc/logging.properties ${STAGEDIR}${DATADIR}/etc/logging.properties.sample - ${INSTALL_SCRIPT} ${WRKDIR}/opengrok ${STAGEDIR}${PREFIX}/bin do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${STAGEDIR}${DOCSDIR}/ +.include "Makefile.common" .include diff --git a/devel/opengrok/Makefile.common b/devel/opengrok/Makefile.common new file mode 100644 index 000000000000..411389ea2367 --- /dev/null +++ b/devel/opengrok/Makefile.common @@ -0,0 +1 @@ +OPENGROK_DISTVERSION= 1.14.19 diff --git a/devel/opengrok/files/opengrok.in b/devel/opengrok/files/opengrok.in deleted file mode 100644 index 19c2360ac275..000000000000 --- a/devel/opengrok/files/opengrok.in +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -JAVA= "%%LOCALBASE%%/bin/java" -export JAVA_VERSION="%%JAVA_VERSION%%" - -exec "${JAVA}" -jar %%JARFILE%% -c %%LOCALBASE%%/bin/uctags $* diff --git a/devel/opengrok/files/pkg-message.in b/devel/opengrok/files/pkg-message.in index 37ac0067391f..bd9c8981fb50 100644 --- a/devel/opengrok/files/pkg-message.in +++ b/devel/opengrok/files/pkg-message.in @@ -1,17 +1,33 @@ [ { type: install message: <=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.6.0:devel/py-jsonschema@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.20.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>0:devel/py-pyyaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}resource>=0.2.0:devel/py-resource@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}filelock>0:sysutils/py-filelock@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mockito>0:devel/py-mockito@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gitpython>0:devel/py-gitpython@${PY_FLAVOR} \ git-tiny>0:devel/git@tiny USES= python USE_GITHUB= yes GH_ACCOUNT= oracle GH_PROJECT= opengrok USE_PYTHON= autoplist pep517 pytest NO_ARCH= yes BUILD_WRKSRC= ${WRKSRC}/tools INSTALL_WRKSRC= ${BUILD_WRKSRC} post-patch: @${REINPLACE_CMD} 's/0\.0\.1/${DISTVERSION}/g' \ ${BUILD_WRKSRC}/src/main/python/opengrok_tools/version.py +.include "../opengrok/Makefile.common" .include diff --git a/devel/py-opengrok-tools/distinfo b/devel/py-opengrok-tools/distinfo index b6c5c34c126a..a0a36f00ce4c 100644 --- a/devel/py-opengrok-tools/distinfo +++ b/devel/py-opengrok-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1789399949 -SHA256 (oracle-opengrok-1.14.1_GH0.tar.gz) = aca6b072b17192c45bc9814af12b9c479a5b29e9a31b05bb120593651b809b8c -SIZE (oracle-opengrok-1.14.1_GH0.tar.gz) = 2205348 +TIMESTAMP = 1789590679 +SHA256 (oracle-opengrok-1.14.19_GH0.tar.gz) = 5456aab373aa514eb2a6a775969fc4f690cf2e90505f821e0219fb07aa564402 +SIZE (oracle-opengrok-1.14.19_GH0.tar.gz) = 2249778