From b104ec05e9b2869f495946387a971f88b6af9ce7 Mon Sep 17 00:00:00 2001 From: bcallah Date: Tue, 30 Mar 2021 23:25:46 +0000 Subject: [PATCH] Update to 2.1.3.17 Changelog: https://github.com/ManaPlus/ManaPlus/compare/v1.9.3.23...v2.1.3.17 --- games/manaplus/Makefile | 12 ++++++------ games/manaplus/distinfo | 4 ++-- .../patches/patch-data_icons_Makefile_am | 17 +++++++++-------- games/manaplus/pkg/PLIST | 12 +++++------- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/games/manaplus/Makefile b/games/manaplus/Makefile index 22fc3ef8630..ee85b725f7f 100644 --- a/games/manaplus/Makefile +++ b/games/manaplus/Makefile @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile,v 1.101 2019/07/12 20:46:20 sthen Exp $ +# $OpenBSD: Makefile,v 1.102 2021/03/30 23:25:46 bcallah Exp $ -V = 1.9.3.23 -REVISION = 1 +V = 2.1.3.17 COMMENT = client for The Mana World DISTNAME = manaplus-${V} EXTRACT_SUFX = .tar.xz @@ -14,8 +13,8 @@ MAINTAINER = Brian Callahan PERMIT_PACKAGE = Yes WANTLIB += ${COMPILER_LIBCXX} GL SDL2 SDL2_gfx-1.0 SDL2_image -WANTLIB += SDL2_mixer SDL2_net SDL2_ttf X11 c crypto curl execinfo -WANTLIB += iconv intl m nghttp2 png ssl xml2 z +WANTLIB += SDL2_mixer SDL2_net SDL2_ttf X11 c curl execinfo iconv +WANTLIB += intl m png xml2 z MASTER_SITES = http://download.evolonline.org/manaplus/download/${V}/ @@ -35,7 +34,8 @@ LIB_DEPENDS = devel/gettext,-runtime \ textproc/libxml RUN_DEPENDS = devel/desktop-file-utils \ - devel/xdg-utils + devel/xdg-utils \ + x11/gtk+3,-guic CONFIGURE_STYLE = autoreconf CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" diff --git a/games/manaplus/distinfo b/games/manaplus/distinfo index 317f577aeab..d91e06add44 100644 --- a/games/manaplus/distinfo +++ b/games/manaplus/distinfo @@ -1,2 +1,2 @@ -SHA256 (manaplus-1.9.3.23.tar.xz) = X7qr6AQuoHGFZidoguGEs0VYkLZLHsdMxY1vTa5Awc8= -SIZE (manaplus-1.9.3.23.tar.xz) = 15051860 +SHA256 (manaplus-2.1.3.17.tar.xz) = 6NFqxUjEAp7aiIScyTOFh2tT7PfuTCKH1vTgPpTm+j0= +SIZE (manaplus-2.1.3.17.tar.xz) = 14132800 diff --git a/games/manaplus/patches/patch-data_icons_Makefile_am b/games/manaplus/patches/patch-data_icons_Makefile_am index f85bbbed5fc..06bf7227ecf 100644 --- a/games/manaplus/patches/patch-data_icons_Makefile_am +++ b/games/manaplus/patches/patch-data_icons_Makefile_am @@ -1,14 +1,15 @@ -$OpenBSD: patch-data_icons_Makefile_am,v 1.2 2013/02/04 15:03:12 bcallah Exp $ ---- data/icons/Makefile.am.orig Thu Jan 31 23:27:40 2013 -+++ data/icons/Makefile.am Thu Jan 31 23:27:54 2013 +$OpenBSD: patch-data_icons_Makefile_am,v 1.3 2021/03/30 23:25:46 bcallah Exp $ +Index: data/icons/Makefile.am +--- data/icons/Makefile.am.orig ++++ data/icons/Makefile.am @@ -9,8 +9,8 @@ icons_DATA = manaplus.png \ manaplus.xpm install-data-local: -- $(mkinstalldirs) $(DESTDIR)$(datarootdir)/pixmaps -- $(INSTALL) $(srcdir)/manaplus.png $(DESTDIR)$(datarootdir)/pixmaps/manaplus.png -+ $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps -+ $(INSTALL) $(srcdir)/manaplus.png $(DESTDIR)$(datadir)/pixmaps/manaplus.png +- $(mkinstalldirs) $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps +- $(INSTALL) $(srcdir)/manaplus.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/manaplus.svg ++ $(mkinstalldirs) $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps ++ $(INSTALL) $(srcdir)/manaplus.svg $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/manaplus.svg uninstall-local: - rm -f $(DESTDIR)$(datarootdir)/pixmaps/manaplus.png + rm -f $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/manaplus.svg diff --git a/games/manaplus/pkg/PLIST b/games/manaplus/pkg/PLIST index eb11d2f8b06..689a13fb2f8 100644 --- a/games/manaplus/pkg/PLIST +++ b/games/manaplus/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.40 2018/09/02 15:34:11 bcallah Exp $ +@comment $OpenBSD: PLIST,v 1.41 2021/03/30 23:25:46 bcallah Exp $ @conflict tmw-* @conflict tmw-music-* @pkgpath games/tmw @@ -7,10 +7,9 @@ @bin bin/manaplus @man man/man6/manaplus.6 @man man/man6/manaplustest.6 -share/appdata/ -share/appdata/manaplus.appdata.xml share/applications/manaplus.desktop share/applications/manaplustest.desktop +share/icons/hicolor/scalable/apps/manaplus.svg share/locale/ca/LC_MESSAGES/manaplus.mo share/locale/cs/LC_MESSAGES/manaplus.mo share/locale/de/LC_MESSAGES/manaplus.mo @@ -223,7 +222,6 @@ share/manaplus/data/graphics/sprites/manaplus_emotes.xml share/manaplus/data/graphics/sprites/manaplus_emotions.png share/manaplus/data/graphics/sprites/test.xml share/manaplus/data/help/ -share/manaplus/data/help/about-tmw.txt share/manaplus/data/help/about.txt share/manaplus/data/help/chatcommands.txt share/manaplus/data/help/chatguild.txt @@ -233,7 +231,6 @@ share/manaplus/data/help/download.txt share/manaplus/data/help/footer.txt share/manaplus/data/help/header.txt share/manaplus/data/help/idx/ -share/manaplus/data/help/idx/about-tmw.idx share/manaplus/data/help/idx/about.idx share/manaplus/data/help/idx/chatcommands.idx share/manaplus/data/help/idx/chatguild.idx @@ -866,6 +863,7 @@ share/manaplus/data/translations/help/ru.po share/manaplus/data/translations/help/zh_CN.po share/manaplus/data/translations/test/ share/manaplus/data/translations/test/test1.po -share/pixmaps/ -share/pixmaps/manaplus.png +share/metainfo/ +share/metainfo/manaplus.metainfo.xml @tag update-desktop-database +@tag gtk-update-icon-cache %D/share/icons/hicolor