2 files changed, 6 insertions, 71 deletions

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: