- Add BSIM3v3 support. This is disabled by default because its license is

  not compatible with SPICE3f5.
- Remove bsd.prog.mk dependency.
- Put variables in ${FILESDIR}/FreeBSD* configuration file into
  ${FILES}/Makefile.
- Use opt_USE instead of .if ${PORT_OPTIONS:Mopt}.
- Remove unnecessary changes in patch-conf_defaults.

1 files changed, 2 insertions, 20 deletions

diff --git a/cad/spice/files/patch-conf_defaults b/cad/spice/files/patch-conf_defaults
index c5d6e9b65830..aad6ab1133a1 100644
--- a/cad/spice/files/patch-conf_defaults
+++ b/cad/spice/files/patch-conf_defaults
@@ -1,5 +1,5 @@
---- conf/defaults.orig	Thu Jul 17 16:40:51 2003
-+++ conf/defaults	Thu Jul 17 16:51:19 2003
+--- conf/defaults.orig	1993-07-30 06:33:56.000000000 +0900
++++ conf/defaults	2014-08-22 10:49:42.000000000 +0900
 @@ -65,7 +65,7 @@
  #	the following definition:
  #		SYS_DIR		= $(DIST_DIR)
@@ -25,21 +25,3 @@
  S_SPICE_EXEC_DIR= $(S_SPICE_DIR)/bin
  
  #	INSTALL_DIRS lists the directories that need to be created before
-@@ -133,7 +133,7 @@
- 
- #	CC_OPT: Default compile options (optimization/debug level, other)
- 
--CC_OPT		= -O
-+CC_OPT		=
- 
- #	CC_OPT_SAFE: Special compile options to override CC_OPT for code
- #	which typically causes problems for most compilers (bsim1 and bsim2).
-@@ -203,7 +203,7 @@
- #	X_DIR indicates the top of the X11 lib/include hierarchy; it is only
- #	a convenience that is used in the following definitions.
- 
--X_DIR		= /usr
-+X_DIR		= ${LOCALBASE}
- 
- #	INCX lists the X include directories.  This may be different between
- #	MIT X11r5, X11r4, and your vendor's version of X11, though listing