From owner-svn-ports-head@FreeBSD.ORG Mon Aug 11 13:34:40 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B34A3CC2 for ; Mon, 11 Aug 2014 13:34:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9415F2862 for ; Mon, 11 Aug 2014 13:34:40 +0000 (UTC) Received: from wg (uid 1317) (envelope-from wg@FreeBSD.org) id 2daf by svn.freebsd.org (DragonFly Mail Agent v0.9+); Mon, 11 Aug 2014 13:34:40 +0000 From: William Grzybowski Date: Mon, 11 Aug 2014 13:34:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364607 - in head/games/glest: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e8c670.2daf.7357d8e4@svn.freebsd.org> X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 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: Mon, 11 Aug 2014 13:34:40 -0000 Author: wg Date: Mon Aug 11 13:34:39 2014 New Revision: 364607 URL: http://svnweb.freebsd.org/changeset/ports/364607 QAT: https://qat.redports.org/buildarchive/r364607/ Log: games/glest: support stage [1] - Use options sub - Remove useless pre/post include - Finish to convert to options ng PR: 192565 Submitted by: christian.mangin gmail com [1] Added: head/games/glest/files/patch-source-shared_lib-include-graphics-math_util.h (contents, props changed) Modified: head/games/glest/Makefile head/games/glest/pkg-plist Modified: head/games/glest/Makefile ============================================================================== --- head/games/glest/Makefile Mon Aug 11 13:34:05 2014 (r364606) +++ head/games/glest/Makefile Mon Aug 11 13:34:39 2014 (r364607) @@ -29,23 +29,19 @@ SUB_FILES= glest-wrapper pkg-message JAM_CMD= ${LOCALBASE}/bin/jam -qa -OPTIONS_DEFINE= EDITOR +OPTIONS_DEFINE= DOCS EDITOR +OPTIONS_SUB= yes EDITOR_DESC= Build map editor EXTRACT_AFTER_ARGS= -d ${WRKDIR}/${DISTNAME} -NO_STAGE= yes .include -.include .if ${PORT_OPTIONS:MEDITOR} USE_WX= 2.6+ WX_CONF_ARGS= relative WANT_UNICODE= yes -PLIST_SUB+= EDITOR="" HAVE_EDITOR= true -.else -PLIST_SUB+= EDITOR="@comment " .endif pre-extract: @@ -70,20 +66,15 @@ do-build: @cd ${WRKSRC} && ${JAM_CMD} do-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/code_license.txt ${DOCSDIR}/code_license.txt -.endif - @${MKDIR} ${DATADIR} - ${INSTALL_PROGRAM} ${WRKSRC}/glest ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/mk/linux/glest.ini ${DATADIR} - ${INSTALL_SCRIPT} ${WRKDIR}/glest-wrapper ${PREFIX}/bin/${PORTNAME} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/code_license.txt ${STAGEDIR}${DOCSDIR}/code_license.txt + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/glest ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/mk/linux/glest.ini ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKDIR}/glest-wrapper ${STAGEDIR}${PREFIX}/bin/${PORTNAME} -.if defined(HAVE_EDITOR) - ${INSTALL_PROGRAM} ${WRKSRC}/glest_editor ${PREFIX}/bin/ +.if ${PORT_OPTIONS:MEDITOR} + ${INSTALL_PROGRAM} ${WRKSRC}/glest_editor ${STAGEDIR}${PREFIX}/bin/ .endif -post-install: - @${CAT} ${PKGMESSAGE} - -.include +.include Added: head/games/glest/files/patch-source-shared_lib-include-graphics-math_util.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/glest/files/patch-source-shared_lib-include-graphics-math_util.h Mon Aug 11 13:34:39 2014 (r364607) @@ -0,0 +1,19 @@ +--- ./source/shared_lib/include/graphics/math_util.h.bak 2014-08-10 15:21:32.000000000 -0400 ++++ ./source/shared_lib/include/graphics/math_util.h 2014-08-10 15:23:08.000000000 -0400 +@@ -23,6 +23,16 @@ + const float zero= 1e-6f; + const float infinity= 1e6f; + ++template ++inline T max(const T& a, const T& b) { ++ return (b > a) ? b : a; ++} ++ ++template ++inline T min(const T& a, const T& b) { ++ return (b < a) ? b : a; ++} ++ + // ===================================================== + // class Rect + // ===================================================== Modified: head/games/glest/pkg-plist ============================================================================== --- head/games/glest/pkg-plist Mon Aug 11 13:34:05 2014 (r364606) +++ head/games/glest/pkg-plist Mon Aug 11 13:34:39 2014 (r364607) @@ -3,5 +3,3 @@ bin/glest %%DATADIR%%/glest %%DATADIR%%/glest.ini %%PORTDOCS%%%%DOCSDIR%%/code_license.txt -%%PORTDOCS%%@dirrmtry %%DOCSDIR%% -@dirrmtry %%DATADIR%%