3 files changed, 55 insertions, 53 deletions

diff --git a/cad/jspice3/Makefile b/cad/jspice3/Makefile
index 09692f9f0d91..adfa8fe12f60 100644
--- a/cad/jspice3/Makefile
+++ b/cad/jspice3/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	jspice3
-PORTVERSION=	2.5
-PORTREVISION=	6
+PORTVERSION=	2.5.011109
+PORTREVISION=	0
 CATEGORIES=	cad
 MASTER_SITES=	http://www.wrcad.com/ftp/pub/	\
 		ftp://ftp.srware.com/pub/
+DISTNAME=	${PORTNAME}-2.5-011109
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An adaptation of the Berkeley Spice3f4 with superconductivity
@@ -18,6 +19,7 @@ COMMENT=	An adaptation of the Berkeley Spice3f4 with superconductivity
 CONFLICTS=	spice-[0-9]*
 
 OPTIONS=	X "Use X window system" on
+WRKSRC=		${WRKDIR}/${PORTNAME}-2.5
 
 .include <bsd.port.pre.mk>
 
@@ -43,7 +45,7 @@ do-install:
 	@(cd ${WRKSRC}/src/bin;${SETENV} ${MAKE_ENV} ${MAKE} install)
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if !defined(NOPORTEXAMPLES)
 	${MV} ${PREFIX}/lib/jspice3/examples ${EXAMPLESDIR}
 .else
 	${RM} -R ${PREFIX}/lib/jspice3/examples
diff --git a/cad/jspice3/distinfo b/cad/jspice3/distinfo
index ed639df0da8f..262cc3ea0e37 100644
--- a/cad/jspice3/distinfo
+++ b/cad/jspice3/distinfo
@@ -1,3 +1,3 @@
-MD5 (jspice3-2.5.tar.gz) = 84b9a9ae8e438c73a4c1e3d8f502145a
-SHA256 (jspice3-2.5.tar.gz) = c32575f7686f6f9f252dce9b2385b79e69c3c253f913030a47ac4dce7f4bbdec
-SIZE (jspice3-2.5.tar.gz) = 1150509
+MD5 (jspice3-2.5-011109.tar.gz) = 56294010bd76675a742d2ad19910733f
+SHA256 (jspice3-2.5-011109.tar.gz) = 4fa5492584fb201b0f396ce805424b3128db4a70450506158854788aea68d7bf
+SIZE (jspice3-2.5-011109.tar.gz) = 1149738
diff --git a/cad/jspice3/pkg-plist b/cad/jspice3/pkg-plist
index 51c612eba7c5..d01ad300d091 100644
--- a/cad/jspice3/pkg-plist
+++ b/cad/jspice3/pkg-plist
@@ -20,50 +20,50 @@ lib/jspice3/scripts/spinit
 @dirrm lib/jspice3/sced
 @dirrm lib/jspice3/scripts
 @dirrm lib/jspice3
-%%PORTDOCS%%%%EXAMPLESDIR%%/bjtnoise.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/bsim1tst.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/bsim2tst.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/diffpair.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/diodisto.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/ltra_1.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/ltra_2.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/ltra_3.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/mixdisto.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/mos6inv.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/mosamp2.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/mosmem.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/process.mod
-%%PORTDOCS%%%%EXAMPLESDIR%%/process.pro
-%%PORTDOCS%%%%EXAMPLESDIR%%/pz2.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/pzt.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/rc.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/rca3040.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/resnoise.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/rtlinv.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/schmitt.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/simplepz.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/testc.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/cryocmos/cryo_model.lib
-%%PORTDOCS%%%%EXAMPLESDIR%%/cryocmos/nmos_test.sp
-%%PORTDOCS%%%%EXAMPLESDIR%%/cryocmos/pmos_test.sp
-%%PORTDOCS%%%%EXAMPLESDIR%%/cryocmos/ringosc_meas.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/cryocmos/ringosc_test.out
-%%PORTDOCS%%%%EXAMPLESDIR%%/cryocmos/ringosc_test.sp
-%%PORTDOCS%%%%EXAMPLESDIR%%/josephson/ex8.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/josephson/exjjintr.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/josephson/exjjiv.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/josephson/intr
-%%PORTDOCS%%%%EXAMPLESDIR%%/josephson/jjcntr.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/josephson/jjoprng
-%%PORTDOCS%%%%EXAMPLESDIR%%/josephson/jtl
-%%PORTDOCS%%%%EXAMPLESDIR%%/josephson/jtl1
-%%PORTDOCS%%%%EXAMPLESDIR%%/josephson/mvtltest
-%%PORTDOCS%%%%EXAMPLESDIR%%/josephson/shutop
-%%PORTDOCS%%%%EXAMPLESDIR%%/josephson/shuttle.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/josephson/shuttlea.cir
-%%PORTDOCS%%%%EXAMPLESDIR%%/josephson/strange
-%%PORTDOCS%%%%EXAMPLESDIR%%/josephson/thcntr
-%%PORTDOCS%%%%EXAMPLESDIR%%/josephson/theta
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/cryocmos
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/josephson
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bjtnoise.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bsim1tst.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bsim2tst.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diffpair.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diodisto.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ltra_1.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ltra_2.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ltra_3.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mixdisto.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mos6inv.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mosamp2.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mosmem.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/process.mod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/process.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pz2.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pzt.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rc.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rca3040.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resnoise.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rtlinv.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/schmitt.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplepz.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testc.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cryocmos/cryo_model.lib
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cryocmos/nmos_test.sp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cryocmos/pmos_test.sp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cryocmos/ringosc_meas.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cryocmos/ringosc_test.out
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cryocmos/ringosc_test.sp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/josephson/ex8.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/josephson/exjjintr.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/josephson/exjjiv.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/josephson/intr
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/josephson/jjcntr.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/josephson/jjoprng
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/josephson/jtl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/josephson/jtl1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/josephson/mvtltest
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/josephson/shutop
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/josephson/shuttle.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/josephson/shuttlea.cir
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/josephson/strange
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/josephson/thcntr
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/josephson/theta
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cryocmos
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/josephson
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%