Attachment #59999 for bug #90182

View | Details | Raw Unified | Return to bug 90182
Collapse All | Expand All




#

PORTNAME=	ngspice_rework
PORTVERSION=	17
CATEGORIES=	cad
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	ngspice
DISTNAME=	ng-spice-rework-${PORTVERSION}
EXTRACT_SUFX=	.tgz

MAINTAINER=	amakawa@jp.FreeBSD.org
COMMENT=	A circuit simulator derived from spice3f5

WRKSRC=		${WRKDIR}/ng-spice-rework-${PORTVERSION}
GNU_CONFIGURE=	yes
USE_AUTOTOOLS=	libtool:15
USE_GMAKE=	yes

.ifdef PACKAGE_BUILDING
CONFIGURE_ARGS+=	--with-readline=yes
.else
CONFIGURE_ARGS+=	--disable-debug

Lines 1-2 Link Here

(-)ngspice_rework/distinfo (-2 / +2 lines)
1	MD5 (ngspice-rework15.tgz) = 5a55ff2062fd3bebaed77ebb454d7882	1	MD5 (ng-spice-rework-17.tar.gz) = abe283dea98b913a2122f085076865b1
2	SIZE (ngspice-rework15.tgz) = 4813438	2	SIZE (ng-spice-rework-17.tar.gz) = 5919637

Line 0 Link Here

(-)ngspice_rework/files/patch-configure (+11 lines)
	1	--- configure.orig Tue Aug 30 16:58:35 2005
	2	+++ configure Sat Dec 10 19:15:02 2005
	3	@@ -3365,7 +3365,7 @@
	4	if test "$enable_debug" = "no"; then
	5	{ echo "$as_me:$LINENO: WARNING: Removing debugging option!" >&5
	6	echo "$as_me: WARNING: Removing debugging option!" >&2;}
	7	- CFLAGS=" "
	8	+# CFLAGS=" "
	9	fi
	10
	11	if test "x$GCC" = "xyes"; then




--- doc/Makefile.in.orig	Sat Dec 10 18:03:00 2005
+++ doc/Makefile.in	Sat Dec 10 18:05:11 2005
@@ -113,7 +113,7 @@
 LN_S = @LN_S@
 LTLIB = @LTLIB@
 MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
+MAKEINFO = @MAKEINFO@ --no-split
 NOTXGRAPH = @NOTXGRAPH@
 NUMDEV = @NUMDEV@
 NUMDEVDIR = @NUMDEVDIR@
 NUMPARAMDIR = @NUMPARAMDIR@

Lines 1-6 Link Here

(-)ngspice_rework/files/patch-doc:ngspice.texi (-6 / +6 lines)
1	--- doc/ngspice.texi.orig Mon Dec 10 20:21:11 2001	1	--- doc/ngspice.texi.orig Tue Aug 16 07:24:58 2005
2	+++ doc/ngspice.texi Mon Jan 7 17:15:34 2002	2	+++ doc/ngspice.texi Sat Dec 10 17:56:39 2005
3	@@ -5,6 +5,11 @@	3	@@ -7,6 +7,11 @@
4	@setchapternewpage odd	4	@setchapternewpage odd
5	@c %**end of header	5	@c %**end of header
6		6
Lines 9-14 Link Here
9	+* NGSPICE: (ngspice). NGSPICE User Manual	9	+* NGSPICE: (ngspice). NGSPICE User Manual
10	+@end direntry	10	+@end direntry
11	+	11	+
12	@ifinfo	12	@c Summary Description and Copyright
13	This file documents NGSPICE.	13	@copying
14		14	Copyright 1996 The Regents of the University of California.

Lines 1-11 Link Here

(-)ngspice_rework/files/patch-src:frontend:aspice.c (-11 lines)
1	--- src/frontend/aspice.c.orig Thu Sep 23 03:09:22 2004
2	+++ src/frontend/aspice.c Thu Sep 23 03:08:13 2004
3	@@ -178,6 +178,8 @@
4
5	#if defined(__NetBSD__) \|\| defined(SOLARIS)
6	pid_t status;
7	+#elif defined(__FreeBSD__)
8	+ int status;
9	#else
10	union wait status;
11	#endif

Lines 1-10 Link Here

(-)ngspice_rework/files/patch-src:frontend:control.c (-10 lines)
1	--- src/frontend/control.c.orig Thu Dec 25 17:30:51 2003
2	+++ src/frontend/control.c Fri Sep 24 13:02:13 2004
3	@@ -822,6 +822,7 @@
4	void
5	cp_resetcontrol(void)
6	{
7	+ void cp_free_control(void);
8	fprintf(cp_err, "Warning: clearing control structures\n");
9	if (cend[stackp] && cend[stackp]->co_parent)
10	fprintf(cp_err, "Warning: EOF before block terminated\n");




--- src/frontend/resource.c.orig	Thu Jun 30 23:38:21 2005
+++ src/frontend/resource.c	Sat Dec 10 20:41:22 2005
@@ -424,6 +424,7 @@
 fault(void)
 {
 	signal(SIGSEGV, (SIGNAL_FUNCTION) fault);	/* SysV style */
+	signal(SIGBUS, (SIGNAL_FUNCTION) fault);	/* SysV style */
 	LONGJMP(env, 1);
 }
 
@@ -436,7 +437,8 @@
 	char *low, *high, *at;
 	/* char *sbrk(int);  */
 	long x;
-	RETSIGTYPE	(*orig_signal)( );
+	RETSIGTYPE	(*orig_sigsegv)( );
+	RETSIGTYPE	(*orig_sigbus)( );
 
 	if (getenv("SPICE_NO_DATASEG_CHECK"))
 		return 0;
@@ -444,7 +446,8 @@
 	low = 0;
 	high = (char *) ((unsigned long) sbrk(0) & ~((1 << LOG2_PAGESIZE) - 1));
 
-	orig_signal = signal(SIGSEGV, (SIGNAL_FUNCTION) fault);
+	orig_sigsegv = signal(SIGSEGV, (SIGNAL_FUNCTION) fault);
+	orig_sigbus = signal(SIGBUS, (SIGNAL_FUNCTION) fault);
 
 	do {
 
@@ -472,7 +475,8 @@
 
 	} while (1);
 
-	(void) signal(SIGSEGV, (SIGNAL_FUNCTION) orig_signal);
+	(void) signal(SIGSEGV, (SIGNAL_FUNCTION) orig_sigsegv);
+	(void) signal(SIGBUS, (SIGNAL_FUNCTION) orig_sigbus);
 	return (void *) high;
 
 #endif




--- src/spicelib/analysis/cktncdump.c.orig	Sun Sep 26 19:16:43 2004
+++ src/spicelib/analysis/cktncdump.c	Sun Sep 26 19:16:54 2004
@@ -4,7 +4,8 @@
 **********/
 
 #include "ngspice.h"
-#include "cktdefs.h"
+#include "cktdefs.h"
+#include "suffix.h"
 
 void
 CKTncDump(ckt) 




bin/ngproc2mod
bin/ngsconvert
bin/ngspice
lib/ng-spice-rework/libbsim4.a
share/ng-spice-rework/helpdir/ngspice.idx
share/ng-spice-rework/helpdir/ngspice.txt
share/ng-spice-rework/scripts/setplot
share/ng-spice-rework/scripts/spectrum
share/ng-spice-rework/scripts/spinit
@dirrm lib/ng-spice-rework
@dirrm share/ng-spice-rework/helpdir
@dirrm share/ng-spice-rework/scripts
@dirrm share/ng-spice-rework

Return to bug 90182

Lines 6-27 Link Here

(-)ngspice_rework/Makefile (-5 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= ngspice_rework	8	PORTNAME= ngspice_rework
9	PORTVERSION= 15	9	PORTVERSION= 17
10	CATEGORIES= cad	10	CATEGORIES= cad
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ngspice	12	MASTER_SITE_SUBDIR= ngspice
13	DISTNAME= ngspice-rework${PORTVERSION}	13	DISTNAME= ng-spice-rework-${PORTVERSION}
14	EXTRACT_SUFX= .tgz
15		14
16	MAINTAINER= amakawa@jp.FreeBSD.org	15	MAINTAINER= amakawa@jp.FreeBSD.org
17	COMMENT= A circuit simulator derived from spice3f5	16	COMMENT= A circuit simulator derived from spice3f5
18		17
19	WRKSRC= ${WRKDIR}/ng-spice-rework-${PORTVERSION}
20	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
21	USE_AUTOTOOLS= libtool:15	19	USE_AUTOTOOLS= libtool:15
22	USE_GMAKE= yes	20	USE_GMAKE= yes
23		21
24	.ifndef PACKAGE_BUILDING	22	.ifdef PACKAGE_BUILDING
25	CONFIGURE_ARGS+= --with-readline=yes	23	CONFIGURE_ARGS+= --with-readline=yes
26	.else	24	.else
27	CONFIGURE_ARGS+= --disable-debug	25	CONFIGURE_ARGS+= --disable-debug

Lines 1-11 Link Here

(-)ngspice_rework/files/patch-doc:Makefile.in (-6 / +6 lines)
1	--- doc/Makefile.in.orig Wed Jan 28 00:25:46 2004	1	--- doc/Makefile.in.orig Sat Dec 10 18:03:00 2005
2	+++ doc/Makefile.in Thu Sep 23 03:19:35 2004	2	+++ doc/Makefile.in Sat Dec 10 18:05:11 2005
3	@@ -85,7 +85,7 @@	3	@@ -113,7 +113,7 @@
4	LN_S = @LN_S@
5	LTLIB = @LTLIB@
6	MAINT = @MAINT@	4	MAINT = @MAINT@
		5	MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
		6	MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
7	-MAKEINFO = @MAKEINFO@	7	-MAKEINFO = @MAKEINFO@
8	+MAKEINFO = @MAKEINFO@ --no-split	8	+MAKEINFO = @MAKEINFO@ --no-split
		9	NOTXGRAPH = @NOTXGRAPH@
9	NUMDEV = @NUMDEV@	10	NUMDEV = @NUMDEV@
10	NUMDEVDIR = @NUMDEVDIR@	11	NUMDEVDIR = @NUMDEVDIR@
11	NUMPARAMDIR = @NUMPARAMDIR@

Line 0 Link Here

(-)ngspice_rework/files/patch-src:frontend:resource.c (+40 lines)
	1	--- src/frontend/resource.c.orig Thu Jun 30 23:38:21 2005
	2	+++ src/frontend/resource.c Sat Dec 10 20:41:22 2005
	3	@@ -424,6 +424,7 @@
	4	fault(void)
	5	{
	6	signal(SIGSEGV, (SIGNAL_FUNCTION) fault); /* SysV style */
	7	+ signal(SIGBUS, (SIGNAL_FUNCTION) fault); /* SysV style */
	8	LONGJMP(env, 1);
	9	}
	10
	11	@@ -436,7 +437,8 @@
	12	char low, high, *at;
	13	/* char sbrk(int); /
	14	long x;
	15	- RETSIGTYPE (*orig_signal)( );
	16	+ RETSIGTYPE (*orig_sigsegv)( );
	17	+ RETSIGTYPE (*orig_sigbus)( );
	18
	19	if (getenv("SPICE_NO_DATASEG_CHECK"))
	20	return 0;
	21	@@ -444,7 +446,8 @@
	22	low = 0;
	23	high = (char *) ((unsigned long) sbrk(0) & ~((1 << LOG2_PAGESIZE) - 1));
	24
	25	- orig_signal = signal(SIGSEGV, (SIGNAL_FUNCTION) fault);
	26	+ orig_sigsegv = signal(SIGSEGV, (SIGNAL_FUNCTION) fault);
	27	+ orig_sigbus = signal(SIGBUS, (SIGNAL_FUNCTION) fault);
	28
	29	do {
	30
	31	@@ -472,7 +475,8 @@
	32
	33	} while (1);
	34
	35	- (void) signal(SIGSEGV, (SIGNAL_FUNCTION) orig_signal);
	36	+ (void) signal(SIGSEGV, (SIGNAL_FUNCTION) orig_sigsegv);
	37	+ (void) signal(SIGBUS, (SIGNAL_FUNCTION) orig_sigbus);
	38	return (void *) high;
	39
	40	#endif

Lines 1-12 Link Here

(-)ngspice_rework/files/patch-src:spicelib:analysis:cktncdump.c (-12 lines)
1	--- src/spicelib/analysis/cktncdump.c.orig Sun Sep 26 19:16:43 2004
2	+++ src/spicelib/analysis/cktncdump.c Sun Sep 26 19:16:54 2004
3	@@ -4,7 +4,8 @@
4	**********/
5
6	#include "ngspice.h"
7	-#include "cktdefs.h"
8	+#include "cktdefs.h"
9	+#include "suffix.h"
10
11	void
12	CKTncDump(ckt)

Lines 5-15 Link Here

(-)ngspice_rework/pkg-plist (+2 lines)
5	bin/ngproc2mod	5	bin/ngproc2mod
6	bin/ngsconvert	6	bin/ngsconvert
7	bin/ngspice	7	bin/ngspice
		8	lib/ng-spice-rework/libbsim4.a
8	share/ng-spice-rework/helpdir/ngspice.idx	9	share/ng-spice-rework/helpdir/ngspice.idx
9	share/ng-spice-rework/helpdir/ngspice.txt	10	share/ng-spice-rework/helpdir/ngspice.txt
10	share/ng-spice-rework/scripts/setplot	11	share/ng-spice-rework/scripts/setplot
11	share/ng-spice-rework/scripts/spectrum	12	share/ng-spice-rework/scripts/spectrum
12	share/ng-spice-rework/scripts/spinit	13	share/ng-spice-rework/scripts/spinit
		14	@dirrm lib/ng-spice-rework
13	@dirrm share/ng-spice-rework/helpdir	15	@dirrm share/ng-spice-rework/helpdir
14	@dirrm share/ng-spice-rework/scripts	16	@dirrm share/ng-spice-rework/scripts
15	@dirrm share/ng-spice-rework	17	@dirrm share/ng-spice-rework