git: 615f1321c275 - main - devel/violet: Improve port

From: Älven <alven_at_FreeBSD.org>
Date: Sun, 08 Mar 2026 17:19:51 UTC
The branch main has been updated by alven:

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

commit 615f1321c27548de21e5be80e2f4c34f914eeed5
Author:     Älven <alven@FreeBSD.org>
AuthorDate: 2026-03-08 17:16:02 +0000
Commit:     Älven <alven@FreeBSD.org>
CommitDate: 2026-03-08 17:18:28 +0000

    devel/violet: Improve port
    
    * Make calling Java program BSD-way (via SUB_FILE)
    
    Approved by:   db@, yuri@ (Mentors, implicit)
---
 devel/violet/Makefile        | 19 +++++++++----------
 devel/violet/files/violet.in |  3 +++
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/devel/violet/Makefile b/devel/violet/Makefile
index 7e9c27a52efb..34bae0639a50 100644
--- a/devel/violet/Makefile
+++ b/devel/violet/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	violet
 DISTVERSION=	2.3.0
+PORTREVISION=	1
 CATEGORIES=	devel editors java
 MASTER_SITES=	SF/${PORTNAME}/violetumleditor/${DISTVERSION}-SNAPSHOT/
 DISTNAME=	violetumleditor-${DISTVERSION}-SNAPSHOT
@@ -15,20 +16,18 @@ LICENSE=	GPLv2
 
 USES=		java
 
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+
 NO_ARCH=	YES
 NO_BUILD=	YES
+SUB_FILES=	${PORTNAME}
 
-PLIST_FILES=	${JAVASHAREDIR}/${PORTNAME}/violetumleditor.jar bin/${PORTNAME}
-
-pre-install:
-	${ECHO} "#!/bin/sh" > ${WRKDIR}/violet.sh
-	${ECHO} "${PREFIX}/bin/java -jar ${JAVASHAREDIR}/${PORTNAME}/violetumleditor.jar" \
-		>> ${WRKDIR}/violet.sh
+PLIST_FILES=	${DATADIR}/violetumleditor.jar bin/${PORTNAME}
 
 do-install:
-	${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}
-	${INSTALL_DATA} ${DISTDIR}/violetumleditor-${DISTVERSION}-SNAPSHOT.jar \
-		${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}/violetumleditor.jar
-	${INSTALL_SCRIPT} ${WRKDIR}/violet.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${DISTDIR}/${DISTNAME}.jar \
+		${STAGEDIR}${DATADIR}/violetumleditor.jar
 
 .include <bsd.port.mk>
diff --git a/devel/violet/files/violet.in b/devel/violet/files/violet.in
new file mode 100644
index 000000000000..70741476e4ff
--- /dev/null
+++ b/devel/violet/files/violet.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+"%%LOCALBASE%%/bin/java" -jar "%%DATADIR%%/violetumleditor.jar"