diff options
Diffstat (limited to 'cad/ng-spice')
| -rw-r--r-- | cad/ng-spice/Makefile | 8 | ||||
| -rw-r--r-- | cad/ng-spice/distinfo | 17 | ||||
| -rw-r--r-- | cad/ng-spice/patches/patch-ab | 20 | ||||
| -rw-r--r-- | cad/ng-spice/patches/patch-ac | 134 | ||||
| -rw-r--r-- | cad/ng-spice/patches/patch-ad | 8 | ||||
| -rw-r--r-- | cad/ng-spice/patches/patch-ae | 8 | ||||
| -rw-r--r-- | cad/ng-spice/patches/patch-af | 6 |
7 files changed, 110 insertions, 91 deletions
diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile index e035f4023af..d435eb0831e 100644 --- a/cad/ng-spice/Makefile +++ b/cad/ng-spice/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.23 2004/12/02 00:06:40 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.24 2004/12/02 13:33:32 dmcmahill Exp $ # -DISTNAME= ngspice-rework15 -PKGNAME= ng-spice-15 +DISTNAME= ng-spice-rework-15c +PKGNAME= ng-spice-15c CATEGORIES= cad MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ngspice/} -EXTRACT_SUFX= .tgz MAINTAINER= dmcmahill@NetBSD.org HOMEPAGE= http://ngspice.sourceforge.net/ @@ -17,6 +16,7 @@ WRKSRC= ${WRKDIR}/ng-spice-rework-15 USE_BUILDLINK3= YES USE_X11= YES USE_LIBTOOL= YES +USE_MAKEINFO= YES USE_GNU_TOOLS+= make USE_GNU_READLINE= uses rl_* interface diff --git a/cad/ng-spice/distinfo b/cad/ng-spice/distinfo index fdf48ea311b..eccfe72bec8 100644 --- a/cad/ng-spice/distinfo +++ b/cad/ng-spice/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.6 2004/12/02 00:06:40 dmcmahill Exp $ +$NetBSD: distinfo,v 1.7 2004/12/02 13:33:32 dmcmahill Exp $ -SHA1 (ngspice-rework15.tgz) = 4b6674c3342b69c573fce16e727c6f498286c2ad -Size (ngspice-rework15.tgz) = 4813438 bytes -SHA1 (patch-ab) = 1bbe7b422c130aee4c3cb601afdf3d7b70b42012 -SHA1 (patch-ac) = e03f74c08f801094dab5a2c82ca3726c2623b312 -SHA1 (patch-ad) = 385430708a5cd73d1d709121613058e2d4189ea8 -SHA1 (patch-ae) = cacf17a97fa8edcb70a6f8b89ddb97657643afcc -SHA1 (patch-af) = 06bc6f9bbf08c28304e4c2eb786f3c7039c83a94 -SHA1 (patch-ag) = 524b9ae6ab3c8980f4649dd65d83db89360a2aa8 +SHA1 (ng-spice-rework-15c.tar.gz) = 9cd62308a78134119479afaad620842c0923767c +Size (ng-spice-rework-15c.tar.gz) = 8730359 bytes +SHA1 (patch-ab) = bea9a7f0270ecaa10e58830c724c5e93333f7eb6 +SHA1 (patch-ac) = 319b43356e1b2f37fb21ef8fcdf7f64b405fe810 +SHA1 (patch-ad) = ba849271919d7b4ad03b9773ca0c93d82270b70f +SHA1 (patch-ae) = b4fc8912efb3277e364af0616f80811ad03df87c +SHA1 (patch-af) = f6621a9de22818d3f06d0aebc2b0a38791f1bece diff --git a/cad/ng-spice/patches/patch-ab b/cad/ng-spice/patches/patch-ab index 55f3166a770..acceb371392 100644 --- a/cad/ng-spice/patches/patch-ab +++ b/cad/ng-spice/patches/patch-ab @@ -1,17 +1,17 @@ -$NetBSD: patch-ab,v 1.3 2004/12/02 00:06:40 dmcmahill Exp $ +$NetBSD: patch-ab,v 1.4 2004/12/02 13:33:32 dmcmahill Exp $ ---- src/Makefile.am.orig Tue Jan 27 21:57:20 2004 +--- src/Makefile.am.orig Sat Feb 14 19:19:27 2004 +++ src/Makefile.am -@@ -2,7 +2,7 @@ +@@ -4,7 +4,7 @@ SUBDIRS = misc maths frontend spicelib i + DIST_SUBDIRS = misc maths frontend spicelib include xspice ciderlib - SUBDIRS = misc maths frontend spicelib include @XSPICEDIR@ @CIDERDIR@ + bin_PROGRAMS = ngspice ngnutmeg nghelp ngsconvert ngproc2mod ngmultidec \ +- makeidx ++ ngmakeidx --bin_PROGRAMS = ngspice ngnutmeg nghelp ngsconvert ngproc2mod ngmultidec makeidx -+bin_PROGRAMS = ngspice ngnutmeg nghelp ngsconvert ngproc2mod ngmultidec ngmakeidx - - EXTRA_DIST = ngspice.txt ngspice.idx spinit setplot spectrum @CIDERSCRIPTS@ - -@@ -166,14 +166,14 @@ ngmultidec_LDADD = \ + EXTRA_DIST = ngspice.txt ngspice.idx setplot spectrum \ + devload devaxis ciderinit winmain.c +@@ -169,14 +169,14 @@ ngmultidec_LDADD = \ maths/sparse/libsparse.a \ misc/libmisc.a diff --git a/cad/ng-spice/patches/patch-ac b/cad/ng-spice/patches/patch-ac index 3301d7fdd7d..8ef2e9eecac 100644 --- a/cad/ng-spice/patches/patch-ac +++ b/cad/ng-spice/patches/patch-ac @@ -1,74 +1,92 @@ -$NetBSD: patch-ac,v 1.3 2004/12/02 00:06:40 dmcmahill Exp $ +$NetBSD: patch-ac,v 1.4 2004/12/02 13:33:32 dmcmahill Exp $ ---- src/Makefile.in.orig Wed Jan 28 00:25:46 2004 +--- src/Makefile.in.orig Mon Sep 6 09:49:02 2004 +++ src/Makefile.in -@@ -106,7 +106,7 @@ YACC = @YACC@ +@@ -15,7 +15,7 @@ + @SET_MAKE@ - SUBDIRS = misc maths frontend spicelib include @XSPICEDIR@ @CIDERDIR@ --bin_PROGRAMS = ngspice ngnutmeg nghelp ngsconvert ngproc2mod ngmultidec makeidx -+bin_PROGRAMS = ngspice ngnutmeg nghelp ngsconvert ngproc2mod ngmultidec ngmakeidx - - EXTRA_DIST = ngspice.txt ngspice.idx spinit setplot spectrum @CIDERSCRIPTS@ - -@@ -153,7 +153,7 @@ ngmultidec_SOURCES = ngmultidec.c - ngmultidec_LDADD = maths/sparse/libsparse.a misc/libmisc.a +-SOURCES = $(makeidx_SOURCES) $(nghelp_SOURCES) $(ngmultidec_SOURCES) $(ngnutmeg_SOURCES) $(ngproc2mod_SOURCES) $(ngsconvert_SOURCES) $(ngspice_SOURCES) ++SOURCES = $(ngmakeidx_SOURCES) $(nghelp_SOURCES) $(ngmultidec_SOURCES) $(ngnutmeg_SOURCES) $(ngproc2mod_SOURCES) $(ngsconvert_SOURCES) $(ngspice_SOURCES) + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ +@@ -40,7 +40,7 @@ POST_UNINSTALL = : + host_triplet = @host@ + bin_PROGRAMS = ngspice$(EXEEXT) ngnutmeg$(EXEEXT) nghelp$(EXEEXT) \ + ngsconvert$(EXEEXT) ngproc2mod$(EXEEXT) ngmultidec$(EXEEXT) \ +- makeidx$(EXEEXT) ++ ngmakeidx$(EXEEXT) + subdir = src + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/spinit.in ChangeLog +@@ -54,9 +54,9 @@ CONFIG_CLEAN_FILES = spinit + am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(helpdatadir)" "$(DESTDIR)$(initdatadir)" + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(bin_PROGRAMS) +-am_makeidx_OBJECTS = makeidx.$(OBJEXT) +-makeidx_OBJECTS = $(am_makeidx_OBJECTS) +-makeidx_LDADD = $(LDADD) ++am_ngmakeidx_OBJECTS = makeidx.$(OBJEXT) ++ngmakeidx_OBJECTS = $(am_ngmakeidx_OBJECTS) ++ngmakeidx_LDADD = $(LDADD) + am_nghelp_OBJECTS = nghelp.$(OBJEXT) + nghelp_OBJECTS = $(am_nghelp_OBJECTS) + nghelp_DEPENDENCIES = frontend/help/libhlp.a \ +@@ -130,7 +130,7 @@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(t + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/conf.Po ./$(DEPDIR)/main.Po \ +-@AMDEP_TRUE@ ./$(DEPDIR)/makeidx.Po ./$(DEPDIR)/nghelp.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/ngmakeidx.Po ./$(DEPDIR)/nghelp.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/ngmultidec.Po ./$(DEPDIR)/ngnutmeg.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/ngproc2mod.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/ngsconvert.Po ./$(DEPDIR)/ngspice.Po +@@ -142,10 +142,10 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $( + CCLD = $(CC) + LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-SOURCES = $(makeidx_SOURCES) $(nghelp_SOURCES) $(ngmultidec_SOURCES) \ ++SOURCES = $(ngmakeidx_SOURCES) $(nghelp_SOURCES) $(ngmultidec_SOURCES) \ + $(ngnutmeg_SOURCES) $(ngproc2mod_SOURCES) \ + $(ngsconvert_SOURCES) $(ngspice_SOURCES) +-DIST_SOURCES = $(makeidx_SOURCES) $(nghelp_SOURCES) \ ++DIST_SOURCES = $(ngmakeidx_SOURCES) $(nghelp_SOURCES) \ + $(ngmultidec_SOURCES) $(ngnutmeg_SOURCES) \ + $(ngproc2mod_SOURCES) $(ngsconvert_SOURCES) $(ngspice_SOURCES) + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ +@@ -416,7 +416,7 @@ ngmultidec_LDADD = \ + maths/sparse/libsparse.a \ + misc/libmisc.a -makeidx_SOURCES = makeidx.c +ngmakeidx_SOURCES = makeidx.c - INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/spicelib/devices @X_CFLAGS@ - -@@ -165,7 +165,7 @@ CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = spinit - bin_PROGRAMS = ngspice$(EXEEXT) ngnutmeg$(EXEEXT) nghelp$(EXEEXT) \ - ngsconvert$(EXEEXT) ngproc2mod$(EXEEXT) ngmultidec$(EXEEXT) \ --makeidx$(EXEEXT) -+ngmakeidx$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - - -@@ -233,10 +233,10 @@ ngproc2mod_LDFLAGS = - ngmultidec_OBJECTS = ngmultidec.$(OBJEXT) - ngmultidec_DEPENDENCIES = maths/sparse/libsparse.a misc/libmisc.a - ngmultidec_LDFLAGS = --makeidx_OBJECTS = makeidx.$(OBJEXT) --makeidx_LDADD = $(LDADD) --makeidx_DEPENDENCIES = --makeidx_LDFLAGS = -+ngmakeidx_OBJECTS = makeidx.$(OBJEXT) -+ngmakeidx_LDADD = $(LDADD) -+ngmakeidx_DEPENDENCIES = -+ngmakeidx_LDFLAGS = - CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -254,8 +254,8 @@ GZIP_ENV = --best - DEP_FILES = .deps/conf.P .deps/main.P .deps/makeidx.P .deps/nghelp.P \ - .deps/ngmultidec.P .deps/ngnutmeg.P .deps/ngproc2mod.P \ - .deps/ngsconvert.P .deps/ngspice.P --SOURCES = $(ngspice_SOURCES) $(ngnutmeg_SOURCES) $(nghelp_SOURCES) $(ngsconvert_SOURCES) $(ngproc2mod_SOURCES) $(ngmultidec_SOURCES) $(makeidx_SOURCES) --OBJECTS = $(ngspice_OBJECTS) $(ngnutmeg_OBJECTS) $(nghelp_OBJECTS) $(ngsconvert_OBJECTS) $(ngproc2mod_OBJECTS) $(ngmultidec_OBJECTS) $(makeidx_OBJECTS) -+SOURCES = $(ngspice_SOURCES) $(ngnutmeg_SOURCES) $(nghelp_SOURCES) $(ngsconvert_SOURCES) $(ngproc2mod_SOURCES) $(ngmultidec_SOURCES) $(ngmakeidx_SOURCES) -+OBJECTS = $(ngspice_OBJECTS) $(ngnutmeg_OBJECTS) $(nghelp_OBJECTS) $(ngsconvert_OBJECTS) $(ngproc2mod_OBJECTS) $(ngmultidec_OBJECTS) $(ngmakeidx_OBJECTS) - - all: all-redirect - .SUFFIXES: -@@ -357,9 +357,9 @@ ngmultidec$(EXEEXT): $(ngmultidec_OBJECT - @rm -f ngmultidec$(EXEEXT) - $(LINK) $(ngmultidec_LDFLAGS) $(ngmultidec_OBJECTS) $(ngmultidec_LDADD) $(LIBS) - --makeidx$(EXEEXT): $(makeidx_OBJECTS) $(makeidx_DEPENDENCIES) + MAINTAINERCLEANFILES = Makefile.in + all: all-recursive +@@ -482,9 +482,9 @@ clean-binPROGRAMS: + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +-makeidx$(EXEEXT): $(makeidx_OBJECTS) $(makeidx_DEPENDENCIES) - @rm -f makeidx$(EXEEXT) - $(LINK) $(makeidx_LDFLAGS) $(makeidx_OBJECTS) $(makeidx_LDADD) $(LIBS) -+ngmakeidx$(EXEEXT): $(ngmakeidx_OBJECTS) $(ngmakeidx_DEPENDENCIES) ++ngmakeidx$(EXEEXT): $(ngmakeidx_OBJECTS) $(ngmakeidx_DEPENDENCIES) + @rm -f ngmakeidx$(EXEEXT) + $(LINK) $(ngmakeidx_LDFLAGS) $(ngmakeidx_OBJECTS) $(ngmakeidx_LDADD) $(LIBS) + nghelp$(EXEEXT): $(nghelp_OBJECTS) $(nghelp_DEPENDENCIES) + @rm -f nghelp$(EXEEXT) + $(LINK) $(nghelp_LDFLAGS) $(nghelp_OBJECTS) $(nghelp_LDADD) $(LIBS) +@@ -512,7 +512,7 @@ distclean-compile: - install-helpdataDATA: $(helpdata_DATA) - @$(NORMAL_INSTALL) -@@ -644,8 +644,8 @@ winmain.o: winmain.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conf.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makeidx.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ngmakeidx.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nghelp.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ngmultidec.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ngnutmeg.Po@am__quote@ +@@ -858,8 +858,8 @@ winmain.o: winmain.c spice.o: main.c $(COMPILE) -DSIMULATOR -o spice.o -c $(srcdir)/main.c @@ -76,6 +94,6 @@ $NetBSD: patch-ac,v 1.3 2004/12/02 00:06:40 dmcmahill Exp $ - ./makeidx $(srcdir)/ngspice.txt +ngspice.idx: ngmakeidx + ./ngmakeidx $(srcdir)/ngspice.txt - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/cad/ng-spice/patches/patch-ad b/cad/ng-spice/patches/patch-ad index 01a536020f7..f09480e5ff1 100644 --- a/cad/ng-spice/patches/patch-ad +++ b/cad/ng-spice/patches/patch-ad @@ -1,13 +1,13 @@ -$NetBSD: patch-ad,v 1.4 2004/12/02 00:06:40 dmcmahill Exp $ +$NetBSD: patch-ad,v 1.5 2004/12/02 13:33:32 dmcmahill Exp $ ---- configure.in.orig Wed Jan 28 00:07:29 2004 +--- configure.in.orig Sun Aug 15 08:51:13 2004 +++ configure.in -@@ -160,7 +160,7 @@ fi +@@ -161,7 +161,7 @@ fi if test "$enable_debug" = "no"; then AC_MSG_WARN(Removing debugging option!) - CFLAGS=" " -+ CFLAGS="`echo $CFLAGS | sed 's;-g;;g'`" ++ CFLAGS="`echo $CFLAGS | sed 's;-g;;g'` " fi diff --git a/cad/ng-spice/patches/patch-ae b/cad/ng-spice/patches/patch-ae index 526688f47aa..ac6817eb0b9 100644 --- a/cad/ng-spice/patches/patch-ae +++ b/cad/ng-spice/patches/patch-ae @@ -1,13 +1,13 @@ -$NetBSD: patch-ae,v 1.4 2004/12/02 00:06:40 dmcmahill Exp $ +$NetBSD: patch-ae,v 1.5 2004/12/02 13:33:32 dmcmahill Exp $ ---- configure.orig Wed Jan 28 00:25:53 2004 +--- configure.orig Mon Sep 6 09:49:40 2004 +++ configure -@@ -2986,7 +2986,7 @@ fi +@@ -3295,7 +3295,7 @@ fi 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="`echo $CFLAGS | sed 's;-g;;g'`" ++ CFLAGS="`echo $CFLAGS | sed 's;-g;;g'` " fi diff --git a/cad/ng-spice/patches/patch-af b/cad/ng-spice/patches/patch-af index e8643ff2ec5..614219a93fa 100644 --- a/cad/ng-spice/patches/patch-af +++ b/cad/ng-spice/patches/patch-af @@ -1,17 +1,19 @@ -$NetBSD: patch-af,v 1.1 2004/12/02 00:06:40 dmcmahill Exp $ +$NetBSD: patch-af,v 1.2 2004/12/02 13:33:32 dmcmahill Exp $ --- doc/ngspice.texi.orig Sun Nov 2 14:16:21 2003 +++ doc/ngspice.texi -@@ -6,6 +6,13 @@ +@@ -6,6 +6,15 @@ @c %**end of header @ifinfo ++@format +INFO-DIR-SECTION Simulation +START-INFO-DIR-ENTRY +* Ngspice: (ngspice). General-purpose circuit simulation program for + nonlinear dc, nonlinear transient, and linear + ac analyses +END-INFO-DIR-ENTRY ++@end format + This file documents NGSPICE. |