Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Jun 2018 21:19:42 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r473078 - in head/games/wop: . files
Message-ID:  <201806222119.w5MLJgkn001775@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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<T>::getSubdirConf( Settin
  }
  
  /**********************************************************/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806222119.w5MLJgkn001775>