4 files changed, 46 insertions, 48 deletions

diff --git a/cad/electric/Makefile b/cad/electric/Makefile
index 68544ac04e2e..285ac897c0a6 100644
--- a/cad/electric/Makefile
+++ b/cad/electric/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	electric
-PORTVERSION=	6.0.8
+PORTVERSION=	7.0.0
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,12 +15,9 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/^(...)\./\1/}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Sophisticated electrical CAD system
 
-USE_REINPLACE=	yes
-USE_SIZE=	yes
-USE_XLIB=	yes
 USE_MOTIF=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	-with-x
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/electric/lib/|${DATADIR}/lib/|; \
@@ -34,4 +31,7 @@ post-patch:
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|/usr/X11R6/|${X11BASE}/|' ${WRKSRC}/configure
 
+post-install:
+	${STRIP_CMD} ${PREFIX}/bin/electric
+
 .include <bsd.port.mk>
diff --git a/cad/electric/distinfo b/cad/electric/distinfo
index eb26cfe3710c..e45e98581486 100644
--- a/cad/electric/distinfo
+++ b/cad/electric/distinfo
@@ -1,2 +1,2 @@
-MD5 (electric-6.08.tar.gz) = de428032f08d3d3ee8686f178ae6b160
-SIZE (electric-6.08.tar.gz) = 4386249
+MD5 (electric-7.00.tar.gz) = 64c89f820467b418d24ddf6c7e206c08
+SIZE (electric-7.00.tar.gz) = 4474722
diff --git a/cad/electric/pkg-descr b/cad/electric/pkg-descr
index 07d8401b369c..6f8b3195fefa 100644
--- a/cad/electric/pkg-descr
+++ b/cad/electric/pkg-descr
@@ -19,6 +19,4 @@ Electric handles these file formats:
 For real funcionality, one should consider installing
 support simulation software such as cad/spice.
 
-For a complete description check below.
-
 WWW: http://www.gnu.org/software/electric/electric.html
diff --git a/cad/electric/pkg-plist b/cad/electric/pkg-plist
index 82cf3092b5be..80f30a79d757 100644
--- a/cad/electric/pkg-plist
+++ b/cad/electric/pkg-plist
@@ -1,40 +1,40 @@
 bin/electric
-share/electric/lib/.cadrc
-share/electric/lib/ALS.help
-share/electric/lib/AllDialogs.c
-share/electric/lib/CL.help
-share/electric/lib/EVE.help
-share/electric/lib/QUISC.help
-share/electric/lib/bsim3.spi
-share/electric/lib/cadrc
-share/electric/lib/click.wav
-share/electric/lib/evemenus.mac
-share/electric/lib/evetutor.mac
-share/electric/lib/international/fr/LC_MESSAGES/electric.mo
-share/electric/lib/international/fr/LC_MESSAGES/license.txt
-share/electric/lib/international/messages.po
-share/electric/lib/java/romgen.java
-share/electric/lib/leparts.txt
-share/electric/lib/pads4u.txt
-share/electric/lib/pla_mocmos.txt
-share/electric/lib/sclib.txt
-share/electric/lib/spiceparts.mac
-share/electric/lib/spiceparts.txt
-share/electric/lib/spicepartsS3.mac
-share/electric/lib/spicepartsS3.txt
-share/electric/lib/t22t_param.spi
-share/electric/lib/tsmc25.txt
-share/electric/lib/ui/README
-share/electric/lib/ui/electric.cw
-share/electric/lib/ui/nccpre.ui
-share/electric/lib/ui/shownode.ui
-share/electric/lib/ui/shownode_ext.ui
-share/electric/lib/ui/visiblelay.ui
-share/electric/lib/umc18.txt
-@dirrm share/electric/lib/ui
-@dirrm share/electric/lib/java
-@dirrm share/electric/lib/international/fr/LC_MESSAGES
-@dirrm share/electric/lib/international/fr
-@dirrm share/electric/lib/international
-@dirrm share/electric/lib
-@dirrm share/electric
+%%DATADIR%%/lib/.cadrc
+%%DATADIR%%/lib/ALS.help
+%%DATADIR%%/lib/AllDialogs.c
+%%DATADIR%%/lib/CL.help
+%%DATADIR%%/lib/EVE.help
+%%DATADIR%%/lib/QUISC.help
+%%DATADIR%%/lib/bsim3.spi
+%%DATADIR%%/lib/cadrc
+%%DATADIR%%/lib/click.wav
+%%DATADIR%%/lib/evemenus.mac
+%%DATADIR%%/lib/evetutor.mac
+%%DATADIR%%/lib/international/fr/LC_MESSAGES/electric.mo
+%%DATADIR%%/lib/international/fr/LC_MESSAGES/license.txt
+%%DATADIR%%/lib/international/messages.po
+%%DATADIR%%/lib/java/romgen.java
+%%DATADIR%%/lib/leparts.txt
+%%DATADIR%%/lib/pads4u.txt
+%%DATADIR%%/lib/pla_mocmos.txt
+%%DATADIR%%/lib/sclib.txt
+%%DATADIR%%/lib/spiceparts.mac
+%%DATADIR%%/lib/spiceparts.txt
+%%DATADIR%%/lib/spicepartsS3.mac
+%%DATADIR%%/lib/spicepartsS3.txt
+%%DATADIR%%/lib/t22t_param.spi
+%%DATADIR%%/lib/tsmc25.txt
+%%DATADIR%%/lib/ui/README
+%%DATADIR%%/lib/ui/electric.cw
+%%DATADIR%%/lib/ui/nccpre.ui
+%%DATADIR%%/lib/ui/shownode.ui
+%%DATADIR%%/lib/ui/shownode_ext.ui
+%%DATADIR%%/lib/ui/visiblelay.ui
+%%DATADIR%%/lib/umc18.txt
+@dirrm %%DATADIR%%/lib/ui
+@dirrm %%DATADIR%%/lib/java
+@dirrm %%DATADIR%%/lib/international/fr/LC_MESSAGES
+@dirrm %%DATADIR%%/lib/international/fr
+@dirrm %%DATADIR%%/lib/international
+@dirrm %%DATADIR%%/lib
+@dirrm %%DATADIR%%/