- Update to version 2009.12.07

PR:		162852
Submitted by:	Ports Fury
Feature safe:	yes

7 files changed, 32 insertions, 113 deletions

diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile
index 07c029f5d88a..4f1f133abed6 100644
--- a/cad/gnucap/Makefile
+++ b/cad/gnucap/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gnucap
-PORTVERSION=	2008.06.08
-PORTREVISION=	1
+PORTVERSION=	2009.12.07
 CATEGORIES=	cad
 MASTER_SITES=	http://www.gnucap.org/devel/ \
 		http://www.gnucap.org/devel/archive/
@@ -17,18 +16,38 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/g}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The GNU Circuit Analysis Package
 
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc/${PORTNAME}
-
-OPTIONS=	READLINE "Enable commandline features via readline" on
+MAKE_JOBS_SAFE=	yes
 
 MAN1=		gnucap.1 gnucap-ibis.1
-
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_READLINE) || exists(${LOCALBASE}/lib/libreadline.so.6)
-LIB_DEPENDS+=	readline.6:${PORTSDIR}/devel/readline
+PORTDOCS=	*
+PORTEXAMPLES=	*
+PLIST_FILES=	bin/gnucap bin/gnucap-modelgen
+
+post-patch:
+	${REINPLACE_CMD} -e \
+		'/^SUBDIRS/s|doc examples||' ${WRKSRC}/Makefile.in
+
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${MANPREFIX}/man/man1
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/acs-tutorial ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/history ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/relnotes.* ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/whatisit ${DOCSDIR}
+.endif
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/README ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/runall ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/*.c ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/*.ckt ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/*.doc ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/cad/gnucap/distinfo b/cad/gnucap/distinfo
index 37739e14fef9..7d8957dbe48f 100644
--- a/cad/gnucap/distinfo
+++ b/cad/gnucap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnucap-2008-06-08.tar.gz) = dc6cb7b554f8fc74b317722d455df937eb9ec0b439b04b205d0c14e50679a2e0
-SIZE (gnucap-2008-06-08.tar.gz) = 532362
+SHA256 (gnucap-2009-12-07.tar.gz) = f6cd8fc0e0636a1aaa50def5a3db2a667b4fff3cb7a34fa0710753082e74e65e
+SIZE (gnucap-2009-12-07.tar.gz) = 545578
diff --git a/cad/gnucap/files/patch-doc_Makefile.in b/cad/gnucap/files/patch-doc_Makefile.in
deleted file mode 100644
index fd97c9b1a1e4..000000000000
--- a/cad/gnucap/files/patch-doc_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
--pkgdocsdir = ${pkgdatadir}/doc
-+pkgdocsdir = @docdir@
- dist_pkgdocs_DATA = \
- 	acs-tutorial COPYING history INSTALL relnotes.029 \
- 	relnotes.030 relnotes.031 relnotes.032 relnotes.033 relnotes.034 whatisit 
diff --git a/cad/gnucap/files/patch-examples_Makefile.in b/cad/gnucap/files/patch-examples_Makefile.in
deleted file mode 100644
index 87d9df489f30..000000000000
--- a/cad/gnucap/files/patch-examples_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 = \
- eq.doc eq2-145.ckt eq2-289.ckt eq2-577.ckt eq3-1153.ckt eq4-2305.ckt \
diff --git a/cad/gnucap/files/patch-modelgen_md.h b/cad/gnucap/files/patch-modelgen_md.h
deleted file mode 100644
index 262fc96079ab..000000000000
--- a/cad/gnucap/files/patch-modelgen_md.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- modelgen/md.h.orig	Tue Jul 25 19:24:12 2006
-+++ modelgen/md.h	Tue Jul 25 19:24:17 2006
-@@ -32,7 +32,7 @@
- #include <cfloat>
- #include <cmath>
- #include <climits>
--#include <limits>
-+#include <limits.h>
- #include <cstdio>
- #include <cerrno>
- #include <csetjmp>
diff --git a/cad/gnucap/files/patch-src_md.h b/cad/gnucap/files/patch-src_md.h
deleted file mode 100644
index 33b293fe9a44..000000000000
--- a/cad/gnucap/files/patch-src_md.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/md.h.orig	Tue Jul 25 19:24:01 2006
-+++ src/md.h	Tue Jul 25 19:24:07 2006
-@@ -32,7 +32,7 @@
- #include <cfloat>
- #include <cmath>
- #include <climits>
--#include <limits>
-+#include <limits.h>
- #include <cstdio>
- #include <cerrno>
- #include <csetjmp>
diff --git a/cad/gnucap/pkg-plist b/cad/gnucap/pkg-plist
deleted file mode 100644
index c1f82ac9003f..000000000000
--- a/cad/gnucap/pkg-plist
+++ /dev/null
@@ -1,56 +0,0 @@
-bin/gnucap
-bin/gnucap-modelgen
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/acs-tutorial
-%%DOCSDIR%%/history
-%%DOCSDIR%%/relnotes.029
-%%DOCSDIR%%/relnotes.030
-%%DOCSDIR%%/relnotes.031
-%%DOCSDIR%%/relnotes.032
-%%DOCSDIR%%/relnotes.033
-%%DOCSDIR%%/relnotes.034
-%%DOCSDIR%%/whatisit
-%%EXAMPLESDIR%%/eq.doc
-%%EXAMPLESDIR%%/eq2-145.ckt
-%%EXAMPLESDIR%%/eq2-289.ckt
-%%EXAMPLESDIR%%/eq2-577.ckt
-%%EXAMPLESDIR%%/eq3-1153.ckt
-%%EXAMPLESDIR%%/eq4-2305.ckt
-%%EXAMPLESDIR%%/eq4-4609.ckt
-%%EXAMPLESDIR%%/eq4-6913.ckt
-%%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
-%%EXAMPLESDIR%%/killzap.ckt
-%%EXAMPLESDIR%%/killzap.doc
-%%EXAMPLESDIR%%/nmos.doc
-%%EXAMPLESDIR%%/nmos100.ckt
-%%EXAMPLESDIR%%/nmos15.ckt
-%%EXAMPLESDIR%%/nmos18.ckt
-%%EXAMPLESDIR%%/nmos30.ckt
-%%EXAMPLESDIR%%/nmosgen.c
-%%EXAMPLESDIR%%/nmp100.ckt
-%%EXAMPLESDIR%%/nmpgen.c
-%%EXAMPLESDIR%%/opamp-ol.ckt
-%%EXAMPLESDIR%%/opamp-vf.ckt
-%%EXAMPLESDIR%%/opamp.doc
-%%EXAMPLESDIR%%/runall
-%%EXAMPLESDIR%%/runall.out
-%%EXAMPLESDIR%%/sc18.ckt
-@dirrm %%EXAMPLESDIR%%
-@dirrm %%DOCSDIR%%