From nobody Sat Dec 31 03:52:40 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 4NkSrS4XLVz2lMPv; Sat, 31 Dec 2022 03:52:40 +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 4NkSrS3xgyz3D1J; Sat, 31 Dec 2022 03:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672458760; 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=8eaouPYyLR3Dy0a0RgbizE9mdsRWSx6u+Hs2/W7fTfE=; b=OhJ0tIn1BfvW/kME7WH3yrdDLaJz/zUEogCLd+bdPU3tQ7N4KwaUAVGsx4paD1Fi/gDUHn dyY4pqYfzgIrKmdm8PnhXMopsOXsvOpFFuuRJZ6IB1EZ9hCHmICO1exyqgkWCIg4PSCpVV 84TaPGBmmGjdVpjWHjxr9zdB/UEeSqAnJJ0IonnzsRic4x3K3CrRpZKCfPn4hxf7muShDu YD8Sg70+EvevzYqcYS68hOmpa/a3DmYdCdi9LAoDW4uF94hlpJf35tInI7QzfukE79InHt pgPI3vNUOnQSBCxsL070fke5/U1OcRzjwwfCDbQppH4MIHZBkqcP9Eha9lDGGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672458760; 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=8eaouPYyLR3Dy0a0RgbizE9mdsRWSx6u+Hs2/W7fTfE=; b=rag0BoPY9YqbD+JnjTr0F/oxZin+ZeUI26HVofzKDzIDicyLw0A5T8OEDiUV5WZRAG2TXH j9WxFemPiUUACyCz653302qXwmN34UI7rhcOJi2agAvVKzwXgnRP6eCK/2VHJQZ4cPhywB Ir3E9oyQ3mBcJ/mZvHtctqt5Y6iXrc5ZpJTevg/7LZrTmFgLNcyzeElny1lY9dDTBOcbp/ 14FfJit/pTuNBscjRM6WBP8QawCTYCX/1pXamds9bZxYx6a4bSocKJD/AMfQxPYYB0VXxV ogmO1pu7zudNi6tg5jg+LAhiB9toBWauulwc8IjRLVe7Lz+kX2lL44G3VkKSwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672458760; a=rsa-sha256; cv=none; b=j+h4hM65PiAGsHUeIp8leJvDK5IdeQYvZx2RyeIPG0HtqvDvRENSxWLgmPRF4BUn/xPB6l ece/l1EHD9eSXqOUwJdpagC0hwmr1GQwDvfuTbY5o0KC29hmsxHsOn9hl/mhlYUgw+qUZC ZVh4r97+M37+bYgQmWMOjrCMrdjKQoDEj8jOhf2VyJdPvn0sqmN9hTIcH12iZXk5ShbfpZ vz2/nwXxdfOiwwzGOEqHn3cfVVHP7HNaxZg37e9nolgCDMNL4j4t9ltZf+F9pupMZZiyXW z3yk0SXalsap6/LoDuBNKBJj0UkpwUaSJvMT4rZ13RtBeper0A6wo02LN3uL3g== 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 4NkSrS2yVKzZ5g; Sat, 31 Dec 2022 03:52:40 +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 2BV3qeCC036631; Sat, 31 Dec 2022 03:52:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BV3qevh036630; Sat, 31 Dec 2022 03:52:40 GMT (envelope-from git) Date: Sat, 31 Dec 2022 03:52:40 GMT Message-Id: <202212310352.2BV3qevh036630@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: c4c1f581ad10 - main - games/species: Refactor after wxgtk28 removal 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: c4c1f581ad10f323ab1cafd7d2de4eb9a2de9190 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=c4c1f581ad10f323ab1cafd7d2de4eb9a2de9190 commit c4c1f581ad10f323ab1cafd7d2de4eb9a2de9190 Author: Muhammad Moinur Rahman AuthorDate: 2022-12-31 03:51:54 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-12-31 03:51:54 +0000 games/species: Refactor after wxgtk28 removal - Pet portclippy - Generate makepatch compatible patches --- games/species/Makefile | 18 +++++++----------- games/species/files/patch-Makefile | 4 ++-- games/species/files/patch-main.cpp | 4 ++-- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/games/species/Makefile b/games/species/Makefile index 0a2ec36f6899..37b5d4e97461 100644 --- a/games/species/Makefile +++ b/games/species/Makefile @@ -12,21 +12,17 @@ WWW= http://redcoder.sourceforge.net/?p=species LICENSE= GPLv1+ # though COPYING files mention LGPL21 and GPLv2 instead USES= gmake dos2unix tar:bzip2 + WRKSRC= ${WRKDIR}/${PORTNAME} OPTIONS_DEFINE= VISITOOL -VISITOOL_DESC= Build GUI tool for displaying evolution - OPTIONS_SUB= yes -VISITOOL_USE= WX=2.4 -VISITOOL_ALL_TARGET= all visitool - -.include +VISITOOL_DESC= Build GUI tool for displaying evolution -.if empty(PORT_OPTIONS:MVISITOOL) -MAKE_ENV+= WX_CONFIG="${TRUE}" -.endif +VISITOOL_USE= WX=3.0 +VISITOOL_MAKE_ENV= WX_CONFIG="${TRUE}" +VISITOOL_ALL_TARGET= all visitool do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin @@ -35,8 +31,8 @@ do-install: .for i in bench evolver_hill wilfiz @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${DATADIR}) .endfor -.if ${PORT_OPTIONS:MVISITOOL} + +do-install-VISITOOL-on: ${INSTALL_PROGRAM} ${WRKSRC}/visitool ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-visitool -.endif .include diff --git a/games/species/files/patch-Makefile b/games/species/files/patch-Makefile index c98c0f58487f..ad8c0cc8fdfb 100644 --- a/games/species/files/patch-Makefile +++ b/games/species/files/patch-Makefile @@ -1,5 +1,5 @@ ---- ./Makefile.orig Sun Feb 22 03:54:24 2004 -+++ ./Makefile Wed Jan 16 18:29:09 2008 +--- Makefile.orig 2022-12-31 03:50:49 UTC ++++ Makefile @@ -1,22 +1,22 @@ # makefile for species diff --git a/games/species/files/patch-main.cpp b/games/species/files/patch-main.cpp index 8b3059f0dafc..a8294c8847da 100644 --- a/games/species/files/patch-main.cpp +++ b/games/species/files/patch-main.cpp @@ -1,6 +1,6 @@ ---- main.cpp.orig +--- main.cpp.orig 2022-12-31 03:50:49 UTC +++ main.cpp -@@ -29,7 +29,7 @@ +@@ -29,7 +29,7 @@ using namespace std; /***** main program entry point ********************/