svn commit: r364607 - in head/games/glest: . files

[William Grzybowski]

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 <bsd.port.options.mk>
-.include <bsd.port.pre.mk>
 
 .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 <bsd.port.post.mk>
+.include <bsd.port.mk>

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 <typename T>
++inline T max(const T& a, const T& b) {
++   return (b > a) ? b : a;
++}
++
++template <typename T>
++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%%
- at dirrmtry %%DATADIR%%