Attachment 59999 Details for Bug 90182 – file.diff

[patch] file.diff

file.diff (text/plain), 7.33 KB, created by AMAKAWA Shuhei on 2005-12-10 12:30:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: AMAKAWA Shuhei

Created: 2005-12-10 12:30:02 UTC

Size: 7.33 KB

patch

obsolete

>diff -uNr /usr/ports/cad/ngspice_rework/Makefile ngspice_rework/Makefile
>--- /usr/ports/cad/ngspice_rework/Makefile	Sun Nov 20 22:16:09 2005
>+++ ngspice_rework/Makefile	Sat Dec 10 19:27:50 2005
>@@ -6,22 +6,20 @@
> #
> 
> PORTNAME=	ngspice_rework
>-PORTVERSION=	15
>+PORTVERSION=	17
> CATEGORIES=	cad
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	ngspice
>-DISTNAME=	ngspice-rework${PORTVERSION}
>-EXTRACT_SUFX=	.tgz
>+DISTNAME=	ng-spice-rework-${PORTVERSION}
> 
> 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
> 
>-.ifndef PACKAGE_BUILDING
>+.ifdef PACKAGE_BUILDING
> CONFIGURE_ARGS+=	--with-readline=yes
> .else
> CONFIGURE_ARGS+=	--disable-debug
>diff -uNr /usr/ports/cad/ngspice_rework/distinfo ngspice_rework/distinfo
>--- /usr/ports/cad/ngspice_rework/distinfo	Wed Oct 13 10:30:32 2004
>+++ ngspice_rework/distinfo	Sat Dec 10 17:46:50 2005
>@@ -1,2 +1,2 @@
>-MD5 (ngspice-rework15.tgz) = 5a55ff2062fd3bebaed77ebb454d7882
>-SIZE (ngspice-rework15.tgz) = 4813438
>+MD5 (ng-spice-rework-17.tar.gz) = abe283dea98b913a2122f085076865b1
>+SIZE (ng-spice-rework-17.tar.gz) = 5919637
>diff -uNr /usr/ports/cad/ngspice_rework/files/patch-configure ngspice_rework/files/patch-configure
>--- /usr/ports/cad/ngspice_rework/files/patch-configure	Thu Jan  1 09:00:00 1970
>+++ ngspice_rework/files/patch-configure	Sat Dec 10 19:15:24 2005
>@@ -0,0 +1,11 @@
>+--- configure.orig	Tue Aug 30 16:58:35 2005
>++++ configure	Sat Dec 10 19:15:02 2005
>+@@ -3365,7 +3365,7 @@
>+ if test "$enable_debug" = "no"; then
>+ 	{ echo "$as_me:$LINENO: WARNING: Removing debugging option!" >&5
>+ echo "$as_me: WARNING: Removing debugging option!" >&2;}
>+-	CFLAGS=" "
>++#	CFLAGS=" "
>+ fi
>+ 
>+ if test "x$GCC" = "xyes"; then
>diff -uNr /usr/ports/cad/ngspice_rework/files/patch-doc:Makefile.in ngspice_rework/files/patch-doc:Makefile.in
>--- /usr/ports/cad/ngspice_rework/files/patch-doc:Makefile.in	Wed Oct 13 10:30:33 2004
>+++ ngspice_rework/files/patch-doc:Makefile.in	Sat Dec 10 18:05:35 2005
>@@ -1,11 +1,11 @@
>---- doc/Makefile.in.orig	Wed Jan 28 00:25:46 2004
>-+++ doc/Makefile.in	Thu Sep 23 03:19:35 2004
>-@@ -85,7 +85,7 @@
>- LN_S = @LN_S@
>- LTLIB = @LTLIB@
>+--- 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 @@
>  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@
>diff -uNr /usr/ports/cad/ngspice_rework/files/patch-doc:ngspice.texi ngspice_rework/files/patch-doc:ngspice.texi
>--- /usr/ports/cad/ngspice_rework/files/patch-doc:ngspice.texi	Sat Feb  9 19:03:42 2002
>+++ ngspice_rework/files/patch-doc:ngspice.texi	Sat Dec 10 17:57:39 2005
>@@ -1,6 +1,6 @@
>---- doc/ngspice.texi.orig	Mon Dec 10 20:21:11 2001
>-+++ doc/ngspice.texi	Mon Jan  7 17:15:34 2002
>-@@ -5,6 +5,11 @@
>+--- doc/ngspice.texi.orig	Tue Aug 16 07:24:58 2005
>++++ doc/ngspice.texi	Sat Dec 10 17:56:39 2005
>+@@ -7,6 +7,11 @@
>  @setchapternewpage odd
>  @c %**end of header
>  
>@@ -9,6 +9,6 @@
> +* NGSPICE: (ngspice).              NGSPICE User Manual
> +@end direntry
> +
>- @ifinfo
>- This file documents NGSPICE.
>- 
>+ @c Summary Description and Copyright
>+ @copying
>+ Copyright 1996 The Regents of the University of California.
>diff -uNr /usr/ports/cad/ngspice_rework/files/patch-src:frontend:aspice.c ngspice_rework/files/patch-src:frontend:aspice.c
>--- /usr/ports/cad/ngspice_rework/files/patch-src:frontend:aspice.c	Wed Oct 13 10:30:33 2004
>+++ ngspice_rework/files/patch-src:frontend:aspice.c	Thu Jan  1 09:00:00 1970
>@@ -1,11 +0,0 @@
>---- src/frontend/aspice.c.orig	Thu Sep 23 03:09:22 2004
>-+++ src/frontend/aspice.c	Thu Sep 23 03:08:13 2004
>-@@ -178,6 +178,8 @@
>- 
>- #if defined(__NetBSD__) || defined(SOLARIS)
>-     pid_t status;
>-+#elif defined(__FreeBSD__)
>-+    int status;
>- #else
>-     union wait status;
>- #endif
>diff -uNr /usr/ports/cad/ngspice_rework/files/patch-src:frontend:control.c ngspice_rework/files/patch-src:frontend:control.c
>--- /usr/ports/cad/ngspice_rework/files/patch-src:frontend:control.c	Wed Oct 13 10:30:33 2004
>+++ ngspice_rework/files/patch-src:frontend:control.c	Thu Jan  1 09:00:00 1970
>@@ -1,10 +0,0 @@
>---- src/frontend/control.c.orig	Thu Dec 25 17:30:51 2003
>-+++ src/frontend/control.c	Fri Sep 24 13:02:13 2004
>-@@ -822,6 +822,7 @@
>- void
>- cp_resetcontrol(void)
>- {
>-+    void cp_free_control(void);
>-     fprintf(cp_err, "Warning: clearing control structures\n");
>-     if (cend[stackp] && cend[stackp]->co_parent)
>-         fprintf(cp_err, "Warning: EOF before block terminated\n");
>diff -uNr /usr/ports/cad/ngspice_rework/files/patch-src:frontend:resource.c ngspice_rework/files/patch-src:frontend:resource.c
>--- /usr/ports/cad/ngspice_rework/files/patch-src:frontend:resource.c	Thu Jan  1 09:00:00 1970
>+++ ngspice_rework/files/patch-src:frontend:resource.c	Sat Dec 10 20:42:33 2005
>@@ -0,0 +1,40 @@
>+--- 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
>diff -uNr /usr/ports/cad/ngspice_rework/files/patch-src:spicelib:analysis:cktncdump.c ngspice_rework/files/patch-src:spicelib:analysis:cktncdump.c
>--- /usr/ports/cad/ngspice_rework/files/patch-src:spicelib:analysis:cktncdump.c	Wed Oct 13 10:30:33 2004
>+++ ngspice_rework/files/patch-src:spicelib:analysis:cktncdump.c	Thu Jan  1 09:00:00 1970
>@@ -1,12 +0,0 @@
>---- 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 "suffix.h"
>-+#include "cktdefs.h"
>-+#include "suffix.h"
>- 
>- void
>- CKTncDump(ckt) 
>diff -uNr /usr/ports/cad/ngspice_rework/pkg-plist ngspice_rework/pkg-plist
>--- /usr/ports/cad/ngspice_rework/pkg-plist	Wed Oct 13 10:30:32 2004
>+++ ngspice_rework/pkg-plist	Sat Dec 10 20:03:59 2005
>@@ -5,11 +5,13 @@
> 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

Actions: View | Diff

Attachments on bug 90182: 59999