From owner-svn-ports-head@freebsd.org Sat Oct 27 02:23:28 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7D51910D2D19; Sat, 27 Oct 2018 02:23:28 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2594576ED1; Sat, 27 Oct 2018 02:23:28 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 04A801CCB; Sat, 27 Oct 2018 02:23:28 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9R2NRXY061205; Sat, 27 Oct 2018 02:23:27 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9R2NRqv061201; Sat, 27 Oct 2018 02:23:27 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201810270223.w9R2NRqv061201@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sat, 27 Oct 2018 02:23:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483098 - in head/cad/gnucap: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/cad/gnucap: . files X-SVN-Commit-Revision: 483098 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Oct 2018 02:23:28 -0000 Author: swills Date: Sat Oct 27 02:23:26 2018 New Revision: 483098 URL: https://svnweb.freebsd.org/changeset/ports/483098 Log: cad/gnucap: Update to 2013-04-23 PR: 232464 Submitted by: Nathan Added: head/cad/gnucap/files/patch-lib_c__attach.cc (contents, props changed) Modified: head/cad/gnucap/Makefile (contents, props changed) head/cad/gnucap/distinfo (contents, props changed) head/cad/gnucap/files/patch-modelgen__mg_.h (contents, props changed) Modified: head/cad/gnucap/Makefile ============================================================================== --- head/cad/gnucap/Makefile Sat Oct 27 02:10:22 2018 (r483097) +++ head/cad/gnucap/Makefile Sat Oct 27 02:23:26 2018 (r483098) @@ -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} -PORTDOCS= * -PORTEXAMPLES= * +MAKE_ARGS= CCFLAGS="${CXXFLAGS}" CCC=c++ +CXXFLAGS+= -fPIC -I${PREFIX}/include -I${WRKSRC}/include +ALL_TARGET= gnucap + 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 -READLINE_USES= readline -READLINE_CONFIGURE_OFF= --with-readline=no +PORTDOCS= README +EXAMPLES= runl *c *.ckt *.doc +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(strchr(str2, '|')):" \ - ${WRKSRC}/${i} -.endfor + ${FIND} -s ${WRKSRC} -name 'configure'|${XARGS} \ + ${REINPLACE_CMD} -e 's|g++|${CXX}|g' -post-install: - ${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${MANPREFIX}/man/man1 +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 Modified: head/cad/gnucap/distinfo ============================================================================== --- head/cad/gnucap/distinfo Sat Oct 27 02:10:22 2018 (r483097) +++ head/cad/gnucap/distinfo Sat Oct 27 02:23:26 2018 (r483098) @@ -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 Added: head/cad/gnucap/files/patch-lib_c__attach.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/gnucap/files/patch-lib_c__attach.cc Sat Oct 27 02:23:26 2018 (r483098) @@ -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 attach_list; ++std::map attach_list; + /*--------------------------------------------------------------------------*/ + class CMD_ATTACH : public CMD { + public: Modified: head/cad/gnucap/files/patch-modelgen__mg_.h ============================================================================== --- head/cad/gnucap/files/patch-modelgen__mg_.h Sat Oct 27 02:10:22 2018 (r483097) +++ head/cad/gnucap/files/patch-modelgen__mg_.h Sat Oct 27 02:23:26 2018 (r483098) @@ -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 - {