FreeBSD Bugzilla – Attachment 92390 Details for
Bug 130047
update cad/ngspice_rework to version 18
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 7.67 KB, created by
Pedro F. Giffuni
on 2008-12-30 04:10:00 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Pedro F. Giffuni
Created:
2008-12-30 04:10:00 UTC
Size:
7.67 KB
patch
obsolete
>diff -ruN ngspice_rework.orig/Makefile ngspice_rework/Makefile >--- ngspice_rework.orig/Makefile 2008-12-29 15:33:28.000000000 -0500 >+++ ngspice_rework/Makefile 2008-12-29 22:40:52.000000000 -0500 >@@ -6,8 +6,7 @@ > # > > PORTNAME= ngspice_rework >-PORTVERSION= 17 >-PORTREVISION= 1 >+PORTVERSION= 18 > CATEGORIES= cad > MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} > MASTER_SITE_SUBDIR= ngspice >@@ -16,12 +15,19 @@ > MAINTAINER= amakawa@jp.FreeBSD.org > COMMENT= A circuit simulator derived from spice3f5 > >-GNU_CONFIGURE= yes >+USE_AUTOTOOLS= autoconf:262 > USE_GMAKE= yes > >+#XSPICE doesn't build >+#CONFIGURE_ARGS+= --enable-xspice >+ >+.ifndef PACKAGE_BUILDING >+CONFIGURE_ARGS+= --with-readline=yes >+.else > CONFIGURE_ARGS+= --disable-debug >+.endif > > INFO= ngspice >-MAN1= ngspice.1 ngnutmeg.1 ngsconvert.1 >+MAN1= ngspice.1 ngnutmeg.1 ngsconvert.1 ngmultidec.1 > > .include <bsd.port.mk> >diff -ruN ngspice_rework.orig/distinfo ngspice_rework/distinfo >--- ngspice_rework.orig/distinfo 2008-12-29 15:33:28.000000000 -0500 >+++ ngspice_rework/distinfo 2008-12-29 15:35:59.000000000 -0500 >@@ -1,3 +1,3 @@ >-MD5 (ng-spice-rework-17.tar.gz) = abe283dea98b913a2122f085076865b1 >-SHA256 (ng-spice-rework-17.tar.gz) = 58ec02a0ab48369724c9e98f9a6aa3e0f400ae7b361ba194f4bf06d1420f4496 >-SIZE (ng-spice-rework-17.tar.gz) = 5919637 >+MD5 (ng-spice-rework-18.tar.gz) = 3ab09b939939f7d0fb8cc9d8c77ead71 >+SHA256 (ng-spice-rework-18.tar.gz) = 1ae8ff5db42a0ca89803faed17fca75836f7c4f8dc026530efabc57eb4956954 >+SIZE (ng-spice-rework-18.tar.gz) = 7061554 >diff -ruN ngspice_rework.orig/files/patch-configure ngspice_rework/files/patch-configure >--- ngspice_rework.orig/files/patch-configure 2008-12-29 15:33:28.000000000 -0500 >+++ ngspice_rework/files/patch-configure 1969-12-31 19:00:00.000000000 -0500 >@@ -1,11 +0,0 @@ >---- 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 -ruN ngspice_rework.orig/files/patch-configure.in ngspice_rework/files/patch-configure.in >--- ngspice_rework.orig/files/patch-configure.in 1969-12-31 19:00:00.000000000 -0500 >+++ ngspice_rework/files/patch-configure.in 2008-12-29 19:17:37.000000000 -0500 >@@ -0,0 +1,23 @@ >+--- configure.in.orig 2008-12-29 19:13:00.000000000 -0500 >++++ configure.in 2008-12-29 19:16:35.000000000 -0500 >+@@ -205,16 +205,16 @@ >+ if test "$enable_debug" = "no"; then >+ if test "x$GCC" = "xyes"; then >+ AC_MSG_WARN(Removing debugging option!) >+- CFLAGS="$ext_CFLAGS -O2 -Wall -s" >++ CFLAGS+="$ext_CFLAGS -O2 -Wall -s" >+ else >+ AC_MSG_WARN(Removing debugging option!) >+- CFLAGS="$ext_CFLAGS -O2" >++ CFLAGS+="$ext_CFLAGS -O2" >+ fi >+ else >+ if test "x$GCC" = "xyes"; then >+- CFLAGS="$ext_CFLAGS -g -O0 -Wall" >++ CFLAGS+="$ext_CFLAGS -g -O0 -Wall" >+ else >+- CFLAGS="$ext_CFLAGS -g" >++ CFLAGS+="$ext_CFLAGS -g" >+ fi >+ fi >+ >diff -ruN ngspice_rework.orig/files/patch-doc:Makefile.in ngspice_rework/files/patch-doc:Makefile.in >--- ngspice_rework.orig/files/patch-doc:Makefile.in 2008-12-29 15:33:28.000000000 -0500 >+++ ngspice_rework/files/patch-doc:Makefile.in 2008-12-29 15:42:13.000000000 -0500 >@@ -1,11 +1,11 @@ >---- 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 @@ >+--- doc/Makefile.in.orig 2008-11-30 11:12:39.000000000 -0500 >++++ doc/Makefile.in 2008-12-29 15:41:25.000000000 -0500 >+@@ -114,7 +114,7 @@ >+ LN_S = @LN_S@ >+ LTLIBOBJS = @LTLIBOBJS@ > 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@ >+ MKDIR_P = @MKDIR_P@ >+ NDEV_DIR = @NDEV_DIR@ >+ NDEV_LIB = @NDEV_LIB@ >diff -ruN ngspice_rework.orig/files/patch-src__frontend__resource.c ngspice_rework/files/patch-src__frontend__resource.c >--- ngspice_rework.orig/files/patch-src__frontend__resource.c 2008-12-29 15:33:28.000000000 -0500 >+++ ngspice_rework/files/patch-src__frontend__resource.c 2008-12-29 15:45:58.000000000 -0500 >@@ -1,40 +1,10 @@ >---- 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 @@ >+--- src/frontend/resource.c.orig 2008-11-19 14:45:28.000000000 -0500 >++++ src/frontend/resource.c 2008-12-29 15:44:52.000000000 -0500 >+@@ -605,6 +605,7 @@ > fault(void) > { >- signal(SIGSEGV, (SIGNAL_FUNCTION) fault); /* SysV style */ >-+ signal(SIGBUS, (SIGNAL_FUNCTION) fault); /* SysV style */ >- LONGJMP(env, 1); >+ 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 -ruN ngspice_rework.orig/files/patch-src__xspice__icm__Makefile ngspice_rework/files/patch-src__xspice__icm__Makefile >--- ngspice_rework.orig/files/patch-src__xspice__icm__Makefile 1969-12-31 19:00:00.000000000 -0500 >+++ ngspice_rework/files/patch-src__xspice__icm__Makefile 2008-12-29 16:26:11.000000000 -0500 >@@ -0,0 +1,14 @@ >+--- src/xspice/icm/Makefile.orig 2008-12-29 15:47:40.000000000 -0500 >++++ src/xspice/icm/Makefile 2008-12-29 15:48:36.000000000 -0500 >+@@ -12,9 +12,9 @@ >+ -include .deps/cm.P >+ -include .deps/dlmain.P >+ >+-UPMAKE = make -f $(TOPDIR)../Makefile TOPDIR=$(TOPDIR)../ >++UPMAKE = gmake -f $(TOPDIR)../Makefile TOPDIR=$(TOPDIR)../ >+ >+-MAKE = make -f $(TOPDIR)Makefile TOPDIR=$(TOPDIR) >++MAKE = gmake -f $(TOPDIR)Makefile TOPDIR=$(TOPDIR) >+ >+ COMPILE = $(CC) $(INCLUDES) $(CFLAGS) >+ >diff -ruN ngspice_rework.orig/files/patch-src__xspice__ipc__ipcstdio.c ngspice_rework/files/patch-src__xspice__ipc__ipcstdio.c >--- ngspice_rework.orig/files/patch-src__xspice__ipc__ipcstdio.c 1969-12-31 19:00:00.000000000 -0500 >+++ ngspice_rework/files/patch-src__xspice__ipc__ipcstdio.c 2007-11-19 15:21:47.000000000 -0500 >@@ -0,0 +1,11 @@ >+--- src/xspice/ipc/ipcstdio.c.orig Mon Nov 19 15:13:29 2007 >++++ src/xspice/ipc/ipcstdio.c Mon Nov 19 15:18:42 2007 >+@@ -40,7 +40,7 @@ >+ Ipc_Wait_t wait; >+ { >+ printf ("GET_LINE\n"); >+- gets (str); >++ fgets (str, sizeof str, stdin); >+ *len = strlen (str); >+ return IPC_STATUS_OK; >+ } >diff -ruN ngspice_rework.orig/pkg-plist ngspice_rework/pkg-plist >--- ngspice_rework.orig/pkg-plist 2008-12-29 15:33:28.000000000 -0500 >+++ ngspice_rework/pkg-plist 2008-12-29 21:41:08.000000000 -0500 >@@ -1,17 +1,14 @@ >-bin/makeidx >-bin/nghelp >+bin/ngmakeidx > bin/ngmultidec > bin/ngnutmeg > 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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 130047
: 92390