git: 4f7368ca7613 - main - cad/ngspice_rework: Update 32 -> 35

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Wed, 17 Nov 2021 02:26:38 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4f7368ca76137e6a91bc672bd2d33d9b960e1cec

commit 4f7368ca76137e6a91bc672bd2d33d9b960e1cec
Author:     Kevin Zheng <kevinz5000@gmail.com>
AuthorDate: 2021-11-17 02:25:55 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2021-11-17 02:26:36 +0000

    cad/ngspice_rework: Update 32 -> 35
---
 cad/ngspice_rework/Makefile                        |   7 +-
 cad/ngspice_rework/distinfo                        |   6 +-
 .../files/patch-src_frontend_com__sysinfo.c        |  37 ------
 cad/ngspice_rework/pkg-plist-shlib                 | 129 +--------------------
 4 files changed, 6 insertions(+), 173 deletions(-)

diff --git a/cad/ngspice_rework/Makefile b/cad/ngspice_rework/Makefile
index ca462474fe1a..d96649bb64e1 100644
--- a/cad/ngspice_rework/Makefile
+++ b/cad/ngspice_rework/Makefile
@@ -1,8 +1,7 @@
 # Created by: AMAKAWA Shuhei <amakawa@jp.FreeBSD.org>
 
 PORTNAME=	ngspice_rework
-PORTVERSION=	32
-PORTREVISION=	2
+PORTVERSION=	35
 CATEGORIES=	cad
 MASTER_SITES=	SF/ngspice/ng-spice-rework/${PORTVERSION}
 DISTNAME=	ngspice-${PORTVERSION}
@@ -14,15 +13,13 @@ LICENSE=	BSD3CLAUSE BSD4CLAUSE LGPL21+
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_aarch64=	Fails to link: missing sbrk
+BROKEN_aarch64=	fails to link: missing sbrk
 
 LIB_DEPENDS=	libfftw3.so:math/fftw3
 
 FLAVORS=	x11 shlib
 shlib_PKGNAMESUFFIX=		-shlib
-shlib_CONFLICTS_INSTALL=	ngspice_rework-2*
 shlib_PLIST=			${MASTERDIR}/pkg-plist-shlib
-x11_CONFLICTS_INSTALL=		ngspice_rework-shlib-2*
 
 USES=		compiler:c11 gmake libtool ncurses readline autoreconf pkgconfig
 
diff --git a/cad/ngspice_rework/distinfo b/cad/ngspice_rework/distinfo
index 7da6acae5f89..b106568d688e 100644
--- a/cad/ngspice_rework/distinfo
+++ b/cad/ngspice_rework/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588964866
-SHA256 (ngspice-32.tar.gz) = 3cd90c4e94516d87c5b4d02a3a6405b1136b25d05c871d4fee1fd7c4c0d03ef2
-SIZE (ngspice-32.tar.gz) = 7728816
+TIMESTAMP = 1637017584
+SHA256 (ngspice-35.tar.gz) = c1b7f5c276db579acb3f0a7afb64afdeb4362289a6cab502d4ca302d6e5279ec
+SIZE (ngspice-35.tar.gz) = 8050668
diff --git a/cad/ngspice_rework/files/patch-src_frontend_com__sysinfo.c b/cad/ngspice_rework/files/patch-src_frontend_com__sysinfo.c
deleted file mode 100644
index 43b9d739a995..000000000000
--- a/cad/ngspice_rework/files/patch-src_frontend_com__sysinfo.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- 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 */
diff --git a/cad/ngspice_rework/pkg-plist-shlib b/cad/ngspice_rework/pkg-plist-shlib
index 1990dbeb4afb..2119cab3fb82 100644
--- a/cad/ngspice_rework/pkg-plist-shlib
+++ b/cad/ngspice_rework/pkg-plist-shlib
@@ -1,141 +1,14 @@
-bin/cmpp
 libdata/pkgconfig/ngspice.pc
 lib/libngspice.so
 lib/libngspice.so.0
-lib/libngspice.so.0.0.0
+lib/libngspice.so.0.0.1
 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
-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