Well, ngspice pukes on both xspice and cider. So, I've pulled those from
the libngspice port for now.
ngspice and libngspice diffs below. Let me know what I got wrong,
please.
On Wed, Oct 02, 2019 at 03:30:20AM -0600, Anthony J. Bentley wrote:
> > The libngspice port:
> >
> > Ngspice can be built as a shared library. This package provides that
> > library.
>
> - ditto for COMPILER.
> - if we enable xspice and cider, we should do the same in ngspice.
> thus, cmpp and the lib/ngspice/ stuff should be @comment-ed.
> can you explain what difference it makes if they're enabled?
> - rather than have a build dependency on ngspice, we should @comment
> the include files in ngspice and set libnsgpice to conflict with
> older versions. (why does upstream do it this way? it's so weird...)
>
--
Tracey Emery
Index: cad/ngspice/pkg/PLIST
===================================================================
RCS file: /cvs/ports/cad/ngspice/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- cad/ngspice/pkg/PLIST 8 Jan 2019 07:34:37 -0000 1.7
+++ cad/ngspice/pkg/PLIST 2 Oct 2019 15:02:24 -0000
@@ -1,130 +1,130 @@
@comment $OpenBSD: PLIST,v 1.7 2019/01/08 07:34:37 bentley Exp $
@bin bin/ngspice
include/ngspice/
-include/ngspice/1-f-code.h
-include/ngspice/FastNorm3.h
-include/ngspice/acdefs.h
-include/ngspice/bdrydefs.h
-include/ngspice/bool.h
-include/ngspice/carddefs.h
-include/ngspice/ciderinp.h
-include/ngspice/cidersupt.h
-include/ngspice/cktdefs.h
-include/ngspice/cluster.h
-include/ngspice/cm.h
-include/ngspice/cmconstants.h
-include/ngspice/cmproto.h
-include/ngspice/cmtypes.h
-include/ngspice/compatmode.h
-include/ngspice/complex.h
-include/ngspice/config.h
-include/ngspice/const.h
-include/ngspice/contdefs.h
-include/ngspice/cpdefs.h
-include/ngspice/cpextern.h
-include/ngspice/cpstd.h
-include/ngspice/defines.h
-include/ngspice/devdefs.h
-include/ngspice/dgen.h
-include/ngspice/distodef.h
-include/ngspice/dllitf.h
-include/ngspice/domndefs.h
-include/ngspice/dopdefs.h
-include/ngspice/dstring.h
-include/ngspice/dvec.h
-include/ngspice/elctdefs.h
-include/ngspice/enh.h
-include/ngspice/enhtypes.h
-include/ngspice/evt.h
-include/ngspice/evtproto.h
-include/ngspice/evtshared.h
-include/ngspice/evttypes.h
-include/ngspice/evtudn.h
-include/ngspice/fftext.h
-include/ngspice/ftedbgra.h
-include/ngspice/ftedebug.h
-include/ngspice/ftedefs.h
-include/ngspice/ftedev.h
-include/ngspice/fteext.h
-include/ngspice/fteinp.h
-include/ngspice/fteinput.h
-include/ngspice/fteoptdefs.h
-include/ngspice/fteparse.h
-include/ngspice/gendefs.h
-include/ngspice/gendev.h
-include/ngspice/graph.h
-include/ngspice/grid.h
-include/ngspice/hash.h
-include/ngspice/hlpdefs.h
-include/ngspice/iferrmsg.h
-include/ngspice/ifsim.h
-include/ngspice/inpdefs.h
-include/ngspice/inpmacs.h
-include/ngspice/inpptree.h
-include/ngspice/ipc.h
-include/ngspice/ipcproto.h
-include/ngspice/ipctiein.h
-include/ngspice/jobdefs.h
-include/ngspice/lsort.h
-include/ngspice/macros.h
-include/ngspice/material.h
-include/ngspice/matldefs.h
-include/ngspice/memory.h
-include/ngspice/meshdefs.h
-include/ngspice/meshext.h
-include/ngspice/methdefs.h
-include/ngspice/mif.h
-include/ngspice/mifcmdat.h
-include/ngspice/mifdefs.h
-include/ngspice/mifparse.h
-include/ngspice/mifproto.h
-include/ngspice/miftypes.h
-include/ngspice/missing_math.h
-include/ngspice/mobdefs.h
-include/ngspice/modldefs.h
-include/ngspice/multi_line.h
-include/ngspice/ngspice.h
-include/ngspice/noisedef.h
-include/ngspice/numcards.h
-include/ngspice/numconst.h
-include/ngspice/numenum.h
-include/ngspice/numgen.h
-include/ngspice/numglobs.h
-include/ngspice/onedev.h
-include/ngspice/onemesh.h
-include/ngspice/opdefs.h
-include/ngspice/optdefs.h
-include/ngspice/optndefs.h
-include/ngspice/outpdefs.h
-include/ngspice/plot.h
-include/ngspice/pnode.h
-include/ngspice/profile.h
-include/ngspice/pssdefs.h
-include/ngspice/pzdefs.h
-include/ngspice/randnumb.h
-include/ngspice/sen2defs.h
-include/ngspice/sensdefs.h
-include/ngspice/sensgen.h
-include/ngspice/sharedspice.h
-include/ngspice/sim.h
-include/ngspice/smpdefs.h
-include/ngspice/sperror.h
-include/ngspice/spmatrix.h
-include/ngspice/stringskip.h
-include/ngspice/stringutil.h
-include/ngspice/suffix.h
-include/ngspice/swec.h
-include/ngspice/tclspice.h
-include/ngspice/tfdefs.h
-include/ngspice/trandefs.h
-include/ngspice/trcvdefs.h
-include/ngspice/tskdefs.h
-include/ngspice/twodev.h
-include/ngspice/twomesh.h
-include/ngspice/typedefs.h
-include/ngspice/wallace.h
-include/ngspice/wordlist.h
-include/ngspice/wstdio.h
+@comment include/ngspice/1-f-code.h
+@comment include/ngspice/FastNorm3.h
+@comment include/ngspice/acdefs.h
+@comment include/ngspice/bdrydefs.h
+@comment include/ngspice/bool.h
+@comment include/ngspice/carddefs.h
+@comment include/ngspice/ciderinp.h
+@comment include/ngspice/cidersupt.h
+@comment include/ngspice/cktdefs.h
+@comment include/ngspice/cluster.h
+@comment include/ngspice/cm.h
+@comment include/ngspice/cmconstants.h
+@comment include/ngspice/cmproto.h
+@comment include/ngspice/cmtypes.h
+@comment include/ngspice/compatmode.h
+@comment include/ngspice/complex.h
+@comment include/ngspice/config.h
+@comment include/ngspice/const.h
+@comment include/ngspice/contdefs.h
+@comment include/ngspice/cpdefs.h
+@comment include/ngspice/cpextern.h
+@comment include/ngspice/cpstd.h
+@comment include/ngspice/defines.h
+@comment include/ngspice/devdefs.h
+@comment include/ngspice/dgen.h
+@comment include/ngspice/distodef.h
+@comment include/ngspice/dllitf.h
+@comment include/ngspice/domndefs.h
+@comment include/ngspice/dopdefs.h
+@comment include/ngspice/dstring.h
+@comment include/ngspice/dvec.h
+@comment include/ngspice/elctdefs.h
+@comment include/ngspice/enh.h
+@comment include/ngspice/enhtypes.h
+@comment include/ngspice/evt.h
+@comment include/ngspice/evtproto.h
+@comment include/ngspice/evtshared.h
+@comment include/ngspice/evttypes.h
+@comment include/ngspice/evtudn.h
+@comment include/ngspice/fftext.h
+@comment include/ngspice/ftedbgra.h
+@comment include/ngspice/ftedebug.h
+@comment include/ngspice/ftedefs.h
+@comment include/ngspice/ftedev.h
+@comment include/ngspice/fteext.h
+@comment include/ngspice/fteinp.h
+@comment include/ngspice/fteinput.h
+@comment include/ngspice/fteoptdefs.h
+@comment include/ngspice/fteparse.h
+@comment include/ngspice/gendefs.h
+@comment include/ngspice/gendev.h
+@comment include/ngspice/graph.h
+@comment include/ngspice/grid.h
+@comment include/ngspice/hash.h
+@comment include/ngspice/hlpdefs.h
+@comment include/ngspice/iferrmsg.h
+@comment include/ngspice/ifsim.h
+@comment include/ngspice/inpdefs.h
+@comment include/ngspice/inpmacs.h
+@comment include/ngspice/inpptree.h
+@comment include/ngspice/ipc.h
+@comment include/ngspice/ipcproto.h
+@comment include/ngspice/ipctiein.h
+@comment include/ngspice/jobdefs.h
+@comment include/ngspice/lsort.h
+@comment include/ngspice/macros.h
+@comment include/ngspice/material.h
+@comment include/ngspice/matldefs.h
+@comment include/ngspice/memory.h
+@comment include/ngspice/meshdefs.h
+@comment include/ngspice/meshext.h
+@comment include/ngspice/methdefs.h
+@comment include/ngspice/mif.h
+@comment include/ngspice/mifcmdat.h
+@comment include/ngspice/mifdefs.h
+@comment include/ngspice/mifparse.h
+@comment include/ngspice/mifproto.h
+@comment include/ngspice/miftypes.h
+@comment include/ngspice/missing_math.h
+@comment include/ngspice/mobdefs.h
+@comment include/ngspice/modldefs.h
+@comment include/ngspice/multi_line.h
+@comment include/ngspice/ngspice.h
+@comment include/ngspice/noisedef.h
+@comment include/ngspice/numcards.h
+@comment include/ngspice/numconst.h
+@comment include/ngspice/numenum.h
+@comment include/ngspice/numgen.h
+@comment include/ngspice/numglobs.h
+@comment include/ngspice/onedev.h
+@comment include/ngspice/onemesh.h
+@comment include/ngspice/opdefs.h
+@comment include/ngspice/optdefs.h
+@comment include/ngspice/optndefs.h
+@comment include/ngspice/outpdefs.h
+@comment include/ngspice/plot.h
+@comment include/ngspice/pnode.h
+@comment include/ngspice/profile.h
+@comment include/ngspice/pssdefs.h
+@comment include/ngspice/pzdefs.h
+@comment include/ngspice/randnumb.h
+@comment include/ngspice/sen2defs.h
+@comment include/ngspice/sensdefs.h
+@comment include/ngspice/sensgen.h
+@comment include/ngspice/sharedspice.h
+@comment include/ngspice/sim.h
+@comment include/ngspice/smpdefs.h
+@comment include/ngspice/sperror.h
+@comment include/ngspice/spmatrix.h
+@comment include/ngspice/stringskip.h
+@comment include/ngspice/stringutil.h
+@comment include/ngspice/suffix.h
+@comment include/ngspice/swec.h
+@comment include/ngspice/tclspice.h
+@comment include/ngspice/tfdefs.h
+@comment include/ngspice/trandefs.h
+@comment include/ngspice/trcvdefs.h
+@comment include/ngspice/tskdefs.h
+@comment include/ngspice/twodev.h
+@comment include/ngspice/twomesh.h
+@comment include/ngspice/typedefs.h
+@comment include/ngspice/wallace.h
+@comment include/ngspice/wordlist.h
+@comment include/ngspice/wstdio.h
@man man/man1/ngspice.1
share/ngspice/
share/ngspice/scripts/
diff -ru cad/libngspice.orig/Makefile cad/libngspice/Makefile
--- cad/libngspice.orig/Makefile Wed Oct 2 07:37:48 2019
+++ cad/libngspice/Makefile Wed Oct 2 08:37:26 2019
@@ -17,18 +17,14 @@
# BSD
PERMIT_PACKAGE = Yes
-COMPILER = ports-clang
+COMPILER = base-clang ports-clang
-BUILD_DEPENDS = cad/ngspice
-
USE_GMAKE = yes
CONFIGURE_STYLE = gnu
WANTLIB += c m pthread
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ngspice/}
-CONFIGURE_ARGS += --with-ngshared \
- --enable-xspice \
- --enable-cider
+CONFIGURE_ARGS += --with-ngshared
.include <bsd.port.mk>
Only in cad/libngspice: PLIST
diff -ru cad/libngspice.orig/pkg/PLIST cad/libngspice/pkg/PLIST
--- cad/libngspice.orig/pkg/PLIST Wed Oct 2 07:37:48 2019
+++ cad/libngspice/pkg/PLIST Wed Oct 2 09:25:35 2019
@@ -1,145 +1,135 @@
@comment $OpenBSD: PLIST,v$
-@bin bin/cmpp
-@comment include/ngspice/1-f-code.h
-@comment include/ngspice/FastNorm3.h
-@comment include/ngspice/acdefs.h
-@comment include/ngspice/bdrydefs.h
-@comment include/ngspice/bool.h
-@comment include/ngspice/carddefs.h
-@comment include/ngspice/ciderinp.h
-@comment include/ngspice/cidersupt.h
-@comment include/ngspice/cktdefs.h
-@comment include/ngspice/cluster.h
-@comment include/ngspice/cm.h
-@comment include/ngspice/cmconstants.h
-@comment include/ngspice/cmproto.h
-@comment include/ngspice/cmtypes.h
-@comment include/ngspice/compatmode.h
-@comment include/ngspice/complex.h
-@comment include/ngspice/config.h
-@comment include/ngspice/const.h
-@comment include/ngspice/contdefs.h
-@comment include/ngspice/cpdefs.h
-@comment include/ngspice/cpextern.h
-@comment include/ngspice/cpstd.h
-@comment include/ngspice/defines.h
-@comment include/ngspice/devdefs.h
-@comment include/ngspice/dgen.h
-@comment include/ngspice/distodef.h
-@comment include/ngspice/dllitf.h
-@comment include/ngspice/domndefs.h
-@comment include/ngspice/dopdefs.h
-@comment include/ngspice/dstring.h
-@comment include/ngspice/dvec.h
-@comment include/ngspice/elctdefs.h
-@comment include/ngspice/enh.h
-@comment include/ngspice/enhtypes.h
-@comment include/ngspice/evt.h
-@comment include/ngspice/evtproto.h
-@comment include/ngspice/evtshared.h
-@comment include/ngspice/evttypes.h
-@comment include/ngspice/evtudn.h
-@comment include/ngspice/fftext.h
-@comment include/ngspice/ftedbgra.h
-@comment include/ngspice/ftedebug.h
-@comment include/ngspice/ftedefs.h
-@comment include/ngspice/ftedev.h
-@comment include/ngspice/fteext.h
-@comment include/ngspice/fteinp.h
-@comment include/ngspice/fteinput.h
-@comment include/ngspice/fteoptdefs.h
-@comment include/ngspice/fteparse.h
-@comment include/ngspice/gendefs.h
-@comment include/ngspice/gendev.h
-@comment include/ngspice/graph.h
-@comment include/ngspice/grid.h
-@comment include/ngspice/hash.h
-@comment include/ngspice/hlpdefs.h
-@comment include/ngspice/iferrmsg.h
-@comment include/ngspice/ifsim.h
-@comment include/ngspice/inpdefs.h
-@comment include/ngspice/inpmacs.h
-@comment include/ngspice/inpptree.h
-@comment include/ngspice/ipc.h
-@comment include/ngspice/ipcproto.h
-@comment include/ngspice/ipctiein.h
-@comment include/ngspice/jobdefs.h
-@comment include/ngspice/lsort.h
-@comment include/ngspice/macros.h
-@comment include/ngspice/material.h
-@comment include/ngspice/matldefs.h
-@comment include/ngspice/memory.h
-@comment include/ngspice/meshdefs.h
-@comment include/ngspice/meshext.h
-@comment include/ngspice/methdefs.h
-@comment include/ngspice/mif.h
-@comment include/ngspice/mifcmdat.h
-@comment include/ngspice/mifdefs.h
-@comment include/ngspice/mifparse.h
-@comment include/ngspice/mifproto.h
-@comment include/ngspice/miftypes.h
-@comment include/ngspice/missing_math.h
-@comment include/ngspice/mobdefs.h
-@comment include/ngspice/modldefs.h
-@comment include/ngspice/multi_line.h
-@comment include/ngspice/ngspice.h
-@comment include/ngspice/noisedef.h
-@comment include/ngspice/numcards.h
-@comment include/ngspice/numconst.h
-@comment include/ngspice/numenum.h
-@comment include/ngspice/numgen.h
-@comment include/ngspice/numglobs.h
-@comment include/ngspice/onedev.h
-@comment include/ngspice/onemesh.h
-@comment include/ngspice/opdefs.h
-@comment include/ngspice/optdefs.h
-@comment include/ngspice/optndefs.h
-@comment include/ngspice/outpdefs.h
-@comment include/ngspice/plot.h
-@comment include/ngspice/pnode.h
-@comment include/ngspice/profile.h
-@comment include/ngspice/pssdefs.h
-@comment include/ngspice/pzdefs.h
-@comment include/ngspice/randnumb.h
-@comment include/ngspice/sen2defs.h
-@comment include/ngspice/sensdefs.h
-@comment include/ngspice/sensgen.h
-@comment include/ngspice/sharedspice.h
-@comment include/ngspice/sim.h
-@comment include/ngspice/smpdefs.h
-@comment include/ngspice/sperror.h
-@comment include/ngspice/spmatrix.h
-@comment include/ngspice/stringskip.h
-@comment include/ngspice/stringutil.h
-@comment include/ngspice/suffix.h
-@comment include/ngspice/swec.h
-@comment include/ngspice/tclspice.h
-@comment include/ngspice/tfdefs.h
-@comment include/ngspice/trandefs.h
-@comment include/ngspice/trcvdefs.h
-@comment include/ngspice/tskdefs.h
-@comment include/ngspice/twodev.h
-@comment include/ngspice/twomesh.h
-@comment include/ngspice/typedefs.h
-@comment include/ngspice/wallace.h
-@comment include/ngspice/wordlist.h
-@comment include/ngspice/wstdio.h
+include/ngspice/
+include/ngspice/1-f-code.h
+include/ngspice/FastNorm3.h
+include/ngspice/acdefs.h
+include/ngspice/bdrydefs.h
+include/ngspice/bool.h
+include/ngspice/carddefs.h
+include/ngspice/ciderinp.h
+include/ngspice/cidersupt.h
+include/ngspice/cktdefs.h
+include/ngspice/cluster.h
+include/ngspice/cm.h
+include/ngspice/cmconstants.h
+include/ngspice/cmproto.h
+include/ngspice/cmtypes.h
+include/ngspice/compatmode.h
+include/ngspice/complex.h
+include/ngspice/config.h
+include/ngspice/const.h
+include/ngspice/contdefs.h
+include/ngspice/cpdefs.h
+include/ngspice/cpextern.h
+include/ngspice/cpstd.h
+include/ngspice/defines.h
+include/ngspice/devdefs.h
+include/ngspice/dgen.h
+include/ngspice/distodef.h
+include/ngspice/dllitf.h
+include/ngspice/domndefs.h
+include/ngspice/dopdefs.h
+include/ngspice/dstring.h
+include/ngspice/dvec.h
+include/ngspice/elctdefs.h
+include/ngspice/enh.h
+include/ngspice/enhtypes.h
+include/ngspice/evt.h
+include/ngspice/evtproto.h
+include/ngspice/evtshared.h
+include/ngspice/evttypes.h
+include/ngspice/evtudn.h
+include/ngspice/fftext.h
+include/ngspice/ftedbgra.h
+include/ngspice/ftedebug.h
+include/ngspice/ftedefs.h
+include/ngspice/ftedev.h
+include/ngspice/fteext.h
+include/ngspice/fteinp.h
+include/ngspice/fteinput.h
+include/ngspice/fteoptdefs.h
+include/ngspice/fteparse.h
+include/ngspice/gendefs.h
+include/ngspice/gendev.h
+include/ngspice/graph.h
+include/ngspice/grid.h
+include/ngspice/hash.h
+include/ngspice/hlpdefs.h
+include/ngspice/iferrmsg.h
+include/ngspice/ifsim.h
+include/ngspice/inpdefs.h
+include/ngspice/inpmacs.h
+include/ngspice/inpptree.h
+include/ngspice/ipc.h
+include/ngspice/ipcproto.h
+include/ngspice/ipctiein.h
+include/ngspice/jobdefs.h
+include/ngspice/lsort.h
+include/ngspice/macros.h
+include/ngspice/material.h
+include/ngspice/matldefs.h
+include/ngspice/memory.h
+include/ngspice/meshdefs.h
+include/ngspice/meshext.h
+include/ngspice/methdefs.h
+include/ngspice/mif.h
+include/ngspice/mifcmdat.h
+include/ngspice/mifdefs.h
+include/ngspice/mifparse.h
+include/ngspice/mifproto.h
+include/ngspice/miftypes.h
+include/ngspice/missing_math.h
+include/ngspice/mobdefs.h
+include/ngspice/modldefs.h
+include/ngspice/multi_line.h
+include/ngspice/ngspice.h
+include/ngspice/noisedef.h
+include/ngspice/numcards.h
+include/ngspice/numconst.h
+include/ngspice/numenum.h
+include/ngspice/numgen.h
+include/ngspice/numglobs.h
+include/ngspice/onedev.h
+include/ngspice/onemesh.h
+include/ngspice/opdefs.h
+include/ngspice/optdefs.h
+include/ngspice/optndefs.h
+include/ngspice/outpdefs.h
+include/ngspice/plot.h
+include/ngspice/pnode.h
+include/ngspice/profile.h
+include/ngspice/pssdefs.h
+include/ngspice/pzdefs.h
+include/ngspice/randnumb.h
+include/ngspice/sen2defs.h
+include/ngspice/sensdefs.h
+include/ngspice/sensgen.h
+include/ngspice/sharedspice.h
+include/ngspice/sim.h
+include/ngspice/smpdefs.h
+include/ngspice/sperror.h
+include/ngspice/spmatrix.h
+include/ngspice/stringskip.h
+include/ngspice/stringutil.h
+include/ngspice/suffix.h
+include/ngspice/swec.h
+include/ngspice/tclspice.h
+include/ngspice/tfdefs.h
+include/ngspice/trandefs.h
+include/ngspice/trcvdefs.h
+include/ngspice/tskdefs.h
+include/ngspice/twodev.h
+include/ngspice/twomesh.h
+include/ngspice/typedefs.h
+include/ngspice/wallace.h
+include/ngspice/wordlist.h
+include/ngspice/wstdio.h
lib/libngspice.a
lib/libngspice.la
@lib lib/libngspice.so.${LIBngspice_VERSION}
-lib/ngspice/
-@bin lib/ngspice/analog.cm
-@bin lib/ngspice/digital.cm
-@bin lib/ngspice/spice2poly.cm
-@bin lib/ngspice/table.cm
-@bin lib/ngspice/xtradev.cm
-@bin lib/ngspice/xtraevt.cm
lib/pkgconfig/ngspice.pc
-@man man/man1/cmpp.1
-share/ngspice/dlmain.c
-share/ngspice/scripts/ciderinit
-share/ngspice/scripts/devaxis
-share/ngspice/scripts/devload
-@comment share/ngspice/scripts/setplot
-@comment share/ngspice/scripts/spectrum
-@comment share/ngspice/scripts/spinit
+share/ngspice/
+share/ngspice/scripts/
+share/ngspice/scripts/setplot
+share/ngspice/scripts/spectrum
+share/ngspice/scripts/spinit
