Upgrade to 28, and use flavors to build the x11 application and the shared library.

PR:		226191
Submitted by:	Kevin Zheng (maintainer)
Approved by:	portmgr (bapt)

3 files changed, 151 insertions, 143 deletions

diff --git a/cad/ngspice_rework/Makefile b/cad/ngspice_rework/Makefile
index c7ecb9151d64..1800d8914955 100644
--- a/cad/ngspice_rework/Makefile
+++ b/cad/ngspice_rework/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ngspice_rework
-PORTVERSION=	26
-PORTREVISION=	3
+PORTVERSION=	28
 CATEGORIES=	cad
 MASTER_SITES=	SF/ngspice/ng-spice-rework/${PORTVERSION}
 DISTNAME=	ngspice-${PORTVERSION}
@@ -17,27 +16,33 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_aarch64=	Fails to link: missing sbrk
 
-USES=		gmake libtool readline
+LIB_DEPENDS=	libfftw3.so:math/fftw3
+
+FLAVORS=	x11 shlib
+shlib_PKGNAMESUFFIX=	-shlib
+shlib_CONFLICTS_INSTALL=	ngspice_rework-2*
+x11_CONFLICTS_INSTALL=		ngspice_rework-shlib-2*
+
+USES=		gmake libtool ncurses readline
+
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS=	--enable-cider --enable-xspice --with-readline=yes
+CONFIGURE_ARGS=	--enable-cider --enable-shared --enable-xspice --with-readline=yes
 
-OPTIONS_DEFINE=			DEBUG
-OPTIONS_DEFAULT=		X11
-OPTIONS_SINGLE=			INTERFACE
-OPTIONS_SINGLE_INTERFACE=	SHLIB X11
-OPTIONS_SUB=			yes
+OPTIONS_DEFINE=	DEBUG
 
-SHLIB_DESC=		Build as a shared library
+.if ${FLAVOR:U} ==	shlib
+CONFIGURE_ARGS+=	--with-ngshared
+PLIST_SUB+=		SHLIB="" X11="@comment "
+.else
+USE_XORG=		ice sm x11 xaw xext xmu xt
+CONFIGURE_ARGS+=	--with-x
+PLIST_SUB+=		SHLIB="@comment " X11=""
+.endif
 
 DEBUG_CONFIGURE_ENABLE=	debug
 
-SHLIB_CONFIGURE_WITH=	ngshared
-
-X11_USE=		XORG=ice,sm,x11,xaw,xext,xmu,xt
-X11_CONFIGURE_WITH=	x
-
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/cad/ngspice_rework/distinfo b/cad/ngspice_rework/distinfo
index b3a65a0cf351..d70b1da99c76 100644
--- a/cad/ngspice_rework/distinfo
+++ b/cad/ngspice_rework/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ngspice-26.tar.gz) = 51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108
-SIZE (ngspice-26.tar.gz) = 6925987
+TIMESTAMP = 1534684795
+SHA256 (ngspice-28.tar.gz) = 94804fa78c8db2f90f088902e8c27f7b732a66767a58c70f37612bff5a16df66
+SIZE (ngspice-28.tar.gz) = 6737636
diff --git a/cad/ngspice_rework/pkg-plist b/cad/ngspice_rework/pkg-plist
index dc5524f5c76b..7a93912b3403 100644
--- a/cad/ngspice_rework/pkg-plist
+++ b/cad/ngspice_rework/pkg-plist
@@ -1,144 +1,146 @@
 bin/cmpp
-%%X11%%bin/ngmakeidx
-%%X11%%bin/ngmultidec
-%%X11%%bin/ngnutmeg
-%%X11%%bin/ngproc2mod
-%%X11%%bin/ngsconvert
 %%X11%%bin/ngspice
+%%SHLIB%%libdata/pkgconfig/ngspice.pc
 %%SHLIB%%lib/libngspice.so
 %%SHLIB%%lib/libngspice.so.0
 %%SHLIB%%lib/libngspice.so.0.0.0
 lib/ngspice/analog.cm
 lib/ngspice/digital.cm
 lib/ngspice/spice2poly.cm
+lib/ngspice/table.cm
 lib/ngspice/xtradev.cm
 lib/ngspice/xtraevt.cm
+man/man1/cmpp.1.gz
+man/man1/ngmakeidx.1.gz
 man/man1/ngmultidec.1.gz
 man/man1/ngnutmeg.1.gz
+man/man1/ngproc2mod.1.gz
 man/man1/ngsconvert.1.gz
 man/man1/ngspice.1.gz
 share/ngspice/dlmain.c
-%%X11%%share/ngspice/helpdir/ngspice.idx
-%%X11%%share/ngspice/helpdir/ngspice.txt
-share/ngspice/include/ngspice/1-f-code.h
-share/ngspice/include/ngspice/FastNorm3.h
-share/ngspice/include/ngspice/acdefs.h
-share/ngspice/include/ngspice/bdrydefs.h
-share/ngspice/include/ngspice/bool.h
-share/ngspice/include/ngspice/carddefs.h
-share/ngspice/include/ngspice/ciderinp.h
-share/ngspice/include/ngspice/cidersupt.h
-share/ngspice/include/ngspice/cktdefs.h
-share/ngspice/include/ngspice/cluster.h
-share/ngspice/include/ngspice/cm.h
-share/ngspice/include/ngspice/cmconstants.h
-share/ngspice/include/ngspice/cmproto.h
-share/ngspice/include/ngspice/cmtypes.h
-share/ngspice/include/ngspice/compatmode.h
-share/ngspice/include/ngspice/complex.h
-share/ngspice/include/ngspice/config.h
-share/ngspice/include/ngspice/const.h
-share/ngspice/include/ngspice/contdefs.h
-share/ngspice/include/ngspice/cpdefs.h
-share/ngspice/include/ngspice/cpextern.h
-share/ngspice/include/ngspice/cpstd.h
-share/ngspice/include/ngspice/defines.h
-share/ngspice/include/ngspice/devdefs.h
-share/ngspice/include/ngspice/dgen.h
-share/ngspice/include/ngspice/distodef.h
-share/ngspice/include/ngspice/dllitf.h
-share/ngspice/include/ngspice/domndefs.h
-share/ngspice/include/ngspice/dopdefs.h
-share/ngspice/include/ngspice/dstring.h
-share/ngspice/include/ngspice/dvec.h
-share/ngspice/include/ngspice/elctdefs.h
-share/ngspice/include/ngspice/enh.h
-share/ngspice/include/ngspice/evt.h
-share/ngspice/include/ngspice/evtproto.h
-share/ngspice/include/ngspice/evtudn.h
-share/ngspice/include/ngspice/fftext.h
-share/ngspice/include/ngspice/ftedbgra.h
-share/ngspice/include/ngspice/ftedebug.h
-share/ngspice/include/ngspice/ftedefs.h
-share/ngspice/include/ngspice/ftedev.h
-share/ngspice/include/ngspice/fteext.h
-share/ngspice/include/ngspice/fteinp.h
-share/ngspice/include/ngspice/fteinput.h
-share/ngspice/include/ngspice/fteoptdefs.h
-share/ngspice/include/ngspice/fteparse.h
-share/ngspice/include/ngspice/gendefs.h
-share/ngspice/include/ngspice/gendev.h
-share/ngspice/include/ngspice/graph.h
-share/ngspice/include/ngspice/grid.h
-share/ngspice/include/ngspice/hash.h
-share/ngspice/include/ngspice/hlpdefs.h
-share/ngspice/include/ngspice/iferrmsg.h
-share/ngspice/include/ngspice/ifsim.h
-share/ngspice/include/ngspice/inpdefs.h
-share/ngspice/include/ngspice/inpmacs.h
-share/ngspice/include/ngspice/inpptree.h
-share/ngspice/include/ngspice/ipc.h
-share/ngspice/include/ngspice/ipcproto.h
-share/ngspice/include/ngspice/ipctiein.h
-share/ngspice/include/ngspice/jobdefs.h
-share/ngspice/include/ngspice/lsort.h
-share/ngspice/include/ngspice/macros.h
-share/ngspice/include/ngspice/material.h
-share/ngspice/include/ngspice/matldefs.h
-share/ngspice/include/ngspice/memory.h
-share/ngspice/include/ngspice/meshdefs.h
-share/ngspice/include/ngspice/meshext.h
-share/ngspice/include/ngspice/methdefs.h
-share/ngspice/include/ngspice/mif.h
-share/ngspice/include/ngspice/mifcmdat.h
-share/ngspice/include/ngspice/mifdefs.h
-share/ngspice/include/ngspice/mifparse.h
-share/ngspice/include/ngspice/mifproto.h
-share/ngspice/include/ngspice/miftypes.h
-share/ngspice/include/ngspice/missing_math.h
-share/ngspice/include/ngspice/mobdefs.h
-share/ngspice/include/ngspice/modldefs.h
-share/ngspice/include/ngspice/multi_line.h
-share/ngspice/include/ngspice/ngspice.h
-share/ngspice/include/ngspice/noisedef.h
-share/ngspice/include/ngspice/numcards.h
-share/ngspice/include/ngspice/numconst.h
-share/ngspice/include/ngspice/numenum.h
-share/ngspice/include/ngspice/numgen.h
-share/ngspice/include/ngspice/numglobs.h
-share/ngspice/include/ngspice/onedev.h
-share/ngspice/include/ngspice/onemesh.h
-share/ngspice/include/ngspice/opdefs.h
-share/ngspice/include/ngspice/optdefs.h
-share/ngspice/include/ngspice/optndefs.h
-share/ngspice/include/ngspice/outpdefs.h
-share/ngspice/include/ngspice/plot.h
-share/ngspice/include/ngspice/pnode.h
-share/ngspice/include/ngspice/profile.h
-share/ngspice/include/ngspice/pssdefs.h
-share/ngspice/include/ngspice/pzdefs.h
-share/ngspice/include/ngspice/sen2defs.h
-share/ngspice/include/ngspice/sensdefs.h
-share/ngspice/include/ngspice/sensgen.h
-share/ngspice/include/ngspice/sharedspice.h
-share/ngspice/include/ngspice/sim.h
-share/ngspice/include/ngspice/smpdefs.h
-share/ngspice/include/ngspice/sperror.h
-share/ngspice/include/ngspice/spmatrix.h
-share/ngspice/include/ngspice/stringutil.h
-share/ngspice/include/ngspice/suffix.h
-share/ngspice/include/ngspice/swec.h
-share/ngspice/include/ngspice/tclspice.h
-share/ngspice/include/ngspice/tfdefs.h
-share/ngspice/include/ngspice/trandefs.h
-share/ngspice/include/ngspice/trcvdefs.h
-share/ngspice/include/ngspice/tskdefs.h
-share/ngspice/include/ngspice/twodev.h
-share/ngspice/include/ngspice/twomesh.h
-share/ngspice/include/ngspice/typedefs.h
-share/ngspice/include/ngspice/wallace.h
-share/ngspice/include/ngspice/wordlist.h
-share/ngspice/include/ngspice/wstdio.h
+include/ngspice/enhtypes.h
+include/ngspice/evttypes.h
+include/ngspice/randnumb.h
+include/ngspice/stringskip.h
+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/evt.h
+include/ngspice/evtproto.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/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/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
 share/ngspice/scripts/ciderinit
 share/ngspice/scripts/devaxis
 share/ngspice/scripts/devload