From nobody Tue Jan 23 15:03:40 2024 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 4TK9Md1CLTz57081; Tue, 23 Jan 2024 15:03:41 +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 4TK9Md0YLJz4XSk; Tue, 23 Jan 2024 15:03:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706022221; 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=5+ieCEdUMhiaVzVZFwylRbejK3z5+P5J4/BOwZhHUdI=; b=D2sTn5n1G//YpAE3ktq/kdOzOm7i4pO1AaFK+NY/fqjXdVXsRjZvpDAMP77PTW73q/s9DU 77SUYTcrbsEn3EWYqp6dUNBzKghXfoJ0s/32W01zlSkcEfnaGxZFIGg3vDy3ZHZ1J1tREy 7MM9TsRhVe7Ga1vKZt+3AT8WlsaXgWVPLIGlHvUNqPW2mNdYw5q9hdh5ehKKoMAzCnaOP1 cndlxP4xBcttPQzZYeAGjXo5KF85hF3Nu15s0Muf2pGLCO6pXoSYvGVRvwsVjIKqNiRLOG gv6v/37ZIWmr/dco43E7SgCaPUOA61c72wmB4HpOWdkyb+rF/+dV/yQu0HJ7MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706022221; 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=5+ieCEdUMhiaVzVZFwylRbejK3z5+P5J4/BOwZhHUdI=; b=RoTUT2yYTjxv+I35JQmLR4kcuH4XSrQIsB/Ojuxy9B3hbVu/OAy3pK0lAyib44cF6uDm8q wEzwX5SUwcEdjw2DdzK0n4XTt9PACRRkv66FwQjmqF7S/O+frqGCNm2dMX1ZLY3nroAhcf nCr+2clXNNn/wNA/snMTu7wv9y5LXvcvD7z0yhL4F97AUcJcdCt0HvWmt0kKATchkNyWXx 3/6x7y6ffEk/haIOjDUB7hS0GKgPgsuMmFmdCVStewdOp255mIFbGQobv3SUtyGE0cassQ ZO+E2ZZy68Eu6OtRP67n74hq40Ga34IWDfKFx6qOkGIJf7kulysioi74+owR+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706022221; a=rsa-sha256; cv=none; b=AYA6vjXIDEbnnygMNvHi2gXGgdk2G5c4uVSx953waBUgTSfVdJt5S6eprICyQo3kLzm7Ke EqNFrW5Zg/WmMKg3Bmm0XxD7+Pet+jBh1n+iURVEhKjXd6xwnwzbrWKDKVWcTqSa444/j9 NCTtuK6n9M8yfM08inM4YnpFsRpL48JbYWnTt6Sd53TkomGnQXZsuhFI6VDtlFniG3DQPF 1pKg4+uW4VuyDZRh3Yn37Smt8OY1LZ+VaQ8R1QqYrdmfWBxIIT0bBCT+AFWA3QDxY8Zsrr w9Ew775R5TeLoSOJ064fx/gv1Nialno9p0vnzgt7AVgIuCNj+OhfeFMeXdr3jQ== 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 4TK9Mc6KlSzZmN; Tue, 23 Jan 2024 15:03:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40NF3e5x004665; Tue, 23 Jan 2024 15:03:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40NF3efh004662; Tue, 23 Jan 2024 15:03:40 GMT (envelope-from git) Date: Tue, 23 Jan 2024 15:03:40 GMT Message-Id: <202401231503.40NF3efh004662@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emanuel Haupt Subject: git: 08ff302d1dc9 - main - games/mrboom: Move man pages to share/man 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: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08ff302d1dc9c988dd61a5e888de2ea2d6161cf9 Auto-Submitted: auto-generated The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=08ff302d1dc9c988dd61a5e888de2ea2d6161cf9 commit 08ff302d1dc9c988dd61a5e888de2ea2d6161cf9 Author: Emanuel Haupt AuthorDate: 2024-01-23 15:03:36 +0000 Commit: Emanuel Haupt CommitDate: 2024-01-23 15:03:36 +0000 games/mrboom: Move man pages to share/man --- games/mrboom/Makefile | 5 +++-- games/mrboom/files/patch-Makefile | 18 ++++++++++++------ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/games/mrboom/Makefile b/games/mrboom/Makefile index cca4d6bb1354..f2465457dd85 100644 --- a/games/mrboom/Makefile +++ b/games/mrboom/Makefile @@ -1,5 +1,6 @@ PORTNAME= mrboom -PORTVERSION= 5.3 +DISTVERSION= 5.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= https://github.com/Javanaise/mrboom-libretro/releases/download/${PORTVERSION}/ DISTNAME= MrBoom-src-${PORTVERSION} @@ -26,8 +27,8 @@ CFLAGS+= `sdl2-config --cflags` LDFLAGS+= `sdl2-config --libs` PLIST_FILES= bin/mrboom \ - man/man6/mrboom.6.gz \ share/applications/mrboom.desktop \ + share/man/man6/mrboom.6.gz \ share/pixmaps/mrboom.png post-install: diff --git a/games/mrboom/files/patch-Makefile b/games/mrboom/files/patch-Makefile index 686695e841d7..3132d3ccc926 100644 --- a/games/mrboom/files/patch-Makefile +++ b/games/mrboom/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2020-12-30 21:19:43 UTC +--- Makefile.orig 2023-09-30 09:08:22 UTC +++ Makefile -@@ -3,7 +3,6 @@ AR := ar +@@ -3,20 +3,19 @@ STRIP := strip INSTALL := install RM := rm STRIP := strip @@ -8,7 +8,13 @@ BINDIR ?= bin LIBDIR ?= lib DATADIR ?= share -@@ -16,7 +15,7 @@ CFLAGS := $(filter-out -D_FORTIFY_SOURCE=2,$(CFLAGS)) + LIBRETRO_DIR ?= libretro + WANT_BPP := 32 + +-MANDIR := man/man6 ++MANDIR := share/man/man6 + CFLAGS := $(filter-out -D_FORTIFY_SOURCE=1,$(CFLAGS)) + CFLAGS := $(filter-out -D_FORTIFY_SOURCE=2,$(CFLAGS)) CFLAGS := $(filter-out -D_FORTIFY_SOURCE,$(CFLAGS)) CXXFLAGS := $(filter-out -D_FORTIFY_SOURCE=1,$(CXXFLAGS)) CXXFLAGS := $(filter-out -D_FORTIFY_SOURCE=2,$(CXXFLAGS)) @@ -17,12 +23,12 @@ CPPFLAGS := $(filter-out -D_FORTIFY_SOURCE=1,$(CPPFLAGS)) CPPFLAGS := $(filter-out -D_FORTIFY_SOURCE=2,$(CPPFLAGS)) CPPFLAGS := $(filter-out -D_FORTIFY_SOURCE,$(CPPFLAGS)) -@@ -572,7 +571,7 @@ else +@@ -628,7 +627,7 @@ endif endif endif -CFLAGS += -DMRBOOM -DHAVE_IBXM -D_FORTIFY_SOURCE=0 -DPLATFORM=\"$(platform)\" -DGIT_VERSION=\"$(GIT_VERSION)\" +CFLAGS += -DMRBOOM -DHAVE_IBXM -D_FORTIFY_SOURCE=0 -DPLATFORM=\"$(platform)\" - SDL2LIBS := -lSDL2 -lSDL2_mixer -lminizip - + ifneq ($(FALCON),) + SDLLIBS := -mshort -L/usr/m68k-atari-mint/sys-root/usr/lib/m68020-60 -lSDL_mixer -lSDL -lSDLmain -lFLAC -lmikmod -lgem -lldg -lgem -lm -lvorbisfile -lvorbis -logg -lmpg123