10 files changed, 71 insertions, 52 deletions

diff --git a/cad/ngspice_rework/Makefile b/cad/ngspice_rework/Makefile
index 61c0a50688af..073ca0b99acf 100644
--- a/cad/ngspice_rework/Makefile
+++ b/cad/ngspice_rework/Makefile
@@ -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 --git a/cad/ngspice_rework/distinfo b/cad/ngspice_rework/distinfo
index 13dd466889c5..06d5534b4d5b 100644
--- a/cad/ngspice_rework/distinfo
+++ b/cad/ngspice_rework/distinfo
@@ -1,2 +1,3 @@
-MD5 (ngspice-rework15.tgz) = 5a55ff2062fd3bebaed77ebb454d7882
-SIZE (ngspice-rework15.tgz) = 4813438
+MD5 (ng-spice-rework-17.tar.gz) = abe283dea98b913a2122f085076865b1
+SHA256 (ng-spice-rework-17.tar.gz) = 58ec02a0ab48369724c9e98f9a6aa3e0f400ae7b361ba194f4bf06d1420f4496
+SIZE (ng-spice-rework-17.tar.gz) = 5919637
diff --git a/cad/ngspice_rework/files/patch-configure b/cad/ngspice_rework/files/patch-configure
new file mode 100644
index 000000000000..b222cf1f7f38
--- /dev/null
+++ b/cad/ngspice_rework/files/patch-configure
@@ -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 --git a/cad/ngspice_rework/files/patch-doc:Makefile.in b/cad/ngspice_rework/files/patch-doc:Makefile.in
index 28217c4c6209..7bc04b2acf52 100644
--- a/cad/ngspice_rework/files/patch-doc:Makefile.in
+++ b/cad/ngspice_rework/files/patch-doc:Makefile.in
@@ -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 --git a/cad/ngspice_rework/files/patch-doc:ngspice.texi b/cad/ngspice_rework/files/patch-doc:ngspice.texi
index c18196c0eed8..c3376442ce5b 100644
--- a/cad/ngspice_rework/files/patch-doc:ngspice.texi
+++ b/cad/ngspice_rework/files/patch-doc:ngspice.texi
@@ -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 --git a/cad/ngspice_rework/files/patch-src:frontend:aspice.c b/cad/ngspice_rework/files/patch-src:frontend:aspice.c
deleted file mode 100644
index 6fb7e882b6d5..000000000000
--- a/cad/ngspice_rework/files/patch-src:frontend:aspice.c
+++ /dev/null
@@ -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 --git a/cad/ngspice_rework/files/patch-src:frontend:control.c b/cad/ngspice_rework/files/patch-src:frontend:control.c
deleted file mode 100644
index 6ac74093fdee..000000000000
--- a/cad/ngspice_rework/files/patch-src:frontend:control.c
+++ /dev/null
@@ -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 --git a/cad/ngspice_rework/files/patch-src:spicelib:analysis:cktncdump.c b/cad/ngspice_rework/files/patch-src:spicelib:analysis:cktncdump.c
deleted file mode 100644
index 471953adaadd..000000000000
--- a/cad/ngspice_rework/files/patch-src:spicelib:analysis:cktncdump.c
+++ /dev/null
@@ -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 --git a/cad/ngspice_rework/files/patch-src__frontend__resource.c b/cad/ngspice_rework/files/patch-src__frontend__resource.c
new file mode 100644
index 000000000000..7b5e4bcd396d
--- /dev/null
+++ b/cad/ngspice_rework/files/patch-src__frontend__resource.c
@@ -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 --git a/cad/ngspice_rework/pkg-plist b/cad/ngspice_rework/pkg-plist
index b85c383e69b4..16453b8ab782 100644
--- a/cad/ngspice_rework/pkg-plist
+++ b/cad/ngspice_rework/pkg-plist
@@ -5,11 +5,13 @@ 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