From owner-svn-ports-head@freebsd.org Tue Sep 22 21:17:34 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C99F53F7478; Tue, 22 Sep 2020 21:17:34 +0000 (UTC) (envelope-from 0mp@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4BwvKB4wgRz4fFv; Tue, 22 Sep 2020 21:17:34 +0000 (UTC) (envelope-from 0mp@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 8D11625B79; Tue, 22 Sep 2020 21:17:34 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08MLHYUP009986; Tue, 22 Sep 2020 21:17:34 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08MLHY1Z009985; Tue, 22 Sep 2020 21:17:34 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202009222117.08MLHY1Z009985@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Tue, 22 Sep 2020 21:17:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549635 - in head/science/crf++: . files X-SVN-Group: ports-head X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: in head/science/crf++: . files X-SVN-Commit-Revision: 549635 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.33 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: Tue, 22 Sep 2020 21:17:34 -0000 Author: 0mp Date: Tue Sep 22 21:17:33 2020 New Revision: 549635 URL: https://svnweb.freebsd.org/changeset/ports/549635 Log: Fix compilation on i386 The error was: In file included from lbfgs.cpp:29: ./common.h:216:18: error: class member cannot be redeclared string_buffer& operator<<(size_t _n) { _UITOA(_n); } ^ ./common.h:214:18: note: previous definition is here string_buffer& operator<<(unsigned int _n) { _UITOA(_n); } ^ Added: head/science/crf++/files/ head/science/crf++/files/patch-common.h (contents, props changed) Modified: head/science/crf++/Makefile Modified: head/science/crf++/Makefile ============================================================================== --- head/science/crf++/Makefile Tue Sep 22 21:08:54 2020 (r549634) +++ head/science/crf++/Makefile Tue Sep 22 21:17:33 2020 (r549635) @@ -5,6 +5,7 @@ PORTNAME= crf++ # 0.59 as defined in # https://github.com/taku910/crfpp/commit/d78526835e4cfcc4822156724edda8a3839327c2 DISTVERSION= 0.59 +PORTREVISION= 1 CATEGORIES= science math PATCH_SITES= https://patch-diff.githubusercontent.com/raw/taku910/crfpp/pull/:pr PATCHFILES= 15.patch:-p1:pr \ Added: head/science/crf++/files/patch-common.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/crf++/files/patch-common.h Tue Sep 22 21:17:33 2020 (r549635) @@ -0,0 +1,11 @@ +--- common.h.orig 2020-09-22 21:00:58 UTC ++++ common.h +@@ -211,7 +211,7 @@ class string_buffer: public std::string { + string_buffer& operator<<(int _n) { _ITOA(_n); } + string_buffer& operator<<(long int _n) { _ITOA(_n); } + string_buffer& operator<<(unsigned short int _n) { _UITOA(_n); } +- string_buffer& operator<<(unsigned int _n) { _UITOA(_n); } ++ // string_buffer& operator<<(unsigned int _n) { _UITOA(_n); } + // string_buffer& operator<<(unsigned long int _n) { _UITOA(_n); } + string_buffer& operator<<(size_t _n) { _UITOA(_n); } + string_buffer& operator<<(char _n) {