From nobody Wed Mar 30 20:20:34 2022 X-Original-To: dev-commits-ports-all@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 A19F51A347E2; Wed, 30 Mar 2022 20:20:34 +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 4KTHqk3qdnz3vRN; Wed, 30 Mar 2022 20:20:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648671634; 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=9oFK5JTeDy6qKWLUVEUoeGBGhFooTcNl7MOGg0lPt4c=; b=QvnjLjp9apIgzUF+EWOPi3WE8eR+0/sMhjYUD9XrrkUGIO+a+8fDicyIaurRWH/uIKhlD7 Mj6xUY68nyrN+9WJPWHB9AgcXVlkcWR8e0A/2BJBNX5GZVxCLGgQUlS6iB365oHlsKaNTU yK7VSKR8Bnvcdj1UreC9UFqhXA11HMqxwvBe6dkkw1bGSiSkDUM+e96g1iupoO7erd46Oa L6My2fipjlnq1jyAI1zxCsOKMR4Dmmj+S+ldZ5mKXt1Cmf4atBMS/YKysSadL7FoE6d1zi BXSpP3wW9cGlF57GAtN9D3Rzg7lK2P+zZGXioL1GQNF1sG1T9QrUXAisBVKvxg== 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 6382D19D2E; Wed, 30 Mar 2022 20:20:34 +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 22UKKYcW094295; Wed, 30 Mar 2022 20:20:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22UKKYeB094294; Wed, 30 Mar 2022 20:20:34 GMT (envelope-from git) Date: Wed, 30 Mar 2022 20:20:34 GMT Message-Id: <202203302020.22UKKYeB094294@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: ade0a9c31a9f - main - =?utf-8?Q?games/hyperrogue: update 12.0f =E2=86=92 12.0m?= List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ade0a9c31a9f5585299888fe4dc26274bf4a3e6a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648671634; 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=9oFK5JTeDy6qKWLUVEUoeGBGhFooTcNl7MOGg0lPt4c=; b=AvsEXhyWzKAfUk9cUQRhQjO4/BOILNNzN+ggOAZoCq15HZA81jX1HfzEj0+ekLuc/s86qR SswIWFkbX37FQI25vPxYAF6MDIF3pKHpR75Gv2R2SpkNQqx6hCzm+2uDoW8ExInIQjzuHG Tdap3ImOWmuTS8INcGdWBLBbcx9SjE18YdRR8ybyBAnCvxNLD2IIto0KdiRkjIZfKifwKM ti+4Tl7s9oDF/LF9BtHndgULIDQn2vruHRVZTDkFTSU6kRWiR2tTURFMYqwuAV4p6Lv94T BswT2Ps0YaAE7flX7/jN8yJGVb/o04AhyVYoh/9aKONIarPjdIMNKXr8wTpxXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648671634; a=rsa-sha256; cv=none; b=TX56H0qkNRBsvs8XRmbL5tKmABFmuirhRnRWRoWw7nrg673jryr+LnYevzoU5xHVlLgkV/ EUcBieOnQPMe2eaOANhByscdbHNVA56/l8gzE9roVoSCURLGB9u0GBw//iMq9UvHuXnTz7 uzzxgM3WWDi0Z4LxlD5PWDh4PMtFf2+seVRxkNSnappQ5Gdoj/Y53nrAnHHi++rdDh2Hc1 ICMMzkyZKeercZ6oZ7+lVECbDSsKpdtvI4lGALyVFYj43B6SofkIm6TydXP7uUcEvjlw03 6QBD9spwg29QEjVp1MyGxxiOElI+J5fzHU4AROAUx2CEmlPdkHnwaK4kSBntKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=ade0a9c31a9f5585299888fe4dc26274bf4a3e6a commit ade0a9c31a9f5585299888fe4dc26274bf4a3e6a Author: Dmitry Marakasov AuthorDate: 2022-03-30 17:26:02 +0000 Commit: Dmitry Marakasov CommitDate: 2022-03-30 20:19:45 +0000 games/hyperrogue: update 12.0f → 12.0m --- games/hyperrogue/Makefile | 9 +++------ games/hyperrogue/distinfo | 6 +++--- games/hyperrogue/files/patch-Makefile | 14 ++++++++------ 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/games/hyperrogue/Makefile b/games/hyperrogue/Makefile index 2f08d97f75eb..b2a36c6bf4b3 100644 --- a/games/hyperrogue/Makefile +++ b/games/hyperrogue/Makefile @@ -1,5 +1,5 @@ PORTNAME= hyperrogue -PORTVERSION= 12.0f +PORTVERSION= 12.0m DISTVERSIONPREFIX= v CATEGORIES= games @@ -38,11 +38,8 @@ OPTIONS_DEFINE= DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/hyperrogue ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_DATA} ${WRKSRC}/hr-icon.ico ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.ico - @${MKDIR} ${STAGEDIR}${DATADIR}/sounds - ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/hyperrogue-music.txt ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/sounds/* ${STAGEDIR}${DATADIR}/sounds - ${INSTALL_DATA} ${WRKSRC}/music/* ${STAGEDIR}${DATADIR} + @cd ${WRKSRC} && ${COPYTREE_SHARE} "*.ttf hyperrogue-music.txt sounds music" \ + ${STAGEDIR}${DATADIR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/games/hyperrogue/distinfo b/games/hyperrogue/distinfo index 713d4522fa7e..02e23d74e66e 100644 --- a/games/hyperrogue/distinfo +++ b/games/hyperrogue/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629196951 -SHA256 (zenorogue-hyperrogue-v12.0f_GH0.tar.gz) = 44e78e93ed1d31983debcd04791d7ffcfcfbdc40697e709a0f6ca2d38c30203e -SIZE (zenorogue-hyperrogue-v12.0f_GH0.tar.gz) = 79946099 +TIMESTAMP = 1648658613 +SHA256 (zenorogue-hyperrogue-v12.0m_GH0.tar.gz) = 39a9fc274c600acc4ef7f7143dda4ce2dd0411d539e750e375a042b488e1a504 +SIZE (zenorogue-hyperrogue-v12.0m_GH0.tar.gz) = 80012304 diff --git a/games/hyperrogue/files/patch-Makefile b/games/hyperrogue/files/patch-Makefile index 7dd21ffc71f0..74c1b3083e50 100644 --- a/games/hyperrogue/files/patch-Makefile +++ b/games/hyperrogue/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2021-08-05 11:49:41 UTC +--- Makefile.orig 2022-03-27 20:47:51 UTC +++ Makefile @@ -42,7 +42,6 @@ endif ## Begin customization points for each OS and TOOLCHAIN we support. @@ -16,7 +16,7 @@ ifeq (${OS},mingw) CXXFLAGS_EARLY += -DWINDOWS -mwindows -D_A_VOLID=8 -@@ -79,29 +77,13 @@ ifeq (${OS},osx) +@@ -79,31 +77,13 @@ ifeq (${OS},osx) hyper_RES := endif @@ -35,6 +35,7 @@ - CXXFLAGS_EARLY += -march=native -fPIC - CXXFLAGS_EARLY += -W -Wall -Wextra -Werror -pedantic - CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized +- CXXFLAGS_EARLY += -Wno-invalid-offsetof -endif -ifeq (${TOOLCHAIN},mingw) @@ -42,18 +43,19 @@ - CXXFLAGS_EARLY += -march=native - CXXFLAGS_EARLY += -W -Wall -Wextra -Werror - CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized +- CXXFLAGS_EARLY += -Wno-invalid-offsetof -endif - - ## We have now finished OS-specific and TOOLCHAIN-specific computations. ## Begin customization points for user-specifiable HYPERROGUE_USE_XXX macros. -@@ -139,19 +121,19 @@ override CXXFLAGS := $(CXXFLAGS_STD) $(CXXFLAGS_EARLY) +@@ -141,19 +121,19 @@ override CXXFLAGS := $(CXXFLAGS_STD) $(CXXFLAGS_EARLY) override LDFLAGS := $(LDFLAGS_EARLY) $(LDFLAGS) ${EXTRA_LDFLAGS} hyperrogue$(EXE_EXTENSION): $(hyper_OBJS) $(hyper_RES) - $(CXX) $(CXXFLAGS) $(hyper_OBJS) $(hyper_RES) $(LDFLAGS) $(hyper_LDFLAGS) -o $@ -+ $(CXX) $(hyper_OBJS) $(hyper_RES) $(LDFLAGS) $(hyper_LDFLAGS) $(LDFLAGS) -o $@ ++ $(CXX) $(hyper_OBJS) $(hyper_RES) $(LDFLAGS) $(hyper_LDFLAGS) -o $@ hyper$(OBJ_EXTENSION): *.cpp language-data.cpp autohdr.h - $(CXX) -O2 $(CXXFLAGS) $(hyper_CXXFLAGS) -c hyper.cpp -o $@ @@ -71,8 +73,8 @@ + $(CXX) $(CXXFLAGS) makeh.cpp $(LDFLAGS) -o $@ autohdr.h: makeh$(EXE_EXTENSION) language-data.cpp *.cpp - ./makeh classes.cpp locations.cpp colors.cpp hyperpoint.cpp geometry.cpp goldberg.cpp init.cpp floorshapes.cpp cell.cpp multi.cpp shmup.cpp pattern2.cpp mapeditor.cpp graph.cpp textures.cpp hprint.cpp language.cpp util.cpp complex.cpp *.cpp > autohdr.h -@@ -160,10 +142,10 @@ language-data.cpp: langen$(EXE_EXTENSION) + ./makeh classes.cpp locations.cpp colors.cpp hyperpoint.cpp geometry.cpp goldberg.cpp init.cpp floorshapes.cpp cell.cpp multi.cpp shmup.cpp pattern2.cpp mapeditor.cpp graph.cpp textures.cpp hprint.cpp language.cpp util.cpp complex.cpp multigame.cpp *.cpp > autohdr.h +@@ -162,10 +142,10 @@ language-data.cpp: langen$(EXE_EXTENSION) ./langen > language-data.cpp savepng$(OBJ_EXTENSION): savepng.cpp