From owner-svn-ports-all@freebsd.org Fri Jun 22 21:19:43 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 843F41027D7C; Fri, 22 Jun 2018 21:19:43 +0000 (UTC) (envelope-from amdmi3@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 3055982CDB; Fri, 22 Jun 2018 21:19:43 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EB0CB2613A; Fri, 22 Jun 2018 21:19:42 +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 w5MLJgti001777; Fri, 22 Jun 2018 21:19:42 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5MLJgkn001775; Fri, 22 Jun 2018 21:19:42 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201806222119.w5MLJgkn001775@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 22 Jun 2018 21:19:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473078 - in head/games/wop: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/games/wop: . files X-SVN-Commit-Revision: 473078 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: Fri, 22 Jun 2018 21:19:43 -0000 Author: amdmi3 Date: Fri Jun 22 21:19:42 2018 New Revision: 473078 URL: https://svnweb.freebsd.org/changeset/ports/473078 Log: - Fix build with clang 6 - Cosmetic fixes - Regenerate patches Modified: head/games/wop/Makefile head/games/wop/files/patch-src-serverlistwindow.cpp head/games/wop/files/patch-src-spriteset.cpp Modified: head/games/wop/Makefile ============================================================================== --- head/games/wop/Makefile Fri Jun 22 21:16:06 2018 (r473077) +++ head/games/wop/Makefile Fri Jun 22 21:19:42 2018 (r473078) @@ -21,6 +21,10 @@ BUILD_DEPENDS= makedepend:devel/makedepend USES= tar:bzip2 gmake USE_SDL= sdl net mixer ttf image +MAKE_JOBS_UNSAFE= yes + +CXXFLAGS+= -Wno-c++11-narrowing + DATAVERSION= 2005-12-21 DESKTOP_ENTRIES="Worms of Prey" \ "Real-time Worms game" \ @@ -46,12 +50,12 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/wop ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/woprc ${STAGEDIR}${PREFIX}/etc/woprc.sample - ${MKDIR} ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} cd ${WRKDIR}/${PORTNAME}data-${DATAVERSION} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ do-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} -.for f in AUTHORS COPYING ChangeLog README README-COMMAND-LINE-OPTIONS.txt + @${MKDIR} ${STAGEDIR}${DOCSDIR} +.for f in AUTHORS ChangeLog README README-COMMAND-LINE-OPTIONS.txt ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ .endfor Modified: head/games/wop/files/patch-src-serverlistwindow.cpp ============================================================================== --- head/games/wop/files/patch-src-serverlistwindow.cpp Fri Jun 22 21:16:06 2018 (r473077) +++ head/games/wop/files/patch-src-serverlistwindow.cpp Fri Jun 22 21:19:42 2018 (r473078) @@ -1,6 +1,6 @@ ---- src/serverlistwindow.cpp.orig 2005-07-17 21:27:31.000000000 +0400 -+++ src/serverlistwindow.cpp 2013-05-30 22:08:15.521112163 +0400 -@@ -94,7 +94,6 @@ +--- src/serverlistwindow.cpp.orig 2005-07-17 17:27:31 UTC ++++ src/serverlistwindow.cpp +@@ -94,7 +94,6 @@ ServerListWindow::ServerListWindow( Uint } ServerListWindow::~ServerListWindow() { Modified: head/games/wop/files/patch-src-spriteset.cpp ============================================================================== --- head/games/wop/files/patch-src-spriteset.cpp Fri Jun 22 21:16:06 2018 (r473077) +++ head/games/wop/files/patch-src-spriteset.cpp Fri Jun 22 21:19:42 2018 (r473078) @@ -1,6 +1,6 @@ ---- src/spriteset.cpp.orig 2006-03-27 14:27:53.000000000 +0400 -+++ src/spriteset.cpp 2013-09-12 04:56:04.339229318 +0400 -@@ -618,3 +618,5 @@ +--- src/spriteset.cpp.orig 2006-03-27 10:27:53 UTC ++++ src/spriteset.cpp +@@ -618,3 +618,5 @@ void SpriteSet::getSubdirConf( Settin } /**********************************************************/