From owner-svn-ports-all@freebsd.org Mon May 14 23:28:49 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 3A57AE7FD54; Mon, 14 May 2018 23:28:49 +0000 (UTC) (envelope-from stephen@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 D82AD6EE75; Mon, 14 May 2018 23:28:48 +0000 (UTC) (envelope-from stephen@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 B1C0522DF4; Mon, 14 May 2018 23:28:48 +0000 (UTC) (envelope-from stephen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4ENSmKx036755; Mon, 14 May 2018 23:28:48 GMT (envelope-from stephen@FreeBSD.org) Received: (from stephen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4ENSmkk036753; Mon, 14 May 2018 23:28:48 GMT (envelope-from stephen@FreeBSD.org) Message-Id: <201805142328.w4ENSmkk036753@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: stephen set sender to stephen@FreeBSD.org using -f From: Stephen Montgomery-Smith Date: Mon, 14 May 2018 23:28:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469981 - in head/math/octave-forge-fuzzy-logic-toolkit: . files X-SVN-Group: ports-head X-SVN-Commit-Author: stephen X-SVN-Commit-Paths: in head/math/octave-forge-fuzzy-logic-toolkit: . files X-SVN-Commit-Revision: 469981 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 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: Mon, 14 May 2018 23:28:49 -0000 Author: stephen Date: Mon May 14 23:28:48 2018 New Revision: 469981 URL: https://svnweb.freebsd.org/changeset/ports/469981 Log: - Add patch to unbreak. - Bump portrevision (because of update of octave to 4.4.0). Obtained from: https://sourceforge.net/p/octave/fuzzy-logic-toolkit/ci/default/tree/ Added: head/math/octave-forge-fuzzy-logic-toolkit/files/ head/math/octave-forge-fuzzy-logic-toolkit/files/patch-inst_defuzz.m (contents, props changed) Modified: head/math/octave-forge-fuzzy-logic-toolkit/Makefile Modified: head/math/octave-forge-fuzzy-logic-toolkit/Makefile ============================================================================== --- head/math/octave-forge-fuzzy-logic-toolkit/Makefile Mon May 14 22:11:02 2018 (r469980) +++ head/math/octave-forge-fuzzy-logic-toolkit/Makefile Mon May 14 23:28:48 2018 (r469981) @@ -3,7 +3,7 @@ PORTNAME= octave-forge-fuzzy-logic-toolkit PORTVERSION= 0.4.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org @@ -12,11 +12,11 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME} LICENSE= GPLv3 LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING -BROKEN= parse error when installing with octave 4.4.0 - # OCTSRC is the name of the directory of the package. # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. OCTSRC= ${OCTAVE_PKGNAME} + +WRKSRC= ${WRKDIR}/${OCTSRC} # Only required so that patch will apply. .include "${.CURDIR}/../../Mk/bsd.octave.mk" Added: head/math/octave-forge-fuzzy-logic-toolkit/files/patch-inst_defuzz.m ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/octave-forge-fuzzy-logic-toolkit/files/patch-inst_defuzz.m Mon May 14 23:28:48 2018 (r469981) @@ -0,0 +1,62 @@ +--- inst/defuzz.m.orig 2014-07-02 00:11:06 UTC ++++ inst/defuzz.m +@@ -1,4 +1,4 @@ +-## Copyright (C) 2011-2014 L. Markowsky ++## Copyright (C) 2011-2018 L. Markowsky + ## + ## This file is part of the fuzzy-logic-toolkit. + ## +@@ -162,7 +162,16 @@ endfunction + function crisp_x = mom (x, y) + + max_y = max (y); +- y_val = @(y_val) if (y_val == max_y) 1 else 0 endif; ++ ++ function y_val = calc_yval(y_val) ++ if (y_val == max_y) ++ y_val = 1; ++ else ++ y_val = 0; ++ endif ++ endfunction ++ ++ y_val = @(y_val) calc_yval(y_val); + max_y_locations = arrayfun (y_val, y); + crisp_x = sum (x .* max_y_locations) / sum (max_y_locations); + +@@ -185,7 +194,16 @@ endfunction + function crisp_x = som (x, y) + + max_y = max (y); +- y_val = @(y_val) if (y_val == max_y) 1 else (NaN) endif; ++ ++ function y_val = calc_yval(y_val) ++ if (y_val == max_y) ++ y_val = 1; ++ else ++ y_val = (NaN); ++ endif ++ endfunction ++ ++ y_val = @(y_val) calc_yval(y_val); + max_y_locations = arrayfun (y_val, y); + crisp_x = min (x .* max_y_locations); + +@@ -207,7 +225,16 @@ endfunction + function crisp_x = lom (x, y) + + max_y = max (y); +- y_val = @(y_val) if (y_val == max_y) 1 else (NaN) endif; ++ ++ function y_val = calc_yval(y_val) ++ if (y_val == max_y) ++ y_val = 1; ++ else ++ y_val = (NaN); ++ endif ++ endfunction ++ ++ y_val = @(y_val) calc_yval(y_val); + max_y_locations = arrayfun (y_val, y); + crisp_x = max (x .* max_y_locations); +