From owner-svn-ports-all@freebsd.org Tue Jun 19 15:43:02 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 638E510222E3; Tue, 19 Jun 2018 15:43:02 +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 14EDA87468; Tue, 19 Jun 2018 15:43:02 +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 EA61C158ED; Tue, 19 Jun 2018 15:43:01 +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 w5JFh1LV057876; Tue, 19 Jun 2018 15:43:01 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5JFh10R057874; Tue, 19 Jun 2018 15:43:01 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201806191543.w5JFh10R057874@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Tue, 19 Jun 2018 15:43:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472799 - in head/games/frogatto: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/games/frogatto: . files X-SVN-Commit-Revision: 472799 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: Tue, 19 Jun 2018 15:43:02 -0000 Author: swills Date: Tue Jun 19 15:43:01 2018 New Revision: 472799 URL: https://svnweb.freebsd.org/changeset/ports/472799 Log: games/frogatto: Fix line endings on patch Submitted by: Green Dog (via private email) Modified: head/games/frogatto/Makefile (contents, props changed) head/games/frogatto/files/patch-src-surface_cache.cpp (contents, props changed) Modified: head/games/frogatto/Makefile ============================================================================== --- head/games/frogatto/Makefile Tue Jun 19 15:42:54 2018 (r472798) +++ head/games/frogatto/Makefile Tue Jun 19 15:43:01 2018 (r472799) @@ -22,11 +22,12 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ USE_GITHUB= yes GH_ACCOUNT= frogatto -USES= gmake pkgconfig +USES= gmake pkgconfig dos2unix ALL_TARGET= game server USE_GL= glew glu USE_SDL= sdl image mixer ttf USE_CXXSTD= c++11 +DOS2UNIX_FILES= src/surface_cache.cpp PLIST_FILES= bin/${PORTNAME} bin/${PORTNAME}-server Modified: head/games/frogatto/files/patch-src-surface_cache.cpp ============================================================================== --- head/games/frogatto/files/patch-src-surface_cache.cpp Tue Jun 19 15:42:54 2018 (r472798) +++ head/games/frogatto/files/patch-src-surface_cache.cpp Tue Jun 19 15:43:01 2018 (r472799) @@ -1,11 +1,11 @@ --- src/surface_cache.cpp.orig 2018-06-16 13:59:29.319430000 +0300 +++ src/surface_cache.cpp 2018-06-16 14:00:09.140102000 +0300 @@ -116,7 +116,7 @@ - } - #endif // ANDROID - //std::cerr << "loading image '" << fname << "'\n"; -- if(surf.get() == false || surf->w == 0) { -+ if(surf.get() == nullptr || surf->w == 0) { - if(key != "") { - std::cerr << "failed to load image '" << key << "'\n"; - } + } + #endif // ANDROID + //std::cerr << "loading image '" << fname << "'\n"; +- if(surf.get() == false || surf->w == 0) { ++ if(surf.get() == nullptr || surf->w == 0) { + if(key != "") { + std::cerr << "failed to load image '" << key << "'\n"; + }