From owner-svn-ports-all@freebsd.org Wed Dec 12 05:30:26 2018 Return-Path: Delivered-To: svn-ports-all@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 22851132E057; Wed, 12 Dec 2018 05:30:26 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A6A7472D0F; Wed, 12 Dec 2018 05:30:25 +0000 (UTC) (envelope-from lwhsu@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 97A6A3494; Wed, 12 Dec 2018 05:30:25 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBC5UPj3056215; Wed, 12 Dec 2018 05:30:25 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBC5UO1g056210; Wed, 12 Dec 2018 05:30:24 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201812120530.wBC5UO1g056210@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Wed, 12 Dec 2018 05:30:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487278 - in head/lang/maude: . files X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: in head/lang/maude: . files X-SVN-Commit-Revision: 487278 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A6A7472D0F X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-0.66 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.66)[-0.665,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2018 05:30:26 -0000 Author: lwhsu Date: Wed Dec 12 05:30:24 2018 New Revision: 487278 URL: https://svnweb.freebsd.org/changeset/ports/487278 Log: - Update to 2.7.1 - Add CVC4 support option and enabled by default - Unbreak on aarch64, sbrk is not used anymore - Remove build date to make the build reproducible - Pass maintainership to submitter - Pet `portlint -abct` PR: 231443 Submitted by: Greg V Added: head/lang/maude/files/patch-src_Mixfix_banner.cc (contents, props changed) head/lang/maude/files/patch-src_Mixfix_variableGenerator.cc (contents, props changed) Deleted: head/lang/maude/files/patch-Mixfix-lexerAux head/lang/maude/files/patch-src_Core_dagNodeSet.hh head/lang/maude/files/patch-src_Core_termSet.hh head/lang/maude/files/patch-src_Meta_metaMatch.cc head/lang/maude/files/patch-src__BuiltIn__stringOpSymbol.cc head/lang/maude/files/patch-src__Mixfix__bottom.yy head/lang/maude/files/patch-src__Mixfix__commands.yy head/lang/maude/files/patch-src__Mixfix__interact.cc head/lang/maude/files/patch-src__Mixfix__modules.yy head/lang/maude/files/patch-src__Mixfix__token.cc head/lang/maude/files/patch-src__Mixfix__top.yy head/lang/maude/files/patch-src__ObjectSystem__configSymbol.hh head/lang/maude/files/patch-src__ObjectSystem__objectMap.cc head/lang/maude/files/patch-src__ObjectSystem__objectSystemRewritingContext.hh head/lang/maude/files/patch-src__Utility__ropeStuff.hh Modified: head/lang/maude/Makefile head/lang/maude/distinfo head/lang/maude/files/patch-src_ObjectSystem_socketStuff.cc head/lang/maude/pkg-plist Modified: head/lang/maude/Makefile ============================================================================== --- head/lang/maude/Makefile Wed Dec 12 03:42:25 2018 (r487277) +++ head/lang/maude/Makefile Wed Dec 12 05:30:24 2018 (r487278) @@ -2,13 +2,12 @@ # $FreeBSD$ PORTNAME= maude -PORTVERSION= 2.6 -PORTREVISION= 1 +PORTVERSION= 2.7.1 CATEGORIES= lang -MASTER_SITES= http://maude.cs.illinois.edu/versions/${PORTVERSION}/ +MASTER_SITES= http://maude.cs.illinois.edu/w/images/d/d8/ DISTNAME= Maude-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= greg@unrelenting.technology COMMENT= High-performance reflective language LICENSE= GPLv2 @@ -21,28 +20,32 @@ LIB_DEPENDS= libbdd.so:science/buddy \ libsigsegv.so:devel/libsigsegv USES= alias autoreconf bison ncurses + +WRKSRC= ${WRKDIR}/maude-${PORTVERSION} + GNU_CONFIGURE= yes CPPFLAGS+= -I${NCURSESINC} -I${LOCALBASE}/include LDFLAGS+= -L${NCURSESLIB} -L${LOCALBASE}/lib CONFIGURE_ARGS= --datadir=${DATADIR} MAKE_JOBS_UNSAFE= yes -FULL_MAUDE_VER= 26b +OPTIONS_SUB= yes +OPTIONS_DEFINE= DOCS FULL_MAUDE CVC4 +OPTIONS_DEFAULT= FULL_MAUDE CVC4 +FULL_MAUDE_DESC= Install full-maude +CVC4_DESC= Enable SMT support via CVC4 -OPTIONS_DEFINE= DOCS FULL_MAUDE -OPTIONS_DEFAULT= FULL_MAUDE -FULL_MAUDE_DESC= Install full-maude${FULL_MAUDE_VER} +CVC4_LIB_DEPENDS= libcvc4.so:math/cvc4 +CVC4_CONFIGURE_WITH= cvc4 PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README -BROKEN_aarch64= Fails to link: missing sbrk - .include .if ${PORT_OPTIONS:MFULL_MAUDE} -MASTER_SITES+= http://maude.lcc.uma.es/FullMaude/FM${FULL_MAUDE_VER}/:fm -FULL_MAUDE= full-maude${FULL_MAUDE_VER}.maude -FULL_MAUDE_DIST= full-maude.maude.zip +MASTER_SITES+= http://maude.cs.illinois.edu/w/images/c/ca/:fm +FULL_MAUDE= full-maude.maude +FULL_MAUDE_DIST= Full-Maude-${PORTVERSION}.zip DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${FULL_MAUDE_DIST}:fm EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} EXTRACT_DEPENDS+= ${LOCALBASE}/bin/unzip:archivers/unzip Modified: head/lang/maude/distinfo ============================================================================== --- head/lang/maude/distinfo Wed Dec 12 03:42:25 2018 (r487277) +++ head/lang/maude/distinfo Wed Dec 12 05:30:24 2018 (r487278) @@ -1,5 +1,5 @@ -TIMESTAMP = 1478641858 -SHA256 (Maude-2.6.tar.gz) = a5ba79bf3d30565c874e80b3531b51a7e835b600e86cac82508a6eb9e15f4aa0 -SIZE (Maude-2.6.tar.gz) = 1600026 -SHA256 (full-maude.maude.zip) = 57ebfc41056b7afc2be48983f6a1311e817d23eeaaed71023471bc4edaf6b128 -SIZE (full-maude.maude.zip) = 154881 +TIMESTAMP = 1537177216 +SHA256 (Maude-2.7.1.tar.gz) = b1887c7fa75e85a1526467727242f77b5ec7cd6a5dfa4ceb686b6f545bb1534b +SIZE (Maude-2.7.1.tar.gz) = 1853963 +SHA256 (Full-Maude-2.7.1.zip) = 4c3a11b053ea92df4cfe89939a97c6b02c68489b174eb689c844c08decb18f78 +SIZE (Full-Maude-2.7.1.zip) = 156771 Added: head/lang/maude/files/patch-src_Mixfix_banner.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/maude/files/patch-src_Mixfix_banner.cc Wed Dec 12 05:30:24 2018 (r487278) @@ -0,0 +1,13 @@ +Make the build reproducible +--- src/Mixfix/banner.cc.orig 2018-09-17 10:53:25 UTC ++++ src/Mixfix/banner.cc +@@ -53,8 +53,7 @@ printBanner(std::ostream& s) + Tty(Tty::GREEN) << 'e' << + Tty(Tty::RESET) << " ---\n"; + s << "\t\t /||||||||||||||||||\\\n"; +- s << "\t " << PACKAGE_STRING << " built: " << +- __DATE__ << ' ' << __TIME__ << '\n'; ++ s << "\t " << PACKAGE_STRING << " built by FreeBSD ports\n"; + s << "\t Copyright 1997-2016 SRI International\n"; + s << "\t\t " << ctime(&secs); + } Added: head/lang/maude/files/patch-src_Mixfix_variableGenerator.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/maude/files/patch-src_Mixfix_variableGenerator.cc Wed Dec 12 05:30:24 2018 (r487278) @@ -0,0 +1,23 @@ +kind::IFF was removed in CVC4 1.6 +--- src/Mixfix/variableGenerator.cc.orig 2018-09-17 10:44:35 UTC ++++ src/Mixfix/variableGenerator.cc +@@ -312,18 +312,7 @@ VariableGenerator::dagToCVC4(DagNode* dag) + // + case SMT_Symbol::EQUALS: + { +- // +- // Bizarrely CVC4 requires the IFF be used for Boolean equality so we need to +- // check the SMT type associated with our first argument sort to catch this case. +- // +- Sort* domainSort = s->getOpDeclarations()[0].getDomainAndRange()[0]; +- SMT_Info::SMT_Type smtType = smtInfo.getType(domainSort); +- if (smtType == SMT_Info::NOT_SMT) +- { +- IssueWarning("term " << QUOTE(dag) << " does not belong to an SMT sort."); +- goto fail; +- } +- return exprManager->mkExpr(((smtType == SMT_Info::BOOLEAN) ? kind::IFF : kind::EQUAL), exprs[0], exprs[1]); ++ return exprManager->mkExpr(kind::EQUAL, exprs[0], exprs[1]); + } + case SMT_Symbol::NOT_EQUALS: + { Modified: head/lang/maude/files/patch-src_ObjectSystem_socketStuff.cc ============================================================================== --- head/lang/maude/files/patch-src_ObjectSystem_socketStuff.cc Wed Dec 12 03:42:25 2018 (r487277) +++ head/lang/maude/files/patch-src_ObjectSystem_socketStuff.cc Wed Dec 12 05:30:24 2018 (r487278) @@ -1,6 +1,6 @@ ---- src/ObjectSystem/socketStuff.cc.orig 2018-08-27 20:56:09 UTC +--- src/ObjectSystem/socketStuff.cc.orig 2018-09-17 10:38:45 UTC +++ src/ObjectSystem/socketStuff.cc -@@ -219,7 +219,7 @@ SocketManagerSymbol::createServerTcpSocket(FreeDagNode +@@ -230,7 +230,7 @@ SocketManagerSymbol::createServerTcpSocket(FreeDagNode sockName.sin_family = AF_INET; sockName.sin_port = htons(port); sockName.sin_addr.s_addr = htonl(INADDR_ANY); // HACK - what is the portable way to set this? Modified: head/lang/maude/pkg-plist ============================================================================== --- head/lang/maude/pkg-plist Wed Dec 12 03:42:25 2018 (r487277) +++ head/lang/maude/pkg-plist Wed Dec 12 05:30:24 2018 (r487278) @@ -1,9 +1,10 @@ bin/maude -%%FULL_MAUDE%%%%DATADIR%%/full-maude%%FULL_MAUDE_VER%%.maude +%%FULL_MAUDE%%%%DATADIR%%/full-maude.maude %%DATADIR%%/linear.maude %%DATADIR%%/machine-int.maude %%DATADIR%%/metaInterpreter.maude %%DATADIR%%/model-checker.maude %%DATADIR%%/prelude.maude +%%CVC4%%%%DATADIR%%/smt.maude %%DATADIR%%/socket.maude %%DATADIR%%/term-order.maude