6 files changed, 13 insertions, 81 deletions

diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile
index 41f8ed2cc095..884f1714abc8 100644
--- a/cad/gnucap/Makefile
+++ b/cad/gnucap/Makefile
@@ -7,14 +7,13 @@
 #
 
 PORTNAME=	gnucap
-PORTVERSION=	2007.03.29
+PORTVERSION=	2008.06.08
 CATEGORIES=	cad
-MASTER_SITES=	http://www.gnucap.org/devel/ \
-		http://www.geda.seul.org/dist/
+MASTER_SITES=	http://www.gnucap.org/devel/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/g}
 
 MAINTAINER=	stas@FreeBSD.org
-COMMENT=	The Gnu Circuit Analysis Package
+COMMENT=	The GNU Circuit Analysis Package
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/cad/gnucap/distinfo b/cad/gnucap/distinfo
index 0a36b7ee5789..4031a2c5977d 100644
--- a/cad/gnucap/distinfo
+++ b/cad/gnucap/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnucap-2007-03-29.tar.gz) = 3c937b5ddcdc0bee01ec215c81e116c7
-SHA256 (gnucap-2007-03-29.tar.gz) = 426ccb7203d056ea7bfc2eade3182323f1301507a2beb46c0bf70da6ec3353e9
-SIZE (gnucap-2007-03-29.tar.gz) = 1031800
+MD5 (gnucap-2008-06-08.tar.gz) = 346ef3cf7bddd3a90ac6df3277c0d394
+SHA256 (gnucap-2008-06-08.tar.gz) = dc6cb7b554f8fc74b317722d455df937eb9ec0b439b04b205d0c14e50679a2e0
+SIZE (gnucap-2008-06-08.tar.gz) = 532362
diff --git a/cad/gnucap/files/patch-examples_Makefile.in b/cad/gnucap/files/patch-examples_Makefile.in
index f2570c87a489..87d9df489f30 100644
--- a/cad/gnucap/files/patch-examples_Makefile.in
+++ b/cad/gnucap/files/patch-examples_Makefile.in
@@ -1,11 +1,11 @@
---- examples/Makefile.in.orig	Tue Jul 25 15:11:22 2006
-+++ examples/Makefile.in	Tue Jul 25 15:14:07 2006
-@@ -150,7 +150,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
+--- examples/Makefile.in.orig	2008-06-09 01:37:52.000000000 +0400
++++ examples/Makefile.in	2008-06-18 23:43:30.000000000 +0400
+@@ -135,7 +135,7 @@
  target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 -pkgexamplesdir = ${pkgdatadir}/examples
 +pkgexamplesdir = ${prefix}/share/examples/@PACKAGE@
  dist_pkgexamples_DATA = ${EXFILES}
  EXFILES = \
- 	eq2-145.ckt eq2-289.ckt eq2-577.ckt eq3-1153.ckt eq4-2305.ckt \
+ eq.doc eq2-145.ckt eq2-289.ckt eq2-577.ckt eq3-1153.ckt eq4-2305.ckt \
diff --git a/cad/gnucap/files/patch-man_Makefile.in b/cad/gnucap/files/patch-man_Makefile.in
deleted file mode 100644
index d6ac435ce204..000000000000
--- a/cad/gnucap/files/patch-man_Makefile.in
+++ /dev/null
@@ -1,65 +0,0 @@
---- 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
-+pkgmanualdir = @docdir@/manual
- dist_pkgmanual_DATA = gnucap-man.pdf
- EXTRA_DIST = ${TEXSRCS} Makefile.template configure.old gnucap-man.pdf
- TEXSRCS = \
-@@ -504,53 +504,6 @@
- 	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"
--@MISSING_DVIPDFM_TRUE@	@echo "          $@ is out of date and needs to be"
--@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)
--@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-descr b/cad/gnucap/pkg-descr
index 1106d9c1f275..fae85f6f907d 100644
--- a/cad/gnucap/pkg-descr
+++ b/cad/gnucap/pkg-descr
@@ -1,4 +1,4 @@
-GnuCap is the Gnu Circuit Analysis Package.
+GnuCap is the GNU Circuit Analysis Package.
 
 The primary component is a general purpose circuit simulator. It performs
 nonlinear dc and transient analyses, fourier analysis, and ac analysis. It is
diff --git a/cad/gnucap/pkg-plist b/cad/gnucap/pkg-plist
index c172a36d5815..c1f82ac9003f 100644
--- a/cad/gnucap/pkg-plist
+++ b/cad/gnucap/pkg-plist
@@ -4,7 +4,6 @@ bin/gnucap-modelgen
 %%DOCSDIR%%/INSTALL
 %%DOCSDIR%%/acs-tutorial
 %%DOCSDIR%%/history
-%%DOCSDIR%%/manual/gnucap-man.pdf
 %%DOCSDIR%%/relnotes.029
 %%DOCSDIR%%/relnotes.030
 %%DOCSDIR%%/relnotes.031
@@ -54,5 +53,4 @@ bin/gnucap-modelgen
 %%EXAMPLESDIR%%/runall.out
 %%EXAMPLESDIR%%/sc18.ckt
 @dirrm %%EXAMPLESDIR%%
-@dirrm %%DOCSDIR%%/manual
 @dirrm %%DOCSDIR%%