4 files changed, 52 insertions, 44 deletions

diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile
index a04a33f8e691..193308040202 100644
--- a/cad/gnucap/Makefile
+++ b/cad/gnucap/Makefile
@@ -2,55 +2,51 @@
 # $FreeBSD$
 
 PORTNAME=	gnucap
-DISTVERSION=	2009-12-07
-PORTREVISION=	1
+DISTVERSION=	2013-04-23
 CATEGORIES=	cad
 MASTER_SITES=	http://www.gnucap.org/devel/ \
 		http://www.gnucap.org/devel/archive/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The GNU Circuit Analysis Package
+COMMENT=	GNU Circuit Analysis Package
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-OPTIONS_DEFINE=	READLINE DOCS EXAMPLES
-OPTIONS_DEFAULT=READLINE
-READLINE_DESC=	Enable readline support
+BROKEN_mips=	defined in discarded section
+BROKEN_mips64=	defined in discarded section
 
 USES=		gmake
+USE_LDCONFIG=	yes
+
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	prefix=${STAGEDIR}${PREFIX}
+
+MAKE_ARGS=	CCFLAGS="${CXXFLAGS}" CCC=c++
+CXXFLAGS+=	-fPIC -I${PREFIX}/include -I${WRKSRC}/include
+ALL_TARGET=	gnucap
 
-PORTDOCS=	*
-PORTEXAMPLES=	*
 PLIST_FILES=	bin/gnucap bin/gnucap-modelgen \
-		man/man1/gnucap-ibis.1.gz man/man1/gnucap.1.gz
+		lib/libgnucap-default-plugins.so \
+		lib/libgnucap.so
+
+PORTDOCS=	README
+EXAMPLES=	runl *c *.ckt *.doc
 
-READLINE_USES=		readline
-READLINE_CONFIGURE_OFF=	--with-readline=no
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		'/^SUBDIRS/s|doc examples||' ${WRKSRC}/Makefile.in
-.for i in src/ap_match.cc modelgen/ap_match.cc
-	@${REINPLACE_CMD} -e \
-		"s:strchr(str2, '|'):const_cast<char*>(strchr(str2, '|')):" \
-		${WRKSRC}/${i}
-.endfor
-
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${FIND} -s ${WRKSRC} -name 'configure'|${XARGS} \
+		${REINPLACE_CMD} -e 's|g++|${CXX}|g'
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/main/O/gnucap ${WRKSRC}/modelgen/O/gnucap-modelgen \
+		${STAGEDIR}${PREFIX}/bin
+	${INSTALL_LIB} ${WRKSRC}/lib/O/libgnucap.so ${WRKSRC}/apps/O/*.so \
+		${STAGEDIR}${PREFIX}/lib
+
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/acs-tutorial ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/history ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/relnotes.* ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/whatisit ${STAGEDIR}${DOCSDIR}
-post-install-EXAMPLES-on:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/README ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/runall ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/*.c ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/*.ckt ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/*.doc ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/cad/gnucap/distinfo b/cad/gnucap/distinfo
index 7d8957dbe48f..dd73993687a2 100644
--- a/cad/gnucap/distinfo
+++ b/cad/gnucap/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnucap-2009-12-07.tar.gz) = f6cd8fc0e0636a1aaa50def5a3db2a667b4fff3cb7a34fa0710753082e74e65e
-SIZE (gnucap-2009-12-07.tar.gz) = 545578
+TIMESTAMP = 1539947960
+SHA256 (gnucap-2013-04-23.tar.gz) = 814fe06dbd185a39bb5bd9a34c978fd204f9838c4a556de0e357c758088aba82
+SIZE (gnucap-2013-04-23.tar.gz) = 377694
diff --git a/cad/gnucap/files/patch-lib_c__attach.cc b/cad/gnucap/files/patch-lib_c__attach.cc
new file mode 100644
index 000000000000..f0ca7f06e091
--- /dev/null
+++ b/cad/gnucap/files/patch-lib_c__attach.cc
@@ -0,0 +1,11 @@
+--- lib/c_attach.cc.orig	2018-10-19 21:02:54 UTC
++++ lib/c_attach.cc
+@@ -27,7 +27,7 @@
+ /*--------------------------------------------------------------------------*/
+ namespace {
+ /*--------------------------------------------------------------------------*/
+-std::map<const std::string, void*> attach_list;
++std::map<std::string, void*> attach_list;
+ /*--------------------------------------------------------------------------*/
+ class CMD_ATTACH : public CMD {
+ public:
diff --git a/cad/gnucap/files/patch-modelgen__mg_.h b/cad/gnucap/files/patch-modelgen__mg_.h
index a104d4865040..61b5e1c8b406 100644
--- a/cad/gnucap/files/patch-modelgen__mg_.h
+++ b/cad/gnucap/files/patch-modelgen__mg_.h
@@ -1,6 +1,6 @@
---- modelgen/mg_.h.orig	2009-12-08 08:19:15.000000000 +0900
-+++ modelgen/mg_.h	2012-10-14 00:54:09.000000000 +0900
-@@ -108,6 +108,20 @@
+--- modelgen/mg_.h.orig	2013-04-24 03:24:21 UTC
++++ modelgen/mg_.h
+@@ -108,6 +108,20 @@ class List_Base (public)
    size_t	 size()const	 {return _list.size();}
  };
  /*--------------------------------------------------------------------------*/
@@ -21,10 +21,12 @@
  /* A "Collection" differs from a "List" in how it is parsed.
   * Each parse of a "Collection" created one more object and stores
   * it in the Collection.  The size of the Collection therefore grows by 1.
-@@ -200,20 +214,6 @@
+@@ -198,20 +212,6 @@ class Collection (public)
+       f << (**i);
+     }
    }
- };
- /*--------------------------------------------------------------------------*/
+-};
+-/*--------------------------------------------------------------------------*/
 -class C_Comment
 -  :public Base
 -{
@@ -37,8 +39,6 @@
 -{
 -public:
 -  void parse(CS& f);
--};
--/*--------------------------------------------------------------------------*/
+ };
+ /*--------------------------------------------------------------------------*/
  class Key
-   :public Base
- {