Index: head/cad/ngspice_rework/Makefile
===================================================================
--- head/cad/ngspice_rework/Makefile	(revision 540371)
+++ head/cad/ngspice_rework/Makefile	(revision 540372)
@@ -1,47 +1,47 @@
 # Created by: AMAKAWA Shuhei <amakawa@jp.FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	ngspice_rework
-PORTVERSION=	31
+PORTVERSION=	32
 CATEGORIES=	cad
 MASTER_SITES=	SF/ngspice/ng-spice-rework/${PORTVERSION}
 DISTNAME=	ngspice-${PORTVERSION}
 
 MAINTAINER=	kevinz5000@gmail.com
 COMMENT=	Mixed-signal circuit simulator derived from Spice and Cider
 
 LICENSE=	BSD3CLAUSE BSD4CLAUSE LGPL21+
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 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
+USES=		gmake libtool ncurses readline autoreconf pkgconfig
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--enable-cider --enable-shared --enable-xspice --with-readline=yes
 
 OPTIONS_DEFINE=	DEBUG
 
 .if ${FLAVOR:U} ==	shlib
 CONFIGURE_ARGS+=	--with-ngshared
 PLIST_SUB+=		SHLIB="" X11="@comment "
 .else
 USES+=			xorg
-USE_XORG=		ice sm x11 xaw xext xmu xt
+USE_XORG=		ice sm x11 xaw xext xmu xt xft
 CONFIGURE_ARGS+=	--with-x
 PLIST_SUB+=		SHLIB="@comment " X11=""
 .endif
 
 DEBUG_CONFIGURE_ENABLE=	debug
 
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
Index: head/cad/ngspice_rework/distinfo
===================================================================
--- head/cad/ngspice_rework/distinfo	(revision 540371)
+++ head/cad/ngspice_rework/distinfo	(revision 540372)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1572299061
-SHA256 (ngspice-31.tar.gz) = 845f3b0c962e47ded051dfbc134c3c1e4ac925c9f0ce1cb3df64eb9b9da5c282
-SIZE (ngspice-31.tar.gz) = 7250057
+TIMESTAMP = 1588964866
+SHA256 (ngspice-32.tar.gz) = 3cd90c4e94516d87c5b4d02a3a6405b1136b25d05c871d4fee1fd7c4c0d03ef2
+SIZE (ngspice-32.tar.gz) = 7728816
Index: head/cad/ngspice_rework/files/patch-configure.ac
===================================================================
--- head/cad/ngspice_rework/files/patch-configure.ac	(nonexistent)
+++ head/cad/ngspice_rework/files/patch-configure.ac	(revision 540372)
@@ -0,0 +1,34 @@
+--- configure.ac.orig	2020-05-06 06:11:56 UTC
++++ configure.ac
+@@ -707,7 +707,6 @@ fi
+ # Xft is optional, allows text rotation in plots
+ 
+ if test "x$no_x" != xyes ; then
+-    X_CFLAGS="$X_CFLAGS -I/usr/include/freetype2"
+     AC_CHECK_LIB([Xaw], [main], [X_LIBS="$X_LIBS -lXaw"],
+         [AC_MSG_ERROR([Couldn't find Xaw library])], [$X_LIBS $X_EXTRA_LIBS])
+     AC_CHECK_LIB([Xmu], [main], [X_LIBS="$X_LIBS -lXmu"],
+@@ -716,21 +715,8 @@ if test "x$no_x" != xyes ; then
+     AC_CHECK_LIB([Xext], [XShmAttach], [X_LIBS="$X_LIBS -lXext"],
+         [AC_MSG_ERROR([Couldn't find Xext library])], [$X_LIBS $X_EXTRA_LIBS])
+     X_LIBS="$X_LIBS -lX11"
+-	AC_CHECK_LIB([Xft], [main],
+-        [AC_DEFINE([HAVE_LIBXFT], [1], [Have xft routines in libxft])]
+-        X_LIBS="$X_LIBS -lXft -lfontconfig -lXrender -lfreetype"
+-        has_xft=yes,
+-        [has_xft=no], [$X_LIBS $X_EXTRA_LIBS])
+-
+-    if test "x$has_xft" = xyes ; then
+-        AC_CHECK_LIB([fontconfig], [main], [],
+-            [AC_MSG_ERROR([Couldn't find fontconfig library])], [$X_LIBS $X_EXTRA_LIBS])
+-#        AC_CHECK_LIB([Xrender], [main], [],
+-#            [AC_MSG_ERROR([Couldn't find Xrender library])], [$X_LIBS $X_EXTRA_LIBS])
+-        AC_CHECK_LIB([freetype], [main], [],
+-            [AC_MSG_ERROR([Couldn't find freetype library])], [$X_LIBS $X_EXTRA_LIBS])
+-    fi
+-
++    PKG_CHECK_MODULES([XFT], [xft], [X_CFLAGS="$X_CFLAGS $XFT_CFLAGS"; X_LIBS="$X_LIBS $XFT_LIBS"],
++                      [AC_MSG_ERROR([Couldn't find freetype library])])
+     has_no_x=false
+ else
+     AC_DEFINE([X_DISPLAY_MISSING])

Property changes on: head/cad/ngspice_rework/files/patch-configure.ac
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/cad/ngspice_rework/files/patch-src_frontend_com__sysinfo.c
===================================================================
--- head/cad/ngspice_rework/files/patch-src_frontend_com__sysinfo.c	(nonexistent)
+++ head/cad/ngspice_rework/files/patch-src_frontend_com__sysinfo.c	(revision 540372)
@@ -0,0 +1,37 @@
+--- src/frontend/com_sysinfo.c.orig	2020-05-06 06:11:56 UTC
++++ src/frontend/com_sysinfo.c
+@@ -396,18 +396,6 @@ static void set_static_system_info(void)
+     return;
+ } /* end of function set_static_system_info */
+ 
+-#elif defined(__APPLE__) && defined(__MACH__)
+-/* Get memory information */
+-static int get_sysmem(struct sys_memory *memall)
+-{
+-    fprintf(stderr, "System memory info is not available\n");
+-    return -1;
+-}
+-/* Get system information */
+-static void set_static_system_info(void)
+-{
+-}
+-
+ #elif defined(_WIN32)
+ 
+ /* Get memory information */
+@@ -972,9 +960,14 @@ static void get_physical_processor_count(void)
+     return;
+ } /* end of function get_physical_processor_count */
+ 
++#else /* no Windows OS, no proc info file system */
+ 
++static int get_sysmem(struct sys_memory *memall)
++{
++    fprintf(stderr, "System memory info is not available\n");
++    return -1;
++}
+ 
+-#else /* no Windows OS, no proc info file system */
+ void set_static_system_info(void)
+ {
+     /* Set to no data available */

Property changes on: head/cad/ngspice_rework/files/patch-src_frontend_com__sysinfo.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/cad/ngspice_rework/pkg-plist
===================================================================
--- head/cad/ngspice_rework/pkg-plist	(revision 540371)
+++ head/cad/ngspice_rework/pkg-plist	(revision 540372)
@@ -1,145 +1,146 @@
 bin/cmpp
 %%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
 %%X11%%man/man1/ngspice.1.gz
 share/ngspice/dlmain.c
 include/ngspice/enhtypes.h
 include/ngspice/evtshared.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/wincolornames.h
 include/ngspice/wordlist.h
 include/ngspice/wstdio.h
 share/ngspice/scripts/ciderinit
 share/ngspice/scripts/devaxis
 share/ngspice/scripts/devload
 share/ngspice/scripts/setplot
 share/ngspice/scripts/spectrum
 share/ngspice/scripts/spinit