3 files changed, 23 insertions, 27 deletions

diff --git a/cad/electric-ng/Makefile b/cad/electric-ng/Makefile
index 38250d341dc0..95e6ed151400 100644
--- a/cad/electric-ng/Makefile
+++ b/cad/electric-ng/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	electric
 PORTVERSION=	9.04
+PORTREVISION=	1
 CATEGORIES=	cad java
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		http://www.staticfreesoft.com/:1 \
@@ -13,7 +14,7 @@ EXTRACT_SUFX=
 DISTFILES+=	${PORTNAME}Binary-${PORTVERSION}.jar
 EXTRACT_ONLY=
 
-MAINTAINER=	danilogondolfo@gmail.com
+MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Sophisticated VLSI design system
 
 LICENSE=	GPLv3
@@ -23,19 +24,17 @@ EXTRACT_DEPENDS=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
-PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE} \
-		bin/electric-ng
 SUB_LIST+=	LIBFILES="${LIBFILES}" \
 		JARFILE="${JARFILE}"
 SUB_FILES=	electric-ng
 
-OPTIONS_DEFINE=	BSH 3D IRSIM MANUAL
+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
-MANUAL_DESC=	Install documentation
 
 OPTIONS_DEFAULT=	IRSIM MANUAL 3D
+OPTIONS_SUB=	yes
 
 JARFILE=	${PORTNAME}Binary-${PORTVERSION}.jar
 J3DLIB=		${JAVA_HOME}/jre/lib/ext/j3dcore.jar
@@ -43,9 +42,7 @@ PLUGINDIR=	${PREFIX}/libexec/${PORTNAME}${PKGNAMESUFFIX}
 
 DESKTOP_ENTRIES="Electric-NG" "${COMMENT}" "${PORTNAME}${PKGNAMESUFFIX}" \
 			"${PORTNAME}${PKGNAMESUFFIX}" "Development;Electronics;Engineering;" ${FALSE}
-PLIST_FILES+=	share/pixmaps/${PORTNAME}${PKGNAMESUFFIX}.png
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBSH} || exists(${JAVALIBDIR}/bsh.jar)
@@ -63,16 +60,10 @@ PLUGINS+=	electricSFS-${PORTVERSION}
 LIBFILES+=	${PREFIX}/libexec/${PORTNAME}${PKGNAMESUFFIX}/electricSFS-${PORTVERSION}.jar
 .endif
 
-.if ${PORT_OPTIONS:MMANUAL}
 DISTFILES+=	ElectricManual-${PORTVERSION}.pdf:2
-PLIST_FILES+=	share/doc/${PORTNAME}${PKGNAMESUFFIX}/ElectricManual-${PORTVERSION}.pdf
-PLIST_DIRS+=	share/doc/${PORTNAME}${PKGNAMESUFFIX}
-.endif
 
 .if defined(PLUGINS)
 DISTFILES+=	electricSFS-${PORTVERSION}.jar:1
-PLIST_FILES+=	libexec/${PORTNAME}${PKGNAMESUFFIX}/electricSFS-${PORTVERSION}.jar
-PLIST_DIRS+=	libexec/${PORTNAME}${PKGNAMESUFFIX}
 .endif
 
 post-extract:
@@ -80,21 +71,19 @@ post-extract:
 		com/sun/electric/tool/user/help/helphtml/iconplug.png)
 
 do-install:
-	@${MKDIR} ${JAVAJARDIR}
-.if ${PORT_OPTIONS:MMANUAL}
-	@${MKDIR} ${DOCSDIR}${PKGNAMESUFFIX}
-	${INSTALL_DATA} ${DISTDIR}/ElectricManual-${PORTVERSION}.pdf ${DOCSDIR}${PKGNAMESUFFIX}
-.endif
-	${INSTALL_DATA} ${DISTDIR}/${JARFILE} ${JAVAJARDIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/electric-ng ${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}${PKGNAMESUFFIX}
+	${INSTALL_DATA} ${DISTDIR}/ElectricManual-${PORTVERSION}.pdf ${STAGEDIR}${DOCSDIR}${PKGNAMESUFFIX}
+	${INSTALL_DATA} ${DISTDIR}/${JARFILE} ${STAGEDIR}${JAVAJARDIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/electric-ng ${STAGEDIR}${PREFIX}/bin
 
 	${INSTALL_DATA} ${WRKDIR}/com/sun/electric/tool/user/help/helphtml/iconplug.png \
-		${PREFIX}/share/pixmaps/${PORTNAME}${PKGNAMESUFFIX}.png
+		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}${PKGNAMESUFFIX}.png
 
 .if defined(PLUGINS)
 	# Install plugins
-	@${MKDIR} ${PLUGINDIR}/
-	${INSTALL_DATA} ${DISTDIR}/electricSFS-${PORTVERSION}.jar ${PLUGINDIR}/
+	@${MKDIR} ${STAGEDIR}${PLUGINDIR}/
+	${INSTALL_DATA} ${DISTDIR}/electricSFS-${PORTVERSION}.jar ${STAGEDIR}${PLUGINDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/cad/electric-ng/distinfo b/cad/electric-ng/distinfo
index a9d1544ec8be..2c24a0a00928 100644
--- a/cad/electric-ng/distinfo
+++ b/cad/electric-ng/distinfo
@@ -1,6 +1,6 @@
-SHA256 (electricBinary-9.04.jar) = 1f8de6ce367f7cf2a72ef5253511765b92a58be9a4aca967b2196d1509a66eb8
-SIZE (electricBinary-9.04.jar) = 23716987
-SHA256 (ElectricManual-9.04.pdf) = 27646822a411283e9d5ab40fa2fe7c744162e38d998db54f2cb7a4f7f91e7150
-SIZE (ElectricManual-9.04.pdf) = 3477506
+SHA256 (electricBinary-9.04.jar) = 5e035aeceeec229304c729df34e15f8c3021bff18023aa1daec62cb5b15b5320
+SIZE (electricBinary-9.04.jar) = 23725205
+SHA256 (ElectricManual-9.04.pdf) = c86a9549eecf198a00f928d9832744a54ab3301231a7fb9bc07d760201a517a2
+SIZE (ElectricManual-9.04.pdf) = 3477326
 SHA256 (electricSFS-9.04.jar) = f9a358f1e07b2e13ca87c9ae4e02f4f5d896eda97dcee3f033613becd080aa6b
 SIZE (electricSFS-9.04.jar) = 193588
diff --git a/cad/electric-ng/pkg-plist b/cad/electric-ng/pkg-plist
new file mode 100644
index 000000000000..27fd9500224f
--- /dev/null
+++ b/cad/electric-ng/pkg-plist
@@ -0,0 +1,7 @@
+bin/electric-ng
+%%IRSIM%%libexec/electric-ng/electricSFS-9.04.jar
+%%PORTDOCS%%%%DOCSDIR%%-ng/ElectricManual-9.04.pdf
+share/java/classes/electricBinary-9.04.jar
+share/pixmaps/electric-ng.png
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%-ng
+%%IRSIM%%@dirrmtry libexec/electric-ng