From owner-svn-ports-head@freebsd.org Thu Jan 12 11:28:50 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 81BF9CAC0A6; Thu, 12 Jan 2017 11:28:50 +0000 (UTC) (envelope-from amdmi3@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 mx1.freebsd.org (Postfix) with ESMTPS id 4380118DE; Thu, 12 Jan 2017 11:28:50 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0CBSnn7025018; Thu, 12 Jan 2017 11:28:49 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0CBSnBW025016; Thu, 12 Jan 2017 11:28:49 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201701121128.v0CBSnBW025016@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 12 Jan 2017 11:28:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431248 - in head/lang/maude: . files X-SVN-Group: ports-head 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.23 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: Thu, 12 Jan 2017 11:28:50 -0000 Author: amdmi3 Date: Thu Jan 12 11:28:49 2017 New Revision: 431248 URL: https://svnweb.freebsd.org/changeset/ports/431248 Log: - Remove always-true/false conditions after FreeBSD 9, 10.1, 10.2 EOL - Switch to options helpers Approved by: portmgr blanket Added: head/lang/maude/files/patch-Mixfix-lexerAux - copied unchanged from r431247, head/lang/maude/files/extra-patch-Mixfix-lexerAux Deleted: head/lang/maude/files/extra-patch-Mixfix-lexerAux Modified: head/lang/maude/Makefile Modified: head/lang/maude/Makefile ============================================================================== --- head/lang/maude/Makefile Thu Jan 12 11:18:29 2017 (r431247) +++ head/lang/maude/Makefile Thu Jan 12 11:28:49 2017 (r431248) @@ -39,10 +39,6 @@ BROKEN_aarch64= Fails to link: missing .include -.if ${OPSYS} == "DragonFly" || ${OSVERSION} >= 1000000 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Mixfix-lexerAux -.endif - .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 @@ -56,10 +52,8 @@ PLIST_SUB+= FULL_MAUDE_VER="${FULL_MAUDE PLIST_SUB+= FULL_MAUDE="@comment " .endif -post-extract: -.if ${PORT_OPTIONS:MFULL_MAUDE} +post-extract-FULL_MAUDE-on: ${UNZIP_CMD} ${DISTDIR}/${FULL_MAUDE_DIST} ${FULL_MAUDE} -d ${WRKDIR} -.endif post-patch: @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' \ @@ -67,11 +61,11 @@ post-patch: @${REINPLACE_CMD} -e 's|-lcurses|-lncurses|g' \ ${WRKSRC}/configure.ac -post-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.if ${PORT_OPTIONS:MFULL_MAUDE} + +post-install-FULL_MAUDE-on: ${INSTALL_DATA} ${WRKDIR}/${FULL_MAUDE} ${STAGEDIR}${DATADIR} -.endif .include Copied: head/lang/maude/files/patch-Mixfix-lexerAux (from r431247, head/lang/maude/files/extra-patch-Mixfix-lexerAux) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/maude/files/patch-Mixfix-lexerAux Thu Jan 12 11:28:49 2017 (r431248, copy of r431247, head/lang/maude/files/extra-patch-Mixfix-lexerAux) @@ -0,0 +1,22 @@ +--- ./src/Mixfix/lexerAux.cc.orig 2014-09-03 02:54:57.000000000 +0200 ++++ ./src/Mixfix/lexerAux.cc 2014-09-03 02:55:40.000000000 +0200 +@@ -35,7 +35,7 @@ + bool fakeNewlineStack[MAX_IN_DEPTH]; + + void +-getInput(char* buf, int& result, int max_size) ++getInput(char* buf, size_t& result, size_t max_size) + { + result = YY_NULL; + if (UserLevelRewritingContext::interrupted()) +--- ./src/Mixfix/lexerAux.hh.orig 2014-09-03 02:56:33.000000000 +0200 ++++ ./src/Mixfix/lexerAux.hh 2014-09-03 02:57:05.000000000 +0200 +@@ -27,7 +27,7 @@ + //extern int inStackPtr; + //extern YY_BUFFER_STATE inStack[]; + +-void getInput(char* buf, int& result, int max_size); ++void getInput(char* buf, size_t& result, size_t max_size); + void lexerIdMode(); + void lexerTokenTreeMode(int terminatingTokens); + void lexerCmdMode();