- Add HiSIM2 support.

- Add LICENSE for DEV_BSIM3, DEV_BSIM3, and DEV_HISIM2 options.
- Simplify do-configure.

4 files changed, 83 insertions, 22 deletions

diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index 79bc1d0de6a2..ca584629d384 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -8,10 +8,12 @@ CATEGORIES=	cad
 MASTER_SITES=	http://embedded.eecs.berkeley.edu/pubs/downloads/spice/:srcs \
 		http://www-device.eecs.berkeley.edu/~bsim/Files/BSIM3/ftpv330/src/:bsim3 \
 		http://www-device.eecs.berkeley.edu/~bsim/Files/BSIM4/BSIM480/:bsim4 \
+		http://home.hiroshima-u.ac.jp/usdl/HiSIM2/:hisim2 \
 		LOCAL/hrs/${PORTNAME}:docs
 DISTFILES=	spice3f5${EXTRACT_SUFX}:srcs \
 		BSIM3v330.tar.Z:bsim3 \
 		BSIM480_Code.zip:bsim4 \
+		HiSIM_2.8.0_Release_20140605.zip:hisim2 \
 		cp.ps:docs toc.ps:docs doc.ps:docs
 DIST_SUBDIR=	spice
 EXTRACT_ONLY=	spice3f5${EXTRACT_SUFX}
@@ -26,7 +28,7 @@ EXTRACT_DEPENDS=	${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
 
 WRKSRC=		${WRKDIR}/${PORTNAME}3f5
 MAKEFILE=	${FILESDIR}/Makefile
-CONFIGURE_ENV=	CONFIGFILE="${WRKSRC}/conf/FreeBSD" \
+CONFIGURE_ENV=	CONFIGFILE="${CONFIGFILE}" \
 		LOCALBASE="${LOCALBASE}"
 
 PORTDOCS=	spice3f3.ps.gz
@@ -36,18 +38,51 @@ PORTEXAMPLES=	bjtnoise.cir bsim1tst.cir bsim2tst.cir diffpair.cir \
 		process.pro pz2.cir pzt.cir rc.cir rca3040.cir resnoise.cir \
 		rtlinv.cir schmitt.cir simplepz.cir
 
-OPTIONS_DEFINE=	DOCS EXAMPLES X11 DEV_BSIM3 DEV_BSIM4
+OPTIONS_DEFINE=	DOCS EXAMPLES X11 DEV_BSIM3 DEV_BSIM4 DEV_HISIM2
 OPTIONS_DEFAULT=DOCS EXAMPLES X11
 
 X11_USE=		XORG=x11,xaw,xext,xmu,xt
 X11_CONFIGURE_ENV=	WITH_X11=yes
 DEV_BSIM3_DESC=		BSIM3v3 MOS Transistor Model Support
-DEV_BSIM3_CONFIGURE_ENV=DEV_BSIM3=yes
 DEV_BSIM4_DESC=		BSIM4v4 MOS Transistor Model Support
-DEV_BSIM4_CONFIGURE_ENV=DEV_BSIM4=yes
+DEV_HISIM2_DESC=	HiSIM2 IGFET Model Support
 
 .include <bsd.port.options.mk>
 
+# Configuration parameters.
+CC_OPT=		${CFLAGS}
+CONFIGFILE=	${WRKSRC}/conf/FreeBSD
+DEVICES=
+.for D in BSIM3 BSIM4 HISIM2
+. if !empty(PORT_OPTIONS:MDEV_$D)
+DEVICES+=	${D:tl}
+. endif
+.endfor
+
+.if !empty(PORT_OPTIONS:MDEV_BSIM3) || \
+    !empty(PORT_OPTIONS:MDEV_BSIM4) || \
+    !empty(PORT_OPTIONS:MDEV_HISIM2)
+LICENSE_COMB=	multi
+LICENSE_FILE_MIT=	${WRKSRC}/COPYRIGHT
+.if !empty(PORT_OPTIONS:MDEV_BSIM3) || \
+    !empty(PORT_OPTIONS:MDEV_BSIM4)
+LICENSE+=	BSIML
+LICENSE_NAME_BSIML=	BSIM license
+LICENSE_PERMS_BSIML=	dist-mirror pkg-mirror auto-accept
+.if !empty(PORT_OPTIONS:MDEV_BSIM3)
+LICENSE_FILE_BSIML=	${WRKSRC}/src/lib/dev/bsim3/B3TERMS_OF_USE
+.else
+LICENSE_FILE_BSIML=	${WRKSRC}/src/lib/dev/bsim4/B4TERMS_OF_USE.txt
+.endif
+.endif
+.if !empty(PORT_OPTIONS:MDEV_HISIM2)
+LICENSE+=	HISIML
+LICENSE_NAME_HISIML=	HiSIM license
+LICENSE_PERMS_HISIML=	dist-mirror pkg-mirror auto-accept
+LICENSE_FILE_HISIML=	${FILESDIR}/hisim2-license.txt
+.endif
+.endif
+
 post-extract:
 	@${DO_NADA}
 .if ${PORT_OPTIONS:MDEV_BSIM3}
@@ -60,13 +95,21 @@ post-extract:
 	${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/BSIM480_Code.zip \
 	    -d ${WRKSRC}/src/lib/dev/bsim4
 .endif
+.if ${PORT_OPTIONS:MDEV_HISIM2}
+	${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/HiSIM_2.8.0_Release_20140605.zip \
+	    -d ${WRKDIR}
+	${MV} ${WRKDIR}/HiSIM_2.8.0_Release_20140605/HiSIM_2.8.0_C-Code/hisim2 \
+	    ${WRKSRC}/src/lib/dev
+.endif
 
-do-configure:
+${CONFIGFILE}::
 	@${SETENV} ${CONFIGURE_ENV} ${MAKE} -f ${MAKEFILE} configure
-	@(${ECHO_CMD} "CC=	${CC}";		\
-	  ${ECHO_CMD} "MAKE=	${MAKE}";	\
-	  ${ECHO_CMD} "CC_OPT=	${CFLAGS}";	\
-	) >> ${WRKSRC}/conf/FreeBSD
+.for V in CC MAKE CC_OPT DEVICES
+	@${ECHO_CMD} "${V}=${$V}" >> ${WRKSRC}/conf/FreeBSD
+.endfor
+
+do-configure: ${CONFIGFILE}
+	@${DO_NADA}
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
diff --git a/cad/spice/distinfo b/cad/spice/distinfo
index 56184288710d..007e17466e38 100644
--- a/cad/spice/distinfo
+++ b/cad/spice/distinfo
@@ -4,8 +4,8 @@ SHA256 (spice/BSIM3v330.tar.Z) = 3d8d1739c5fb7f1e56af70e5dc05a6f9014d0954a4f3c1b
 SIZE (spice/BSIM3v330.tar.Z) = 113719
 SHA256 (spice/BSIM480_Code.zip) = 76850257fefc9d76369538ba5aa1cac7b09fb98311c39564e9e6d044b49db9c8
 SIZE (spice/BSIM480_Code.zip) = 158442
-SHA256 (spice/BSIM6.1.0_Release_March20_2014.zip) = 664e6c2138b35f45f8883a74557abff3b18f59e9da7d89adc30d0c854919c423
-SIZE (spice/BSIM6.1.0_Release_March20_2014.zip) = 1060937
+SHA256 (spice/HiSIM_2.8.0_Release_20140605.zip) = e1bd378f1b7e6b21d22b9671003bdb4913f2e7a8fd5cf79317c0f8c6719241d3
+SIZE (spice/HiSIM_2.8.0_Release_20140605.zip) = 1007122
 SHA256 (spice/cp.ps) = 3bab6c3487def4ce2e817bf7ef3c1a7d199ea8e790da3a786f936872b35d0920
 SIZE (spice/cp.ps) = 10297
 SHA256 (spice/toc.ps) = 22228246f98f38e39a22911251fa52782ca6a2a7fb273fd78cf3da833d1f52e8
diff --git a/cad/spice/files/Makefile b/cad/spice/files/Makefile
index efffbda428f1..085bfcc1cd53 100644
--- a/cad/spice/files/Makefile
+++ b/cad/spice/files/Makefile
@@ -4,8 +4,9 @@
 all:
 	${SH} util/build FreeBSD default
 
+CONFIGFILE?=	conf/FreeBSD
+
 # Configuration parameters
-DEVLIST=
 VARLIST=	SYS_CFLAGS LDFLAGS INTERFACE_OPTS X_DIR
 SYS_CFLAGS=	-Dbsd
 LDFLAGS=	-lm -ltermcap
@@ -16,20 +17,13 @@ INTERFACE_OPTS+=-DWANT_X11
 VARLIST+=	INCX LIBX
 .endif
 X_DIR=		${LOCALBASE}
-.for D in BSIM3 BSIM4
-. if defined(DEV_$D) && !empty(DEV_$D)
-DEVLIST+=	${D:tl}
-. endif
-.endfor
 
-configure:
-	rm -f ${CONFIGFILE}
+configure: ${CONFIGFILE}
+
+${CONFIGFILE}::
 .for V in ${VARLIST}
 	echo "$V=${${V}}" >> ${CONFIGFILE}
 .endfor
-.for V in ${DEVLIST}
-	echo "DEVICES+=${V}" >> ${CONFIGFILE}
-.endfor
 
 PREFIX?=	/usr/local
 
diff --git a/cad/spice/files/hisim2-license.txt b/cad/spice/files/hisim2-license.txt
new file mode 100644
index 000000000000..b33d1b55ea73
--- /dev/null
+++ b/cad/spice/files/hisim2-license.txt
@@ -0,0 +1,24 @@
+Software is distributed as is, completely without warranty or service
+support. Hiroshima University or STARC and its employees are not liable
+for the condition or performance of the software.
+
+Hiroshima University and STARC own the copyright and grant users a perpetual,
+irrevocable, worldwide, non-exclusive, royalty-free license with respect 
+to the software as set forth below.   
+
+Hiroshima University and STARC hereby disclaim all implied warranties.
+
+Hiroshima University and STARC grant the users the right to modify, copy,
+and redistribute the software and documentation, both within the user's
+organization and externally, subject to the following restrictions
+
+1. The users agree not to charge for Hiroshima University and STARC code
+itself but may charge for additions, extensions, or support.
+
+2. In any product based on the software, the users agree to acknowledge
+Hiroshima University and STARC that developed the software. This
+acknowledgment shall appear in the product documentation.
+
+3. The users agree to reproduce any copyright notice which appears on
+the software on any copy or modification of such made available
+to others."