git: b324cf36c1c0 - main - devel/opengrok: depend on opengrok-tools for wrapper script

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Siva Mahadevan <siva_at_FreeBSD.org>
Date: Thu, 01 Oct 2026 20:51:42 UTC
The branch main has been updated by siva:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b324cf36c1c0c505844278fe16ec07a2daac844f

commit b324cf36c1c0c505844278fe16ec07a2daac844f
Author:     Siva Mahadevan <siva@FreeBSD.org>
AuthorDate: 2026-09-16 13:45:04 +0000
Commit:     Siva Mahadevan <siva@FreeBSD.org>
CommitDate: 2026-10-01 20:50:48 +0000

    devel/opengrok: depend on opengrok-tools for wrapper script
    
    This is the upstream supported path going forward.
---
 devel/opengrok/Makefile             | 14 ++++++++------
 devel/opengrok/Makefile.common      |  1 +
 devel/opengrok/files/opengrok.in    |  6 ------
 devel/opengrok/files/pkg-message.in | 16 ++++++++++++++++
 devel/opengrok/pkg-plist            |  1 -
 devel/py-opengrok-tools/Makefile    |  4 +++-
 devel/py-opengrok-tools/distinfo    |  6 +++---
 7 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/devel/opengrok/Makefile b/devel/opengrok/Makefile
index d57f4e2a32c8..b0f36fa42225 100644
--- a/devel/opengrok/Makefile
+++ b/devel/opengrok/Makefile
@@ -1,5 +1,6 @@
 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}/
@@ -22,9 +23,10 @@ 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
@@ -32,7 +34,7 @@ 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}
@@ -53,7 +55,7 @@ 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
@@ -69,10 +71,10 @@ do-install:
 	(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 <bsd.port.mk>
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
@@ -14,4 +14,20 @@ java version 21 or higher is required.  Example:
 	tomcat101_java_home="%%LOCALBASE%%/openjdk21" in /etc/rc.conf
 EOM
 }
+{
+  type: upgrade
+  maximum_version: "1.14.19_1"
+  message: <<EOM
+The %%LOCALBASE%%/bin/opengrok java wrapper script has been replaced
+by the upstream-supported opengrok-tools python command runner, installed
+to the same path. Refer to upstream's Setup Opengrok[0] and Repository
+Synchronization[1] wiki guides for instructions and opengrok-tools usage examples
+using the new %%LOCALBASE%%/bin/opengrok wrapper script, or try running:
+
+opengrok --help
+
+[0] https://github.com/oracle/opengrok/wiki/How-to-setup-OpenGrok#step1---install-management-tools-optional
+[1] https://github.com/oracle/opengrok/wiki/Repository-synchronization
+EOM
+}
 ]
diff --git a/devel/opengrok/pkg-plist b/devel/opengrok/pkg-plist
index d557617f6453..75ea0ace293a 100644
--- a/devel/opengrok/pkg-plist
+++ b/devel/opengrok/pkg-plist
@@ -270,6 +270,5 @@
 %%T%%/webapps/opengrok/settings.jsp
 %%T%%/webapps/opengrok/status.jsp
 %%T%%/webapps/opengrok/xref.jspf
-bin/opengrok
 %%DATADIR%%/etc/logging.properties.sample
 @dir /var/log/opengrok
diff --git a/devel/py-opengrok-tools/Makefile b/devel/py-opengrok-tools/Makefile
index 23d1a86c2ee8..927bee84c683 100644
--- a/devel/py-opengrok-tools/Makefile
+++ b/devel/py-opengrok-tools/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	opengrok-tools
-DISTVERSION=	1.14.1
+DISTVERSION=	${OPENGROK_DISTVERSION}
+PORTREVISION=	1
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -36,4 +37,5 @@ post-patch:
 	@${REINPLACE_CMD} 's/0\.0\.1/${DISTVERSION}/g' \
 		${BUILD_WRKSRC}/src/main/python/opengrok_tools/version.py
 
+.include "../opengrok/Makefile.common"
 .include <bsd.port.mk>
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