- Update to 8.05

- Allow plugin installation via options.

3 files changed, 81 insertions, 16 deletions

diff --git a/cad/electric-ng/Makefile b/cad/electric-ng/Makefile
index 48d33f96b567..3833c6a05095 100644
--- a/cad/electric-ng/Makefile
+++ b/cad/electric-ng/Makefile
@@ -7,10 +7,11 @@
 #
 
 PORTNAME=	electric-ng
-PORTVERSION=	8.04
-PORTREVISION=	1
+PORTVERSION=	8.05
+PORTREVISION=	0
 CATEGORIES=	cad java
-MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU} \
+		http://www.staticfreesoft.com/:1
 MASTER_SITE_SUBDIR=	${PORTNAME:S/-ng//}
 DISTNAME=	electric-${PORTVERSION}
 EXTRACT_SUFX=	.jar
@@ -20,7 +21,7 @@ MAINTAINER=	stas@FreeBSD.org
 COMMENT=	A sophisticated VLSI design system
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE} \
 		bin/electric-ng
@@ -28,9 +29,17 @@ SUB_LIST+=	LIBFILES="${LIBFILES}" \
 		JARFILE="${JARFILE}"
 SUB_FILES=	electric-ng
 
-OPTIONS=	BSH "Enable embedded java interpreter via BSH" off
+OPTIONS=	BSH	"Enable embedded java interpreter via BSH"	off \
+		3D	"Enable 3D visualization via Java3D"		off \
+		IRSIM	"Install IRSIM plugin"				off \
+		PIE	"Install PIE plugin"				off \
+		ANIM	"Install 3D animation plugin"			off \
+		AXIS	"Install 3D Axis Controller plugin"		off \
+		RUSSIAN	"Install Russian manual"			off
 
 JARFILE=	${DISTNAME}${EXTRACT_SUFX}
+J3DLIB=		${LOCALBASE}/share/java/java3d/jar/j3dcore.jar
+PLUGINDIR=	${PREFIX}/libexec/electric/
 
 .include <bsd.port.pre.mk>
 
@@ -39,7 +48,43 @@ WITH_BSH=	yes
 .endif
 .if defined(WITH_BSH)
 RUN_DEPENDS+=	${JAVALIBDIR}/bsh.jar:${PORTSDIR}/java/bsh
-LIBFILES+=	bsh
+LIBFILES+=	${JAVALIBDIR}/bsh.jar
+.endif
+
+.if defined(WITH_AXIS)
+WITH_3D=	yes
+PLUGINS+=	electricJava3D-8.05
+.endif
+
+.if defined(WITH_ANIM)
+WITH_3D=	yes
+RUN_DEPENDS+=	${JAVALIBDIR}/jmf.jar:${PORTSDIR}/java/jmf
+PLUGINS+=	electricJMF-8.05
+.endif
+
+.if exists(${J3DLIB})
+WITH_3D=	yes
+.endif
+.if defined(WITH_3D)
+RUN_DEPENDS+=	${J3DLIB}:${PORTSDIR}/java/java3d
+.endif
+
+.if defined(WITH_IRSIM)
+PLUGINS+=	electricIRSIM-8.05
+.endif
+
+.if defined(WITH_PIE)
+PLUGINS+=	electricPIE-8.05
+.endif
+
+.if defined(WITH_RUSSIAN)
+PLUGINS+=	electricRussianManual-8.05
+.endif
+
+.if defined(PLUGINS)
+LIBFILES+=	${PLUGINS:S,$,.jar,:S,^,${PLUGINDIR}/,}
+DISTFILES=	${PLUGINS:S,$,.jar,:S,$,:1,} ${DISTNAME}${EXTRACT_SUFX}
+PLIST_FILES+=	${PLUGINS:S,$,.jar,:S,^,libexec/electric/,}
 .endif
 
 do-install:
@@ -47,4 +92,10 @@ do-install:
 	${INSTALL_DATA} ${DISTDIR}/${JARFILE} ${JAVAJARDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/electric-ng ${PREFIX}/bin
 
+.if defined(PLUGINS)
+	# Install plugins
+	@${MKDIR} ${PLUGINDIR}/
+	${INSTALL_DATA} ${PLUGINS:S,^,${DISTDIR}/,:S,$,.jar,} ${PLUGINDIR}/
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/cad/electric-ng/distinfo b/cad/electric-ng/distinfo
index 795631e008a2..d526005f1240 100644
--- a/cad/electric-ng/distinfo
+++ b/cad/electric-ng/distinfo
@@ -1,3 +1,18 @@
-MD5 (electric-8.04.jar) = a1fff5fb4cdc0c0744fd4d38cc937be8
-SHA256 (electric-8.04.jar) = 9e9a2361e7e7acfd0b1136fc3347fba8c4ff84f4f1f263f0e5da0b12e4b56f7a
-SIZE (electric-8.04.jar) = 12740616
+MD5 (electricJava3D-8.05.jar) = 33b1a4680ef64c1a1040c331beb3f001
+SHA256 (electricJava3D-8.05.jar) = 23b39bf0716f0875d0a9e85e5f995d10d0dc0ab76075e924fd63ac057d605544
+SIZE (electricJava3D-8.05.jar) = 8912
+MD5 (electricIRSIM-8.05.jar) = bd23fea1c233bf996104e16b7d0476e5
+SHA256 (electricIRSIM-8.05.jar) = 464ae8125c31a225edd64ebdf976fde98b144fdc0f6ff5d62fc39d0c064e4dac
+SIZE (electricIRSIM-8.05.jar) = 157574
+MD5 (electricPIE-8.05.jar) = 5a150d547270d51289696ee7ab9c5eb5
+SHA256 (electricPIE-8.05.jar) = 446a6ad3b6968c83add66986696aecdd532fb289479064fdc0a891d95c8862e0
+SIZE (electricPIE-8.05.jar) = 453043
+MD5 (electricJMF-8.05.jar) = 060c2f098fde7b0157d9391047023500
+SHA256 (electricJMF-8.05.jar) = 672afb486bf9acd7c2d3042271cb181859dbc54b7a30a798b472d3f5d4d6b5f7
+SIZE (electricJMF-8.05.jar) = 13857
+MD5 (electricRussianManual-8.05.jar) = 2594124780e65ccebf77df0a440d20f9
+SHA256 (electricRussianManual-8.05.jar) = d80c53054914b53e74cdb9ef6f9139af6ab8b7b8be8599b1f832ef8330aff64e
+SIZE (electricRussianManual-8.05.jar) = 1932156
+MD5 (electric-8.05.jar) = dba78b65c394e92d638f03d80d349b40
+SHA256 (electric-8.05.jar) = 5ef4b86f5d6009a68efb5db482e33ebfd70def019b3297db07a3e38be2027c7a
+SIZE (electric-8.05.jar) = 13528928
diff --git a/cad/electric-ng/files/electric-ng.in b/cad/electric-ng/files/electric-ng.in
index 2e8429b37ea2..b419239d7d36 100644
--- a/cad/electric-ng/files/electric-ng.in
+++ b/cad/electric-ng/files/electric-ng.in
@@ -8,11 +8,10 @@ set LIBFILES = "%%LIBFILES%%"
 set JARPATH = "%%JAVALIBDIR%%"
 setenv JAVA_VERSION "%%JAVA_VERSION%%"
 
-set CLASSPATH = ""
-foreach i (${LIBFILES})
-	set CLASSPATH =  ${CLASSPATH}":"${JARPATH}/$i.jar
-end
+if ( "${LIBFILES}" != "" ) then
+	set CLASSPATH = :`echo ${LIBFILES} | sed -E -e 's,[[:space:]]+,:,g'`
+else
+	set CLASSPATH = ""
+endif
 
-set CLASSPATH = `echo ${CLASSPATH} | /usr/bin/sed -e "s#^:##"`
-
-exec "${JAVA}" -cp "${CLASSPATH}" -jar %%JAVAJARDIR%%/%%JARFILE%%
+exec "${JAVA}" -cp %%JAVAJARDIR%%/%%JARFILE%%"${CLASSPATH}" com.sun.electric.Launcher