From owner-svn-ports-head@freebsd.org Wed Jun 27 14:49:00 2018 Return-Path: Delivered-To: svn-ports-head@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 08DB91027EA7; Wed, 27 Jun 2018 14:49:00 +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 A21B081504; Wed, 27 Jun 2018 14:48:59 +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 7D96E24788; Wed, 27 Jun 2018 14:48:59 +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 w5REmxYA005565; Wed, 27 Jun 2018 14:48:59 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5REmxG7005563; Wed, 27 Jun 2018 14:48:59 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201806271448.w5REmxG7005563@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 27 Jun 2018 14:48:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473445 - in head/games/openlierox: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/games/openlierox: . files X-SVN-Commit-Revision: 473445 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.26 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: Wed, 27 Jun 2018 14:49:00 -0000 Author: amdmi3 Date: Wed Jun 27 14:48:58 2018 New Revision: 473445 URL: https://svnweb.freebsd.org/changeset/ports/473445 Log: - Switch to USES=localbase - Tweak depends - Switch to options helpers - Fix build with clang 6 Added: head/games/openlierox/files/patch-src_common_sex.cpp (contents, props changed) Modified: head/games/openlierox/Makefile Modified: head/games/openlierox/Makefile ============================================================================== --- head/games/openlierox/Makefile Wed Jun 27 14:46:54 2018 (r473444) +++ head/games/openlierox/Makefile Wed Jun 27 14:48:58 2018 (r473445) @@ -12,17 +12,14 @@ DISTNAME= OpenLieroX_${DISTVERSION}.src MAINTAINER= amdmi3@FreeBSD.org COMMENT= Extremely addictive realtime worms shoot-em-up -LIB_DEPENDS= libgd.so:graphics/gd \ - libboost_signals.so:devel/boost-libs \ +LIB_DEPENDS= libboost_signals.so:devel/boost-libs \ libcurl.so:ftp/curl -USES= tar:bzip2 cmake openal:al,alut pkgconfig +USES= tar:bzip2 cmake localbase pkgconfig USE_SDL= sdl image USE_GNOME= libxml2 -CFLAGS+= -I${LOCALBASE}/include -CXXFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +CXXFLAGS+= -Wno-c++11-narrowing CMAKE_ARGS= -DHAWKNL_BUILTIN=YES \ -DLIBZIP_BUILTIN=YES \ @@ -43,17 +40,12 @@ PLIST_FILES= bin/openlierox \ share/pixmaps/OpenLieroX.svg OPTIONS_DEFINE= DEDICATED_ONLY DOCS -DEDICATED_ONLY_DESC=Build dedicated server only -.include +DEDICATED_ONLY_DESC= Build dedicated server only +DEDICATED_ONLY_CMAKE_BOOL= DEDICATED_ONLY +DEDICATED_ONLY_USE_OFF= XORG=x11 SDL=mixer +DEDICATED_ONLY_LIB_DEPENDS_OFF= libgd.so:graphics/gd -.if ${PORT_OPTIONS:MDEDICATED_ONLY} -CMAKE_ARGS+= -DDEDICATED_ONLY=YES -.else -USE_XORG+= x11 -USE_SDL+= mixer -.endif - post-patch: @${REINPLACE_CMD} -e 's|EXEC_PROGRAM.*OLXVER)|SET(OLXVER "${DISTVERSION}")|; \ s|/usr/local|${LOCALBASE}|' ${WRKSRC}/CMakeOlxCommon.cmake @@ -69,7 +61,9 @@ do-install: ${STAGEDIR}${PREFIX}/share/applications/ ${INSTALL_DATA} ${WRKSRC}/share/OpenLieroX.svg \ ${STAGEDIR}${PREFIX}/share/pixmaps/ - cd ${WRKSRC}/share/gamedir && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ - cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/ + @cd ${WRKSRC}/share/gamedir && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ + +do-install-DOCS-on: + @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/ .include Added: head/games/openlierox/files/patch-src_common_sex.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/openlierox/files/patch-src_common_sex.cpp Wed Jun 27 14:48:58 2018 (r473445) @@ -0,0 +1,11 @@ +--- src/common/sex.cpp.orig 2018-06-25 13:54:25 UTC ++++ src/common/sex.cpp +@@ -242,7 +242,7 @@ static Table list[] = { + {his, SZ(his)}, {dongadj, SZ(dongadj)}, + {dong, SZ(dong)}, {intoher, SZ(intoher)}, + {twatadj, SZ(twatadj)}, {twat, SZ(twat)}, +- {(const char **)NULL, (short)NULL}, ++ {(const char **)NULL, 0}, + }; + + std::string sex(short wraplen) {