- Update to 2007.02.21.

5 files changed, 70 insertions, 40 deletions

diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile
index e36b651349e5..94b103c9396e 100644
--- a/cad/gnucap/Makefile
+++ b/cad/gnucap/Makefile
@@ -7,13 +7,13 @@
 #
 
 PORTNAME=	gnucap
-PORTVERSION=	2006.07.08
+PORTVERSION=	2007.02.21
 CATEGORIES=	cad
 MASTER_SITES=	http://www.gnucap.org/devel/ \
 		http://www.geda.seul.org/dist/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/g}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	The Gnu Circuit Analysis Package
 
 USE_GMAKE=	yes
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc/${PORTNAME} \
 
 OPTIONS=	READLINE "Enable commandline features via readline" on
 
-MAN1=		gnucap.1
+MAN1=		gnucap.1 gnucap-ibis.1
 
 .include <bsd.port.pre.mk>
 
diff --git a/cad/gnucap/distinfo b/cad/gnucap/distinfo
index 922c398160b7..169c155b6fca 100644
--- a/cad/gnucap/distinfo
+++ b/cad/gnucap/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnucap-2006-07-08.tar.gz) = d34fc4919ce8e949dc43d52b781753e5
-SHA256 (gnucap-2006-07-08.tar.gz) = 311562626876459cc265dcc09ac0673384454c0fbee8e4839c888991b0578094
-SIZE (gnucap-2006-07-08.tar.gz) = 1546670
+MD5 (gnucap-2007-02-21.tar.gz) = 6c9f3f3e2d23e98c588f8d25d9c4c96a
+SHA256 (gnucap-2007-02-21.tar.gz) = 6e75616a892d64c531b6e97096b5327358ab77937a4aaee4de8c5a0a58353d4d
+SIZE (gnucap-2007-02-21.tar.gz) = 1024218
diff --git a/cad/gnucap/files/patch-doc_Makefile.in b/cad/gnucap/files/patch-doc_Makefile.in
index 5d04545161a5..fd97c9b1a1e4 100644
--- a/cad/gnucap/files/patch-doc_Makefile.in
+++ b/cad/gnucap/files/patch-doc_Makefile.in
@@ -1,12 +1,10 @@
---- doc/Makefile.in.orig	Tue Jun 27 07:23:23 2006
-+++ doc/Makefile.in	Tue Jul 25 15:24:30 2006
-@@ -153,8 +153,8 @@
- sharedstatedir = @sharedstatedir@
+--- doc/Makefile.in.orig	Mon Mar 12 23:25:19 2007
++++ doc/Makefile.in	Mon Mar 12 23:25:38 2007
+@@ -152,7 +152,7 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
--dist_man_MANS = gnucap.1 gnucap-ibis.1
+ dist_man_MANS = gnucap.1 gnucap-ibis.1
 -pkgdocsdir = ${pkgdatadir}/doc
-+dist_man_MANS = gnucap.1
 +pkgdocsdir = @docdir@
  dist_pkgdocs_DATA = \
  	acs-tutorial COPYING history INSTALL relnotes.029 \
diff --git a/cad/gnucap/files/patch-man_Makefile.in b/cad/gnucap/files/patch-man_Makefile.in
index 63408d94a1c7..d6ac435ce204 100644
--- a/cad/gnucap/files/patch-man_Makefile.in
+++ b/cad/gnucap/files/patch-man_Makefile.in
@@ -1,30 +1,18 @@
---- man/Makefile.in.orig	Wed Jun 28 12:29:13 2006
-+++ man/Makefile.in	Tue Jul 25 19:29:12 2006
-@@ -152,8 +152,8 @@
- sharedstatedir = @sharedstatedir@
+--- man/Makefile.in.orig	Wed Feb 21 09:13:11 2007
++++ man/Makefile.in	Mon Mar 12 23:21:33 2007
+@@ -158,7 +158,7 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
+ SUBDIRS = ${TEXDIRS}
 -pkgmanualdir = ${pkgdatadir}/manual
--dist_pkgmanual_DATA = gnucap-man.pdf gnucap-man.dvi
 +pkgmanualdir = @docdir@/manual
-+dist_pkgmanual_DATA = gnucap-man.pdf
- EXTRA_DIST = ${TEXSRCS} README
+ dist_pkgmanual_DATA = gnucap-man.pdf
+ EXTRA_DIST = ${TEXSRCS} Makefile.template configure.old gnucap-man.pdf
  TEXSRCS = \
- 	addmodel.tex behavior.tex circuit.tex commands.tex copying.tex \
-@@ -165,7 +165,7 @@
- 	gnucap-man.toc
+@@ -504,53 +504,6 @@
+ 	uninstall uninstall-am uninstall-dist_pkgmanualDATA \
+ 	uninstall-info-am
  
- MAINTAINERCLEANFILES = \
--	gnucap-man.dvi gnucap-man.pdf
-+	gnucap-man.pdf
- 
- TEXDIRS = Addmodel Behavior Circuit Commands Tech
- TEXFILES = ${TEXSRCS} $(foreach __tmp__,$(TEXDIRS),$(wildcard \
-@@ -342,14 +342,6 @@
- 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- 	pdf-am ps ps-am uninstall uninstall-am \
- 	uninstall-dist_pkgmanualDATA uninstall-info-am
--
 -
 -gnucap-man.pdf: gnucap-man.dvi
 -@MISSING_DVIPDFM_TRUE@	@echo "WARNING:  dvipdfm was not found on your system but"
@@ -32,6 +20,46 @@
 -@MISSING_DVIPDFM_TRUE@	@echo "          rebuilt.  Changes to gnucap-man.dvi"
 -@MISSING_DVIPDFM_TRUE@	@echo "          will be ignored."
 -@MISSING_DVIPDFM_FALSE@	${DVIPDFM} gnucap-man
- 
- # run it twice to fix the toc.
- gnucap-man.dvi: $(TEXFILES)
+-
+-# run it twice to fix the toc.
+-gnucap-man.dvi: $(TEXFILES)
+-@MISSING_LATEX_TRUE@	@echo "WARNING:  latex was not found on your system but"
+-@MISSING_LATEX_TRUE@	@echo "          $@ is out of date and needs to be"
+-@MISSING_LATEX_TRUE@	@echo "          rebuilt from the LaTeX .tex files. Changes to"
+-@MISSING_LATEX_TRUE@	@echo "          the .tex files will be ignored."
+-@MISSING_LATEX_FALSE@	touch gnucap-man.ind
+-@MISSING_LATEX_FALSE@	env TEXINPUTS=$(srcdir): ${LATEX} -interaction=nonstopmode \
+-@MISSING_LATEX_FALSE@		$(srcdir)/gnucap-man |grep -v hyperref |grep .
+-@MISSING_LATEX_FALSE@	${MAKEINDEX} gnucap-man
+-@MISSING_LATEX_FALSE@	env TEXINPUTS=$(srcdir): ${LATEX} -interaction=nonstopmode \
+-@MISSING_LATEX_FALSE@		$(srcdir)/gnucap-man |grep -v hyperref |grep .
+-
+-# html version of the manual
+-html/index.html: $(TEXFILES)
+-@MISSING_HEVEA_TRUE@	@echo "WARNING:  Either hevea or hacha was not found on your system but"
+-@MISSING_HEVEA_TRUE@	@echo "          $@ is out of date and needs to be"
+-@MISSING_HEVEA_TRUE@	@echo "          rebuilt from the LaTeX .tex files. Changes to"
+-@MISSING_HEVEA_TRUE@	@echo "          the .tex files will be ignored."
+-@MISSING_HEVEA_FALSE@	-mkdir html
+-@MISSING_HEVEA_FALSE@	${HEVEA} -fix -o html/gnucap-man $(srcdir)/gnucap-man.tex
+-@MISSING_HEVEA_FALSE@	cd html; ${HACHA} -nolinks gnucap-man; rm -f gnucap-man *.haux *.htoc
+-
+-# info version of the manual
+-info/gnucap-man.info: $(TEXFILES)
+-@MISSING_HEVEA_TRUE@	@echo "WARNING:  Either hevea or hacha was not found on your system but"
+-@MISSING_HEVEA_TRUE@	@echo "          $@ is out of date and needs to be"
+-@MISSING_HEVEA_TRUE@	@echo "          rebuilt from the LaTeX .tex files. Changes to"
+-@MISSING_HEVEA_TRUE@	@echo "          the .tex files will be ignored."
+-@MISSING_HEVEA_FALSE@	-mkdir info
+-@MISSING_HEVEA_FALSE@	${HEVEA} -fix -info -o $@ $(srcdir)/gnucap-man.tex
+-
+-# plain text
+-gnucap-man.txt:  $(TEXFILES)
+-@MISSING_HEVEA_TRUE@	@echo "WARNING:  Either hevea or hacha was not found on your system but"
+-@MISSING_HEVEA_TRUE@	@echo "          $@ is out of date and needs to be"
+-@MISSING_HEVEA_TRUE@	@echo "          rebuilt from the LaTeX .tex files. Changes to"
+-@MISSING_HEVEA_TRUE@	@echo "          the .tex files will be ignored."
+-@MISSING_HEVEA_FALSE@	${HEVEA} -fix -text -o $@ $(srcdir)/gnucap-man.tex
+ # 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/gnucap/pkg-plist b/cad/gnucap/pkg-plist
index cf44a4df522d..c172a36d5815 100644
--- a/cad/gnucap/pkg-plist
+++ b/cad/gnucap/pkg-plist
@@ -12,7 +12,6 @@ bin/gnucap-modelgen
 %%DOCSDIR%%/relnotes.033
 %%DOCSDIR%%/relnotes.034
 %%DOCSDIR%%/whatisit
-%%EXAMPLESDIR%%/README
 %%EXAMPLESDIR%%/eq.doc
 %%EXAMPLESDIR%%/eq2-145.ckt
 %%EXAMPLESDIR%%/eq2-289.ckt
@@ -24,12 +23,17 @@ bin/gnucap-modelgen
 %%EXAMPLESDIR%%/eq4-9217.ckt
 %%EXAMPLESDIR%%/eq4-9217.tran-slow.ckt
 %%EXAMPLESDIR%%/eq4-9217.tran.ckt
+%%EXAMPLESDIR%%/eq5-.ac.ckt
 %%EXAMPLESDIR%%/eq5-.tran.ckt
+%%EXAMPLESDIR%%/eq5-.tran.euler.fast.ckt
 %%EXAMPLESDIR%%/eq5-.tran.fast.ckt
 %%EXAMPLESDIR%%/eq5-.tran.like-spice.ckt
 %%EXAMPLESDIR%%/eq5-.tran.slow.ckt
 %%EXAMPLESDIR%%/eq5-.tran.vfast.ckt
 %%EXAMPLESDIR%%/eq5-.tran.vvfast.ckt
+%%EXAMPLESDIR%%/eq5-.tran.vvvfast.ckt
+%%EXAMPLESDIR%%/eq6-.tran.vvvfast.ckt
+%%EXAMPLESDIR%%/eq7-.tran.vvvfast.ckt
 %%EXAMPLESDIR%%/eqboost.ckt
 %%EXAMPLESDIR%%/eqflat.ckt
 %%EXAMPLESDIR%%/eqmodify.ckt
@@ -49,6 +53,6 @@ bin/gnucap-modelgen
 %%EXAMPLESDIR%%/runall
 %%EXAMPLESDIR%%/runall.out
 %%EXAMPLESDIR%%/sc18.ckt
-@dirrmtry %%EXAMPLESDIR%%
-@dirrmtry %%DOCSDIR%%/manual
-@dirrmtry %%DOCSDIR%%
+@dirrm %%EXAMPLESDIR%%
+@dirrm %%DOCSDIR%%/manual
+@dirrm %%DOCSDIR%%