git: aec02b79c08d - main - cad/electric-ng: Update 9.07 => 9.08.1, refactor, take maintainership

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Älven <alven_at_FreeBSD.org>
Date: Mon, 23 Mar 2026 08:24:48 UTC
The branch main has been updated by alven:

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

commit aec02b79c08d5a43b23b534148f888bd06396d05
Author:     Älven <alven@FreeBSD.org>
AuthorDate: 2026-03-08 23:02:12 +0000
Commit:     Älven <alven@FreeBSD.org>
CommitDate: 2026-03-23 08:24:37 +0000

    cad/electric-ng: Update 9.07 => 9.08.1, refactor, take maintainership
    
    * Rewrite the port to clean modern standards with many improvements
    
    Approved by:            yuri@ (Mentor)
    Approved by:            db@, yuri@ (Mentors, implicit)
    Differential Revision:  https://reviews.freebsd.org/D55749
---
 cad/electric-ng/Makefile             | 101 +++++++++++++++--------------------
 cad/electric-ng/distinfo             |  14 ++---
 cad/electric-ng/files/electric-ng.in |   2 +-
 cad/electric-ng/pkg-plist            |   6 +--
 4 files changed, 54 insertions(+), 69 deletions(-)

diff --git a/cad/electric-ng/Makefile b/cad/electric-ng/Makefile
index 92f37159a607..f53620f85b33 100644
--- a/cad/electric-ng/Makefile
+++ b/cad/electric-ng/Makefile
@@ -1,86 +1,71 @@
 PORTNAME=	electric
-PORTVERSION=	9.07
-PORTREVISION=	2
+DISTVERSION=	9.08.1
 CATEGORIES=	cad java
 MASTER_SITES=	GNU \
-		http://www.staticfreesoft.com/:1 \
-		http://www.staticfreesoft.com/jmanual/:2
+		https://www.staticfreesoft.com/:1 \
+		https://www.staticfreesoft.com/jmanual/:2
 PKGNAMESUFFIX=	-ng
 EXTRACT_SUFX=
-DISTFILES+=	${PORTNAME}Binary-${PORTVERSION}.jar
+DISTFILES=	${APP_JARFILE} ${SFS_JARFILE}:1 ${MANUAL_FILE}:2
 EXTRACT_ONLY=
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	alven@FreeBSD.org
 COMMENT=	Sophisticated VLSI design system
 WWW=		https://www.staticfreesoft.com/
 
 LICENSE=	GPLv3
 
-EXTRACT_DEPENDS=	${UNZIP_CMD}:archivers/unzip
-
 USES=		java
-NO_BUILD=	yes
-SUB_LIST+=	LIBFILES="${LIBFILES}" \
-		JARFILE="${JARFILE}"
-SUB_FILES=	electric-ng
-PLIST_SUB+=	VERSION="${PORTVERSION}"
-
-OPTIONS_DEFINE=	BSH 3D IRSIM DOCS
-BSH_DESC=	Enable embedded java interpreter via BSH
-3D_DESC=	Enable 3D visualization via Java3D
-IRSIM_DESC=	Install IRSIM and 3D animation plugin
-
-OPTIONS_DEFAULT=	IRSIM MANUAL 3D
-OPTIONS_SUB=	yes
-
-JARFILE=	${PORTNAME}Binary-${PORTVERSION}.jar
-J3DLIB=		${JAVA_HOME}/jre/lib/ext/j3dcore.jar
-PLUGINDIR=	${PREFIX}/libexec/${PORTNAME}${PKGNAMESUFFIX}
 
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 DESKTOP_ENTRIES="Electric-NG" "${COMMENT}" "${PORTNAME}${PKGNAMESUFFIX}" \
 			"${PORTNAME}${PKGNAMESUFFIX}" "Development;Electronics;Engineering;" false
+NO_ARCH=	yes
+NO_BUILD=	yes
+SUB_FILES=	electric-ng
+SUB_LIST=	JARFILE="${APP_JARFILE}" \
+		LIBFILES="${LIBFILES}"
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MBSH} || exists(${JAVALIBDIR}/bsh.jar)
-RUN_DEPENDS+=	${JAVALIBDIR}/bsh.jar:lang/bsh
-LIBFILES+=	${JAVALIBDIR}/bsh.jar
-.endif
-
-.if ${PORT_OPTIONS:M3D} || exists(${J3DLIB})
-RUN_DEPENDS+=	${J3DLIB}:java/java3d
-.endif
-
-.if ${PORT_OPTIONS:MIRSIM}
-RUN_DEPENDS+=	${JAVALIBDIR}/jmf.jar:java/jmf
-PLUGINS+=	electricSFS-${PORTVERSION}
-LIBFILES+=	${PREFIX}/libexec/${PORTNAME}${PKGNAMESUFFIX}/electricSFS-${PORTVERSION}.jar
-.endif
+PLIST_SUB=	VERSION=${DISTVERSION:R}
 
-DISTFILES+=	ElectricManual-${PORTVERSION}.pdf:2
+OPTIONS_DEFINE=		3D BSH DOCS PLUGINS
+OPTIONS_DEFAULT=	3D
+OPTIONS_SUB=		yes
 
-.if defined(PLUGINS)
-DISTFILES+=	electricSFS-${PORTVERSION}.jar:1
-.endif
+3D_DESC=	Enable 3D visualization via Java3D
+BSH_DESC=	Enable embedded Java interpreter via BSH
+PLUGINS_DESC=	Install IRSIM and 3D animation plugins
+
+3D_RUN_DEPENDS=		${LOCALBASE}/openjdk8/jre/lib/ext/j3dcore.jar:java/java3d
+BSH_RUN_DEPENDS=	${JAVALIBDIR}/bsh.jar:lang/bsh
+BSH_VARS=		LIBFILES+=${JAVALIBDIR}/bsh.jar
+PLUGINS_RUN_DEPENDS=	${JAVALIBDIR}/jmf.jar:java/jmf
+PLUGINS_VARS=		LIBFILES+=${PREFIX}/libexec/${PORTNAME}${PKGNAMESUFFIX}/${SFS_JARFILE}
+
+APP_JARFILE=	electricBinary-${DISTVERSION}.jar
+ICON_FILENAME=	"com/sun/electric/tool/user/help/helphtml/iconplug.png"
+MANUAL_FILE=	ElectricManual-${DISTVERSION:R}.pdf
+PLUGINDIR=	${PREFIX}/libexec/${PORTNAME}${PKGNAMESUFFIX}
+SFS_JARFILE=	electricSFS-${DISTVERSION:R}.jar
 
 post-extract:
-	@(cd ${DISTDIR}/${DIST_SUBDIR} && ${UNZIP_CMD} -d ${WRKDIR} ${PORTNAME}Binary-${PORTVERSION}.jar \
-		com/sun/electric/tool/user/help/helphtml/iconplug.png)
+	cd ${DISTDIR}/${DIST_SUBDIR} && \
+		${UNZIP_NATIVE_CMD} -d ${WRKDIR} ${APP_JARFILE} ${ICON_FILENAME}
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}${PKGNAMESUFFIX}
-	${INSTALL_DATA} ${DISTDIR}/ElectricManual-${PORTVERSION}.pdf ${STAGEDIR}${DOCSDIR}${PKGNAMESUFFIX}
-	${INSTALL_DATA} ${DISTDIR}/${JARFILE} ${STAGEDIR}${JAVAJARDIR}
+	${MKDIR} ${STAGEDIR}${JAVAJARDIR}
+	${INSTALL_DATA} ${DISTDIR}/${APP_JARFILE} ${STAGEDIR}${JAVAJARDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/electric-ng ${STAGEDIR}${PREFIX}/bin
 
-	${INSTALL_DATA} ${WRKDIR}/com/sun/electric/tool/user/help/helphtml/iconplug.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}${PKGNAMESUFFIX}.png
+	${INSTALL_DATA} ${WRKDIR}/${ICON_FILENAME} \
+		${STAGEDIR}${PREFIX}/share/pixmaps/electric-ng.png
+
+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${DISTDIR}/${MANUAL_FILE} ${STAGEDIR}${DOCSDIR}
 
-.if defined(PLUGINS)
-	# Install plugins
-	@${MKDIR} ${STAGEDIR}${PLUGINDIR}/
-	${INSTALL_DATA} ${DISTDIR}/electricSFS-${PORTVERSION}.jar ${STAGEDIR}${PLUGINDIR}/
-.endif
+post-install-PLUGINS-on:
+	${MKDIR} ${STAGEDIR}${PLUGINDIR}
+	${INSTALL_DATA} ${DISTDIR}/${SFS_JARFILE} ${STAGEDIR}${PLUGINDIR}
 
 .include <bsd.port.mk>
diff --git a/cad/electric-ng/distinfo b/cad/electric-ng/distinfo
index ddb1fc9e7298..91d45cedcc12 100644
--- a/cad/electric-ng/distinfo
+++ b/cad/electric-ng/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1479994492
-SHA256 (electricBinary-9.07.jar) = 3e383f673183265700e0c13a5f7b1d3348247465c3d8817c845d62e4c92d86ce
-SIZE (electricBinary-9.07.jar) = 21244560
-SHA256 (ElectricManual-9.07.pdf) = 836ebf850051cf797310fb7d61c40439d2582bb3b3fb3d5c2165059423b11ab4
-SIZE (ElectricManual-9.07.pdf) = 3622536
-SHA256 (electricSFS-9.07.jar) = a0377ca806d759cdd54ef9ea52bc2578dd8fe066c2018fdb7f31fd8936b533e2
-SIZE (electricSFS-9.07.jar) = 194665
+TIMESTAMP = 1771763041
+SHA256 (electricBinary-9.08.1.jar) = fcfd8b543aa0124f764945f2eba3a2c76dd7bd8db403dee2b1a3ddbc70875e5a
+SIZE (electricBinary-9.08.1.jar) = 16767066
+SHA256 (electricSFS-9.08.jar) = 8637071d0b50d1721c46a4a6d55b93f1dac7d4bbd5fa4d15f988509d6a3e2cb4
+SIZE (electricSFS-9.08.jar) = 195121
+SHA256 (ElectricManual-9.08.pdf) = c0d871bd61525030783268bf65a7004627b7cbfb417fa8e86e918e992fd753e7
+SIZE (ElectricManual-9.08.pdf) = 4348518
diff --git a/cad/electric-ng/files/electric-ng.in b/cad/electric-ng/files/electric-ng.in
index f86f1187ed9c..189ea8f88059 100644
--- a/cad/electric-ng/files/electric-ng.in
+++ b/cad/electric-ng/files/electric-ng.in
@@ -10,4 +10,4 @@ else
 	set CLASSPATH = ""
 endif
 
-exec "${JAVA}" -cp %%JAVAJARDIR%%/%%JARFILE%%"${CLASSPATH}" com.sun.electric.Launcher
+exec "${JAVA}" -cp %%JAVAJARDIR%%/%%JARFILE%%"${CLASSPATH}" com.sun.electric.Electric
diff --git a/cad/electric-ng/pkg-plist b/cad/electric-ng/pkg-plist
index f7b1a02aa230..0638d895bba1 100644
--- a/cad/electric-ng/pkg-plist
+++ b/cad/electric-ng/pkg-plist
@@ -1,5 +1,5 @@
 bin/electric-ng
-%%IRSIM%%libexec/electric-ng/electricSFS-%%VERSION%%.jar
-%%PORTDOCS%%%%DOCSDIR%%-ng/ElectricManual-%%VERSION%%.pdf
-share/java/classes/electricBinary-%%VERSION%%.jar
+%%PLUGINS%%libexec/electric-ng/electricSFS-%%VERSION%%.jar
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/ElectricManual-%%VERSION%%.pdf
+%%JAVAJARDIR%%/electricBinary-%%VERSION%%.1.jar
 share/pixmaps/electric-ng.png