Date: Sat, 31 Dec 2022 03:25:47 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 6489b1187732 - main - Approved by: portmgr Message-ID: <202212310325.2BV3PljZ094443@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=6489b11877323eedf51bd2d2613cc077b91004b7 commit 6489b11877323eedf51bd2d2613cc077b91004b7 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2022-12-31 03:24:14 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2022-12-31 03:24:14 +0000 Approved by: portmgr --- games/glest/Makefile | 29 +++++++++++----------- ...-source-shared_lib-include-graphics-math_util.h | 6 ++--- games/glest/files/patch-xerces-c3 | 8 +++--- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/games/glest/Makefile b/games/glest/Makefile index d5182cc6aae2..619ba4af7c60 100644 --- a/games/glest/Makefile +++ b/games/glest/Makefile @@ -10,37 +10,38 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Free 3D real-time customizable strategy game WWW= https://www.glest.org/ +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/docs/code_license.txt + +BUILD_DEPENDS= jam:devel/jam LIB_DEPENDS= libxerces-c.so:textproc/xerces-c3 \ libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg -BUILD_DEPENDS= jam:devel/jam RUN_DEPENDS= ${LOCALBASE}/${DATADIR_REL}/servers.ini:games/glest-data USES= autoreconf:build compiler:c++11-lang dos2unix gl localbase \ lua:51 openal:al,alut pkgconfig sdl xorg zip -USE_SDL= sdl USE_GL= gl glu +USE_SDL= sdl USE_XORG= x11 + GNU_CONFIGURE= yes CONFIGURE_SCRIPT= mk/linux/configure + LDFLAGS_i386= -Wl,-znotext -SUB_FILES= glest-wrapper pkg-message -JAM_CMD= ${LOCALBASE}/bin/jam -q -a -dx +EXTRACT_AFTER_ARGS= -d ${WRKDIR}/${DISTNAME} +SUB_FILES= glest-wrapper pkg-message OPTIONS_DEFINE= DOCS EDITOR OPTIONS_SUB= yes -EDITOR_DESC= Build map editor -EXTRACT_AFTER_ARGS= -d ${WRKDIR}/${DISTNAME} +EDITOR_DESC= Build map editor -.include <bsd.port.options.mk> +EDITOR_USE= WX=3.0+ +EDITOR_VARS= WX_CONF_ARGS=relative,HAVE_EDITOR=true -.if ${PORT_OPTIONS:MEDITOR} -USE_WX= 2.6+ -WX_CONF_ARGS= relative -HAVE_EDITOR= true -.endif +JAM_CMD= ${LOCALBASE}/bin/jam -q -a -dx pre-extract: @${MKDIR} ${WRKDIR}/${DISTNAME} @@ -53,8 +54,8 @@ post-patch: -e 's|-llua5.1|-llua-5.1|g' \ ${WRKSRC}/mk/linux/configure.ac \ ${WRKSRC}/mk/linux/mk/autoconf/* - @${FIND} ${WRKDIR} -type f -name '*.bak' -o -name '*.orig' | \ - ${XARGS} ${RM} + #@${FIND} ${WRKDIR} -type f -name '*.bak' -o -name '*.orig' | \ + # ${XARGS} ${RM} pre-configure: @(cd ${WRKSRC}/mk/linux && ${SH} autogen.sh && \ diff --git a/games/glest/files/patch-source-shared_lib-include-graphics-math_util.h b/games/glest/files/patch-source-shared_lib-include-graphics-math_util.h index 24e6656e88ea..0bebf4582f6e 100644 --- a/games/glest/files/patch-source-shared_lib-include-graphics-math_util.h +++ b/games/glest/files/patch-source-shared_lib-include-graphics-math_util.h @@ -1,6 +1,6 @@ ---- ./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 @@ +--- source/shared_lib/include/graphics/math_util.h.orig 2022-12-31 03:15:04 UTC ++++ source/shared_lib/include/graphics/math_util.h +@@ -23,6 +23,16 @@ const float sqrt2= 1.41421356f; const float zero= 1e-6f; const float infinity= 1e6f; diff --git a/games/glest/files/patch-xerces-c3 b/games/glest/files/patch-xerces-c3 index 2d4562e85376..be78d9eef7aa 100644 --- a/games/glest/files/patch-xerces-c3 +++ b/games/glest/files/patch-xerces-c3 @@ -1,6 +1,6 @@ ---- source/shared_lib/sources/xml/xml_parser.cpp.orig 2014-02-24 15:26:00.412992000 +0100 -+++ source/shared_lib/sources/xml/xml_parser.cpp 2014-02-24 15:28:23.623987237 +0100 -@@ -87,10 +87,17 @@ +--- source/shared_lib/sources/xml/xml_parser.cpp.orig 2022-12-31 03:15:04 UTC ++++ source/shared_lib/sources/xml/xml_parser.cpp +@@ -87,10 +87,17 @@ XmlNode *XmlIo::load(const string &path){ try{ ErrorHandler errorHandler; @@ -22,7 +22,7 @@ DOMDocument *document= parser->parseURI(path.c_str()); if(document==NULL){ -@@ -119,9 +126,20 @@ +@@ -119,9 +126,20 @@ void XmlIo::save(const string &path, const XmlNode *no } LocalFileFormatTarget file(path.c_str());
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212310325.2BV3PljZ094443>