11 files changed, 50 insertions, 261 deletions

diff --git a/cad/ngspice_rework/Makefile b/cad/ngspice_rework/Makefile
index 10d7b78fd60a..c6578e56c7d5 100644
--- a/cad/ngspice_rework/Makefile
+++ b/cad/ngspice_rework/Makefile
@@ -6,20 +6,22 @@
 #
 
 PORTNAME=	ngspice_rework
-PORTVERSION=	14
+PORTVERSION=	15
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ngspice
-DISTNAME=	ng-spice-rework-${PORTVERSION}
+DISTNAME=	ngspice-rework${PORTVERSION}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	amakawa@jp.FreeBSD.org
 COMMENT=	A circuit simulator derived from spice3f5
 
-USE_AUTOCONF_VER?=	213
+WRKSRC=		${WRKDIR}/ng-spice-rework-${PORTVERSION}
+GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER?=15
+USE_GMAKE=	yes
 
+INFO=		ngspice
 MAN1=		ngspice.1 ngnutmeg.1 ngsconvert.1
 
-pre-configure:
-		(cd ${WRKSRC} && ${AUTOHEADER})
-
 .include <bsd.port.mk>
diff --git a/cad/ngspice_rework/distinfo b/cad/ngspice_rework/distinfo
index 903bab7394b6..13dd466889c5 100644
--- a/cad/ngspice_rework/distinfo
+++ b/cad/ngspice_rework/distinfo
@@ -1,2 +1,2 @@
-MD5 (ng-spice-rework-14.tar.gz) = 5405d78a531fe9f30d70c35a8a469690
-SIZE (ng-spice-rework-14.tar.gz) = 2762582
+MD5 (ngspice-rework15.tgz) = 5a55ff2062fd3bebaed77ebb454d7882
+SIZE (ngspice-rework15.tgz) = 4813438
diff --git a/cad/ngspice_rework/files/patch-aspice.c b/cad/ngspice_rework/files/patch-aspice.c
deleted file mode 100644
index 03d123c289ab..000000000000
--- a/cad/ngspice_rework/files/patch-aspice.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/frontend/aspice.c	Tue Jun  4 21:18:04 2002
-+++ src/frontend/aspice.c	Tue Jun  4 21:17:32 2002
-@@ -178,6 +178,8 @@
- 
- #if defined(__NetBSD__)
-     pid_t status;
-+#elif defined(__FreeBSD__)
-+    int status;
- #else
-     union wait status;
- #endif
diff --git a/cad/ngspice_rework/files/patch-configure.in b/cad/ngspice_rework/files/patch-configure.in
deleted file mode 100644
index 7bb26c5835ca..000000000000
--- a/cad/ngspice_rework/files/patch-configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Mon Dec 10 20:21:11 2001
-+++ configure.in	Wed Jan  2 13:36:55 2002
-@@ -155,7 +155,7 @@
- 
- dnl Look for termios first (posix)
- AC_CHECK_HEADERS(termios.h termio.h sgtty.h , break)
--AC_CHECK_FUNCS(isatty)
-+AC_CHECK_FUNCS(isatty tcgetattr tcsetattr)
- 
- dnl Check for a few functions:
- AC_FUNC_VFORK
diff --git a/cad/ngspice_rework/files/patch-doc:Makefile.in b/cad/ngspice_rework/files/patch-doc:Makefile.in
index 77e324c095b6..28217c4c6209 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	Mon Dec 10 20:26:23 2001
-+++ doc/Makefile.in	Mon Jan  7 16:54:16 2002
-@@ -69,7 +69,7 @@
- LIBTOOL = @LIBTOOL@
+--- 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@
  MAINT = @MAINT@
 -MAKEINFO = @MAKEINFO@
 +MAKEINFO = @MAKEINFO@ --no-split
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
+ NUMDEV = @NUMDEV@
+ NUMDEVDIR = @NUMDEVDIR@
+ NUMPARAMDIR = @NUMPARAMDIR@
diff --git a/cad/ngspice_rework/files/patch-src:frontend:aspice.c b/cad/ngspice_rework/files/patch-src:frontend:aspice.c
new file mode 100644
index 000000000000..6fb7e882b6d5
--- /dev/null
+++ b/cad/ngspice_rework/files/patch-src:frontend:aspice.c
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..6ac74093fdee
--- /dev/null
+++ b/cad/ngspice_rework/files/patch-src:frontend:control.c
@@ -0,0 +1,10 @@
+--- 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:frontend:parser:complete.c b/cad/ngspice_rework/files/patch-src:frontend:parser:complete.c
deleted file mode 100644
index dc4d335d0d6f..000000000000
--- a/cad/ngspice_rework/files/patch-src:frontend:parser:complete.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/frontend/parser/complete.c.orig	Mon Dec 10 20:21:11 2001
-+++ src/frontend/parser/complete.c	Wed Jan  2 13:57:11 2002
-@@ -410,11 +410,6 @@
- #  else
- #    ifdef HAVE_TERMIOS_H
- 
--#      ifdef __NetBSD__
--#        define TCGETS
--#        define TCSETS
--#      endif
--
- #      define TERM_GET TCGETS
- #      define TERM_SET TCSETS
-     static struct termios sbuf;
-@@ -423,7 +418,7 @@
- #    endif
- #  endif
- 
--#  if defined(TERM_GET) || defined(__NetBSD__)
-+#  ifdef TERM_GET
-     static bool ison = FALSE;
- 
-     if (cp_nocc || !cp_interactive || (ison == on))
-@@ -431,7 +426,7 @@
-     ison = on;
- 
-     if (ison == TRUE) {
--#ifdef __NetBSD__
-+#if HAVE_TCGETATTR
- 	tcgetattr(fileno(cp_in),&OS_Buf);
- #else
- 	(void) ioctl(fileno(cp_in), TERM_GET, (char *) &OS_Buf);
-@@ -440,13 +435,13 @@
- 	sbuf.c_cc[VEOF] = 0;
- 	sbuf.c_cc[VEOL] = ESCAPE;
- 	sbuf.c_cc[VEOL2] = CNTRL_D;
--#ifdef __NetBSD__
-+#if HAVE_TCSETATTR
- 	tcsetattr(fileno(cp_in),TCSANOW,&sbuf);
- #else
- 	(void) ioctl(fileno(cp_in), TERM_SET, (char *) &sbuf);
- #endif
-     } else {
--#ifdef __NetBSD__
-+#if HAVE_TCSETATTR
- 	tcsetattr(fileno(cp_in),TCSANOW,&OS_Buf);
- #else
- 	(void) ioctl(fileno(cp_in), TERM_SET, (char *) &OS_Buf);
diff --git a/cad/ngspice_rework/files/patch-src:frontend:plotting:pvec.c b/cad/ngspice_rework/files/patch-src:frontend:plotting:pvec.c
deleted file mode 100644
index 426f1e713b91..000000000000
--- a/cad/ngspice_rework/files/patch-src:frontend:plotting:pvec.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/frontend/plotting/pvec.c.orig	Fri Sep 17 17:30:10 2004
-+++ src/frontend/plotting/pvec.c	Fri Sep 17 17:30:33 2004
-@@ -47,8 +47,6 @@
-     case GRID_SMITHGRID:
-         strcat(buf, ", grid = smithgrid (not xformed)");
-         break;
--
--    default:
-     }
- 
-     switch (d->v_plottype) {
-@@ -60,8 +58,6 @@
-     case PLOT_POINT:
-         strcat(buf, ", plot = point");
-         break;
--
--    default:
-     }
-     if (d->v_defcolor) {
-         sprintf(buf2, ", color = %s", d->v_defcolor);
diff --git a/cad/ngspice_rework/files/patch-src:spicelib:analysis:cktncdump.c b/cad/ngspice_rework/files/patch-src:spicelib:analysis:cktncdump.c
new file mode 100644
index 000000000000..471953adaadd
--- /dev/null
+++ b/cad/ngspice_rework/files/patch-src:spicelib:analysis:cktncdump.c
@@ -0,0 +1,12 @@
+--- 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/pkg-plist b/cad/ngspice_rework/pkg-plist
index 5e88293ce2e9..b85c383e69b4 100644
--- a/cad/ngspice_rework/pkg-plist
+++ b/cad/ngspice_rework/pkg-plist
@@ -5,162 +5,6 @@ bin/ngnutmeg
 bin/ngproc2mod
 bin/ngsconvert
 bin/ngspice
-@unexec install-info --delete %D/info/ngspice.info %D/info/dir
-info/ngspice.info
-lib/libdev.a
-lib/ng-spice-rework/libasrc.a
-lib/ng-spice-rework/libasrc.la
-lib/ng-spice-rework/libasrc.so
-lib/ng-spice-rework/libasrc.so.0
-lib/ng-spice-rework/libbjt.a
-lib/ng-spice-rework/libbjt.la
-lib/ng-spice-rework/libbjt.so
-lib/ng-spice-rework/libbjt.so.0
-lib/ng-spice-rework/libbsim1.a
-lib/ng-spice-rework/libbsim1.la
-lib/ng-spice-rework/libbsim1.so
-lib/ng-spice-rework/libbsim1.so.0
-lib/ng-spice-rework/libbsim2.a
-lib/ng-spice-rework/libbsim2.la
-lib/ng-spice-rework/libbsim2.so
-lib/ng-spice-rework/libbsim2.so.0
-lib/ng-spice-rework/libbsim3.a
-lib/ng-spice-rework/libbsim3.la
-lib/ng-spice-rework/libbsim3.so
-lib/ng-spice-rework/libbsim3.so.0
-lib/ng-spice-rework/libbsim3soidd.a
-lib/ng-spice-rework/libbsim3soidd.la
-lib/ng-spice-rework/libbsim3soidd.so
-lib/ng-spice-rework/libbsim3soidd.so.0
-lib/ng-spice-rework/libbsim3soifd.a
-lib/ng-spice-rework/libbsim3soifd.la
-lib/ng-spice-rework/libbsim3soifd.so
-lib/ng-spice-rework/libbsim3soifd.so.0
-lib/ng-spice-rework/libbsim3soipd.a
-lib/ng-spice-rework/libbsim3soipd.la
-lib/ng-spice-rework/libbsim3soipd.so
-lib/ng-spice-rework/libbsim3soipd.so.0
-lib/ng-spice-rework/libbsim3v1.a
-lib/ng-spice-rework/libbsim3v1.la
-lib/ng-spice-rework/libbsim3v1.so
-lib/ng-spice-rework/libbsim3v1.so.0
-lib/ng-spice-rework/libbsim3v2.a
-lib/ng-spice-rework/libbsim3v2.la
-lib/ng-spice-rework/libbsim3v2.so
-lib/ng-spice-rework/libbsim3v2.so.0
-lib/ng-spice-rework/libbsim4.a
-lib/ng-spice-rework/libbsim4.la
-lib/ng-spice-rework/libbsim4.so
-lib/ng-spice-rework/libbsim4.so.0
-lib/ng-spice-rework/libcap.a
-lib/ng-spice-rework/libcap.la
-lib/ng-spice-rework/libcap.so
-lib/ng-spice-rework/libcap.so.0
-lib/ng-spice-rework/libcccs.a
-lib/ng-spice-rework/libcccs.la
-lib/ng-spice-rework/libcccs.so
-lib/ng-spice-rework/libcccs.so.0
-lib/ng-spice-rework/libccvs.a
-lib/ng-spice-rework/libccvs.la
-lib/ng-spice-rework/libccvs.so
-lib/ng-spice-rework/libccvs.so.0
-lib/ng-spice-rework/libcsw.a
-lib/ng-spice-rework/libcsw.la
-lib/ng-spice-rework/libcsw.so
-lib/ng-spice-rework/libcsw.so.0
-lib/ng-spice-rework/libdio.a
-lib/ng-spice-rework/libdio.la
-lib/ng-spice-rework/libdio.so
-lib/ng-spice-rework/libdio.so.0
-lib/ng-spice-rework/libhfet.a
-lib/ng-spice-rework/libhfet.la
-lib/ng-spice-rework/libhfet.so
-lib/ng-spice-rework/libhfet.so.0
-lib/ng-spice-rework/libhfet2.a
-lib/ng-spice-rework/libhfet2.la
-lib/ng-spice-rework/libhfet2.so
-lib/ng-spice-rework/libhfet2.so.0
-lib/ng-spice-rework/libind.a
-lib/ng-spice-rework/libind.la
-lib/ng-spice-rework/libind.so
-lib/ng-spice-rework/libind.so.0
-lib/ng-spice-rework/libisrc.a
-lib/ng-spice-rework/libisrc.la
-lib/ng-spice-rework/libisrc.so
-lib/ng-spice-rework/libisrc.so.0
-lib/ng-spice-rework/libjfet.a
-lib/ng-spice-rework/libjfet.la
-lib/ng-spice-rework/libjfet.so
-lib/ng-spice-rework/libjfet.so.0
-lib/ng-spice-rework/libjfet2.a
-lib/ng-spice-rework/libjfet2.la
-lib/ng-spice-rework/libjfet2.so
-lib/ng-spice-rework/libjfet2.so.0
-lib/ng-spice-rework/libltra.a
-lib/ng-spice-rework/libltra.la
-lib/ng-spice-rework/libltra.so
-lib/ng-spice-rework/libltra.so.0
-lib/ng-spice-rework/libmes.a
-lib/ng-spice-rework/libmes.la
-lib/ng-spice-rework/libmes.so
-lib/ng-spice-rework/libmes.so.0
-lib/ng-spice-rework/libmesa.a
-lib/ng-spice-rework/libmesa.la
-lib/ng-spice-rework/libmesa.so
-lib/ng-spice-rework/libmesa.so.0
-lib/ng-spice-rework/libmos1.a
-lib/ng-spice-rework/libmos1.la
-lib/ng-spice-rework/libmos1.so
-lib/ng-spice-rework/libmos1.so.0
-lib/ng-spice-rework/libmos2.a
-lib/ng-spice-rework/libmos2.la
-lib/ng-spice-rework/libmos2.so
-lib/ng-spice-rework/libmos2.so.0
-lib/ng-spice-rework/libmos3.a
-lib/ng-spice-rework/libmos3.la
-lib/ng-spice-rework/libmos3.so
-lib/ng-spice-rework/libmos3.so.0
-lib/ng-spice-rework/libmos6.a
-lib/ng-spice-rework/libmos6.la
-lib/ng-spice-rework/libmos6.so
-lib/ng-spice-rework/libmos6.so.0
-lib/ng-spice-rework/libmos9.a
-lib/ng-spice-rework/libmos9.la
-lib/ng-spice-rework/libmos9.so
-lib/ng-spice-rework/libmos9.so.0
-lib/ng-spice-rework/libres.a
-lib/ng-spice-rework/libres.la
-lib/ng-spice-rework/libres.so
-lib/ng-spice-rework/libres.so.0
-lib/ng-spice-rework/libsoi3.a
-lib/ng-spice-rework/libsoi3.la
-lib/ng-spice-rework/libsoi3.so
-lib/ng-spice-rework/libsoi3.so.0
-lib/ng-spice-rework/libsw.a
-lib/ng-spice-rework/libsw.la
-lib/ng-spice-rework/libsw.so
-lib/ng-spice-rework/libsw.so.0
-lib/ng-spice-rework/libtra.a
-lib/ng-spice-rework/libtra.la
-lib/ng-spice-rework/libtra.so
-lib/ng-spice-rework/libtra.so.0
-lib/ng-spice-rework/liburc.a
-lib/ng-spice-rework/liburc.la
-lib/ng-spice-rework/liburc.so
-lib/ng-spice-rework/liburc.so.0
-lib/ng-spice-rework/libvccs.a
-lib/ng-spice-rework/libvccs.la
-lib/ng-spice-rework/libvccs.so
-lib/ng-spice-rework/libvccs.so.0
-lib/ng-spice-rework/libvcvs.a
-lib/ng-spice-rework/libvcvs.la
-lib/ng-spice-rework/libvcvs.so
-lib/ng-spice-rework/libvcvs.so.0
-lib/ng-spice-rework/libvsrc.a
-lib/ng-spice-rework/libvsrc.la
-lib/ng-spice-rework/libvsrc.so
-lib/ng-spice-rework/libvsrc.so.0
-@dirrm lib/ng-spice-rework
 share/ng-spice-rework/helpdir/ngspice.idx
 share/ng-spice-rework/helpdir/ngspice.txt
 share/ng-spice-rework/scripts/setplot