From nobody Mon Jan 02 13:08:22 2023 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 4Nlx4k3zckz2pNp0; Mon, 2 Jan 2023 13:08:22 +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 4Nlx4k3S6pz4F7R; Mon, 2 Jan 2023 13:08:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672664902; 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=zjufAiAZs4k4Qm/S69ER89dLudbfGLvafQUbOH+shtQ=; b=xOdEIg8lx3qEbIpTKsTW9NZW+PBJ4ksbItrCm0ELN3y/VS1sihaqFFTmwj2gIkOcMd4khE wZITZtzWniLbfcWWvNAD8FOvp5bVMZM5NGLo6S89CZQd39jFjxD79lbsf3D39uEFeC8aAT UEsw0hlXGV138CihGgWvlVi6QXXOBrMnj03jPuHDlnwkVHum5BX7WHhO31Kjw8t0Gf1TwA KsxIPiK7iwSq2/xa8ARds8gx1zfexPieFsEsTsXNaJoFfz7fA5oGBlQckoyv6yzr0Y4U6c Eoig3BAOe0OK3JNJd8/Ua4uU28x3ZRl+us3GWCT2eRWR5CGN2yIvY1XjBuNHXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672664902; 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=zjufAiAZs4k4Qm/S69ER89dLudbfGLvafQUbOH+shtQ=; b=BjcdYvI6pJjioZlKh3rEp+rEzTOt7YtjIhjDKAT5b8zDlJnfZVP1vQNuu8N0p4Vx1snX+x GioVGdjojs4vlZrkmeKxZYJ2hsmfFW/Vm53/bVA0vL65GNuqI7EX0rfRWPOBTQ1hKU+7O/ SNk5cfk5jZ45OCPwWsAVNBqc/nGpZ6XY5E/Hl2tgavQ7WACwIMm8uEwD6tO36Cu0ZrDgRO bNkpcBq87yrG90yNGXtydN3cHghfrlPEBBt8EsDlGGnc2i0pjHniQvKxaBwMNtESBm5/t2 BRs05GvrOG4OZLCtfnwbAJh+u95JoWhNskgwKnHsC//AKqs/zd7ffVveqwPvSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672664902; a=rsa-sha256; cv=none; b=IrFkZzWjDn9n6ZzRbzvy/A9q7mysslReM0GwT/V1FeVAEJzfj6bIyMNKfN1doDgBvp6Rzs YHMbJO8uiDQdl62CehPQF/gynquPbgJuRS/hYdeYw3E9HSi8aRFfRQ4N+10KuIsPmlbT/G b5WATZ7FE1AwJfF6HOhW+y/HJWWRCjMaYVIvAp9fQab2gHDkPr+J/8R1sbBJU7ZRLtdxM2 K0OiavyGi8uNhrFUA5ibU4CwzQPi70HUFSYlt885CuxuLzCwNy67zEVHZoKMvUH7y2Z+e6 RwJLEyVbhVtVlKDAfhPfD/6nh8E9/Hyj8xUC4by2n+qTdcqqoeb9sijvAQBjQA== 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 4Nlx4k2QwYz17nN; Mon, 2 Jan 2023 13:08:22 +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 302D8MQQ046572; Mon, 2 Jan 2023 13:08:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 302D8MYi046571; Mon, 2 Jan 2023 13:08:22 GMT (envelope-from git) Date: Mon, 2 Jan 2023 13:08:22 GMT Message-Id: <202301021308.302D8MYi046571@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Max Brazhnikov Subject: git: ac1f63492dde - main - games/legend-of-edgar: update to 1.36 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: makc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac1f63492dded65a274962d3f01d71a5865af6c0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=ac1f63492dded65a274962d3f01d71a5865af6c0 commit ac1f63492dded65a274962d3f01d71a5865af6c0 Author: Max Brazhnikov AuthorDate: 2023-01-02 13:08:00 +0000 Commit: Max Brazhnikov CommitDate: 2023-01-02 13:08:00 +0000 games/legend-of-edgar: update to 1.36 Changes: https://github.com/riksweeney/edgar/releases/tag/1.36 --- games/legend-of-edgar/Makefile | 5 ++--- games/legend-of-edgar/distinfo | 6 +++--- games/legend-of-edgar/files/patch-makefile | 19 +++++++------------ games/legend-of-edgar/pkg-plist | 3 ++- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/games/legend-of-edgar/Makefile b/games/legend-of-edgar/Makefile index 0d07e3cc7b5f..bc2d61d55b15 100644 --- a/games/legend-of-edgar/Makefile +++ b/games/legend-of-edgar/Makefile @@ -1,5 +1,5 @@ PORTNAME= edgar -DISTVERSION= 1.35 +DISTVERSION= 1.36 CATEGORIES= games MASTER_SITES= https://github.com/riksweeney/edgar/releases/download/${DISTVERSION}/ PKGNAMEPREFIX= legend-of- @@ -19,7 +19,6 @@ USE_SDL= image2 mixer2 sdl2 ttf2 MAKEFILE= makefile MAKE_ARGS= BIN_DIR=${PREFIX}/bin/ \ DATA_DIR=${DATADIR}/ \ - MAN_DIR=${PREFIX}/man/man6/ \ PREFIX=${PREFIX} OPTIONS_DEFINE= DOCS NLS @@ -33,7 +32,7 @@ post-patch: ${WRKSRC}/icons/${PORTNAME}.desktop post-install: - ${RLN} ${STAGEDIR}${PREFIX}/share/icons/hicolor/64x64/apps/${PORTNAME}.png \ + ${RLN} ${STAGEDIR}${PREFIX}/share/icons/hicolor/128x128/apps/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ .include diff --git a/games/legend-of-edgar/distinfo b/games/legend-of-edgar/distinfo index 2a4f6510d6ee..d08d490e428c 100644 --- a/games/legend-of-edgar/distinfo +++ b/games/legend-of-edgar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1641296718 -SHA256 (edgar-1.35-1.tar.gz) = 0793815208f64ba396bd10ab56e325a9e2d65c7f1baea840ff138448e3389743 -SIZE (edgar-1.35-1.tar.gz) = 91887320 +TIMESTAMP = 1672662786 +SHA256 (edgar-1.36-1.tar.gz) = 41d98dc1e15a6d7ef7898ebfef438a82598b67485cc686cd2e57f1e638af9a39 +SIZE (edgar-1.36-1.tar.gz) = 91908211 diff --git a/games/legend-of-edgar/files/patch-makefile b/games/legend-of-edgar/files/patch-makefile index 15e1c175a7ee..f6e07973fee1 100644 --- a/games/legend-of-edgar/files/patch-makefile +++ b/games/legend-of-edgar/files/patch-makefile @@ -1,9 +1,8 @@ -- Make sure the build can find SDL's headers - Properly stage things to make sure the binary does not refer to the stage directory and that the game can actually find its assets at runtime ---- makefile.orig 2019-03-16 12:57:53 UTC +--- makefile.orig 2023-01-01 07:44:56 UTC +++ makefile @@ -22,7 +22,7 @@ PO_PROG = po_creator TILE_PROG = tile_creator @@ -14,15 +13,7 @@ BIN_DIR = $(PREFIX)/games/ DOC_DIR = $(PREFIX)/share/doc/$(PROG)/ ICON_DIR = $(PREFIX)/share/icons/hicolor/ -@@ -42,6 +42,7 @@ CFLAGS += -Wall -pedantic - ifeq ($(DEV),1) - CFLAGS += -Werror -g - endif -+CFLAGS += $(shell sdl2-config --cflags) - - DEFINES = -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DUNIX=$(UNIX) - ifndef NO_PAK -@@ -104,11 +105,11 @@ endif +@@ -104,11 +104,11 @@ endif all : $(PROG) makefile.dep $(ED_PROG) $(PAK_PROG) $(LOCALE_MO) $(PO_PROG) makefile.dep : src/*/*.h src/*.h @@ -36,7 +27,7 @@ %.mo: %.po msgfmt -c -o $@ $< -@@ -148,37 +149,37 @@ install: all buildpak +@@ -148,39 +148,39 @@ install: all buildpak ifeq ($(DEV),1) echo Cannot install if DEV is set to 1! else @@ -47,6 +38,7 @@ - mkdir -p $(ICON_DIR)32x32/apps - mkdir -p $(ICON_DIR)48x48/apps - mkdir -p $(ICON_DIR)64x64/apps +- mkdir -p $(ICON_DIR)128x128/apps - mkdir -p $(DESKTOP_DIR) - mkdir -p $(APPDATA_DIR) - mkdir -p $(MAN_DIR) @@ -57,6 +49,7 @@ + mkdir -p $(DESTDIR)$(ICON_DIR)32x32/apps + mkdir -p $(DESTDIR)$(ICON_DIR)48x48/apps + mkdir -p $(DESTDIR)$(ICON_DIR)64x64/apps ++ mkdir -p $(DESTDIR)$(ICON_DIR)128x128/apps + mkdir -p $(DESTDIR)$(DESKTOP_DIR) + mkdir -p $(DESTDIR)$(APPDATA_DIR) + mkdir -p $(DESTDIR)$(MAN_DIR) @@ -75,6 +68,7 @@ - cp $(ICONS)32x32.png $(ICON_DIR)32x32/apps/$(PROG).png - cp $(ICONS)48x48.png $(ICON_DIR)48x48/apps/$(PROG).png - cp $(ICONS)64x64.png $(ICON_DIR)64x64/apps/$(PROG).png +- cp $(ICONS)128x128.png $(ICON_DIR)128x128/apps/$(PROG).png - cp $(ICONS)$(PROG).desktop $(DESKTOP_DIR) - cp $(ICONS)$(PROG).appdata.xml $(APPDATA_DIR) - install -m 0644 $(MAN)$(PROG).6 $(MAN_DIR) @@ -83,6 +77,7 @@ + $(BSD_INSTALL_DATA) $(ICONS)32x32.png $(DESTDIR)$(ICON_DIR)32x32/apps/$(PROG).png + $(BSD_INSTALL_DATA) $(ICONS)48x48.png $(DESTDIR)$(ICON_DIR)48x48/apps/$(PROG).png + $(BSD_INSTALL_DATA) $(ICONS)64x64.png $(DESTDIR)$(ICON_DIR)64x64/apps/$(PROG).png ++ $(BSD_INSTALL_DATA) $(ICONS)128x128.png $(DESTDIR)$(ICON_DIR)128x128/apps/$(PROG).png + $(BSD_INSTALL_DATA) $(ICONS)$(PROG).desktop $(DESTDIR)$(DESKTOP_DIR) + $(BSD_INSTALL_DATA) $(ICONS)$(PROG).appdata.xml $(DESTDIR)$(APPDATA_DIR) + $(BSD_INSTALL_MAN) $(MAN)$(PROG).6 $(DESTDIR)$(MAN_DIR) diff --git a/games/legend-of-edgar/pkg-plist b/games/legend-of-edgar/pkg-plist index d7bda5c73bed..a82eb706cde6 100644 --- a/games/legend-of-edgar/pkg-plist +++ b/games/legend-of-edgar/pkg-plist @@ -1,5 +1,4 @@ bin/edgar -man/man6/edgar.6.gz share/appdata/edgar.appdata.xml share/applications/edgar.desktop %%PORTDOCS%%%%DOCSDIR%%/alienDevice.gif @@ -21,6 +20,7 @@ share/applications/edgar.desktop %%PORTDOCS%%%%DOCSDIR%%/tortoise.gif %%PORTDOCS%%%%DOCSDIR%%/translating %%DATADIR%%/edgar.pak +share/icons/hicolor/128x128/apps/edgar.png share/icons/hicolor/16x16/apps/edgar.png share/icons/hicolor/32x32/apps/edgar.png share/icons/hicolor/48x48/apps/edgar.png @@ -59,4 +59,5 @@ share/icons/hicolor/64x64/apps/edgar.png %%NLS%%share/locale/ur/LC_MESSAGES/edgar.mo %%NLS%%share/locale/vi/LC_MESSAGES/edgar.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/edgar.mo +share/man/man6/edgar.6.gz share/pixmaps/edgar.png