From nobody@FreeBSD.org  Sat Dec 10 12:26:51 2005
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A489316A41F
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 10 Dec 2005 12:26:51 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 31CDB43D49
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 10 Dec 2005 12:26:51 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id jBACQp4U076850
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 10 Dec 2005 12:26:51 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id jBACQphe076849;
	Sat, 10 Dec 2005 12:26:51 GMT
	(envelope-from nobody)
Message-Id: <200512101226.jBACQphe076849@www.freebsd.org>
Date: Sat, 10 Dec 2005 12:26:51 GMT
From: shuhei <amakawa@jp.freebsd.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: update cad/ngspice_rework to 17
X-Send-Pr-Version: www-2.3

>Number:         90182
>Category:       ports
>Synopsis:       update cad/ngspice_rework to 17
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    tdb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 10 12:30:02 GMT 2005
>Closed-Date:    Tue Dec 13 18:43:14 GMT 2005
>Last-Modified:  Tue Dec 13 18:43:14 GMT 2005
>Originator:     shuhei
>Release:        4.11-STABLE
>Organization:
>Environment:
>Description:
              update cad/ngspice_rework to 17

>How-To-Repeat:
              
Removed files:
files/patch-src:frontend:aspice.c
files/patch-src:frontend:control.c
files/patch-src:spicelib:analysis:cktncdump.c

Added files:
files/patch-configure
files/patch-src:frontend:resource.c


>Fix:
              
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

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->tdb 
Responsible-Changed-By: tdb 
Responsible-Changed-When: Sat Dec 10 14:18:29 UTC 2005 
Responsible-Changed-Why:  
I'll handle this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90182 
State-Changed-From-To: open->feedback 
State-Changed-By: tdb 
State-Changed-When: Sat Dec 10 14:39:02 UTC 2005 
State-Changed-Why:  
I've added an SHA256 checksum and modified the names of your new 
patches (: is no longer allowed - use __ instead). Can you please 
approve this modification? 

http://people.freebsd.org/~tdb/patches/90182.diff 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90182 
State-Changed-From-To: feedback->closed 
State-Changed-By: tdb 
State-Changed-When: Sun Dec 11 17:42:53 UTC 2005 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90182 

From: <pfgshield-freebsd@yahoo.com>
To: bug-followup@FreeBSD.org, amakawa@jp.freebsd.org
Cc:  
Subject: Re: ports/90182: update cad/ngspice_rework to 17
Date: Mon, 12 Dec 2005 05:11:54 +0100 (CET)

 Hi:
 
 I noticed (a little late) that this patch links GNU readline and leaves
 debugging active when PACKAGE_BUILDING. 
 
 We have been specifically avoiding linking GNU readline here to avoid license
 issues. ngspice can now use libedit (this didn't work for me on 4.x though). 
 
 I suggest we completely remove the GNU readline flag from this port.
 
 Thanks for the update!
 
     Pedro.
 
 
 	
 
 	
 		
 ___________________________________ 
 Yahoo! Mail: gratis 1GB per i messaggi e allegati da 10MB 
 http://mail.yahoo.it
State-Changed-From-To: closed->open 
State-Changed-By: tdb 
State-Changed-When: Mon Dec 12 09:57:00 UTC 2005 
State-Changed-Why:  


http://www.freebsd.org/cgi/query-pr.cgi?pr=90182 

From: Tim Bishop <tdb@freebsd.org>
To: pfgshield-freebsd@yahoo.com
Cc: bug-followup@freebsd.org
Subject: Re: ports/90182: update cad/ngspice_rework to 17
Date: Mon, 12 Dec 2005 10:02:29 +0000

 On Mon, Dec 12, 2005 at 04:20:04AM +0000, pfgshield-freebsd@yahoo.com wrote:
 >  I noticed (a little late) that this patch links GNU readline and leaves
 >  debugging active when PACKAGE_BUILDING. 
 >  
 >  We have been specifically avoiding linking GNU readline here to avoid license
 >  issues. ngspice can now use libedit (this didn't work for me on 4.x though). 
 >  
 >  I suggest we completely remove the GNU readline flag from this port.
 
 Is this what you're suggesting?
 
 http://people.freebsd.org/~tdb/patches/90182-2.diff
 
 Tim.
 
 -- 
 Tim Bishop
 PGP Key: 0x5AE7D984

From: <pfgshield-freebsd@yahoo.com>
To: Tim Bishop <tdb@freebsd.org>
Cc: bug-followup@freebsd.org
Subject: Re: ports/90182: update cad/ngspice_rework to 17
Date: Mon, 12 Dec 2005 17:25:27 +0100 (CET)

 --- Tim Bishop <tdb@freebsd.org> ha scritto: 
 
 
 ...
 > Is this what you're suggesting?
 > 
 > http://people.freebsd.org/~tdb/patches/90182-2.diff
 > 
 > Tim.
 > 
 
 
 Yes,
 
 Thanks!
 
     Pedro
 
 
 	
 
 	
 		
 ___________________________________ 
 Yahoo! Mail: gratis 1GB per i messaggi e allegati da 10MB 
 http://mail.yahoo.it
State-Changed-From-To: open->closed 
State-Changed-By: tdb 
State-Changed-When: Tue Dec 13 18:42:54 UTC 2005 
State-Changed-Why:  
Committed, with approval. Thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90182 
>Unformatted:
