From nobody Sat Dec 31 03:25:47 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NkSFR4ldZz2lJDr; Sat, 31 Dec 2022 03:25:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NkSFR4BQvz4QBL; Sat, 31 Dec 2022 03:25:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672457147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TnVJqQyi/ztM957kvbm3k4pCv9swvfdMVUv22yABBZw=; b=GS2To+OfUQH1LyRB3ccszdSF7XgQtXov1KsrxLTk3b9dlOX/1AjWNvPgcKEgJE/U6P9MKC f5kWddunF+oYMXvJUk38wrgm2M2z0qD1o7siJQ3Re792HaVWB9RWGU3D8ZW3yZQIO6pchq CPjRrc7gwEzyDL3KjG5CgeEqoRUMxWMlblD1CgxD4A7lwI2gVz0mtuyA/ZcK5gS/yg/Xhy t0X8cpC6Il9EtiT7RoNGFO4ZkO+QL0zgsgmRNFLOJcxZ9RWalgAwg7pj2Yi+GSgBT81jCx ey6Fg8k8AEy0p27jrR7PSy222rKEi9IfCI7/u/35rJKyu1pJyz7q14JKlLDWPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672457147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TnVJqQyi/ztM957kvbm3k4pCv9swvfdMVUv22yABBZw=; b=cXhMIjqqcmuXu2MgPT7ym7kgCBErs6CROsvSASgkkgBImXKFPP7HLPdmaMSEjYDXmqxbh8 JdlfuUEL6PvOWoXBsog6rBeHNrnGW1Lyn6J3PiD/ukUQ6WmMe80IR3+nA55fKUTRTZ/TB3 eS5bCMOWJGMtC1hcouaGsobpS9yp7E7YkRb6I4USskuIUlFhb4uG8CFcb7Fk2dPAl2o0Gs 0sKIqeBY9uOWFHrZVjv/E313qha7xDuC51pj2KkflbtkKmonvcPzsagpjkdOpLaOTt8mrT 96IngCd9+ET+3y4gk48BNstMK25U9FGLkjbR0FMRVufeT2e+Es1XPAbWhcmj9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672457147; a=rsa-sha256; cv=none; b=AN9aQq3qfQSGpAGQSmb3TeWgXdMyy6crvmsPzuKnNZJfs372utoZ3LQJQYvQ6vGnnB70hd FfYkzt0qwI7aZ4tvcZBAks7PN0xLFjqp94A7xnbiO4sOVhVjTK3cSCHMktPuydALIqs9ap TF6vw0ZOpFp1w7ZjqG6fJ6iqBVo+uKnF+uWspAq4ppbfrPpEnjbqD2UE783FZDWXspbHd4 X8ZVE7tdbqHzNXozrgVt4W+7xX6WaxHVUuOmtSEqLRKBYpWH+U2LyR5oOQjvBBuNqESyO3 2YaxxkvqGnYQXDXzC7dLbCvYbGKBniF9lEkdS0MwegAbBPVs3EYLz5RO9b/QOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NkSFR3FmszY8v; Sat, 31 Dec 2022 03:25:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BV3Pli0094444; Sat, 31 Dec 2022 03:25:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BV3PljZ094443; Sat, 31 Dec 2022 03:25:47 GMT (envelope-from git) Date: Sat, 31 Dec 2022 03:25:47 GMT Message-Id: <202212310325.2BV3PljZ094443@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 6489b1187732 - main - Approved by: portmgr List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6489b11877323eedf51bd2d2613cc077b91004b7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=6489b11877323eedf51bd2d2613cc077b91004b7 commit 6489b11877323eedf51bd2d2613cc077b91004b7 Author: Muhammad Moinur Rahman AuthorDate: 2022-12-31 03:24:14 +0000 Commit: Muhammad Moinur Rahman 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 +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());