From 5699dd50e0ba7dddf73df58fd72d6b47cb769c30 Mon Sep 17 00:00:00 2001
From: bcallah <bcallah@openbsd.org>
Date: Sat, 14 Sep 2019 19:13:16 +0000
Subject: [PATCH] Update to jumpnbump-1.61; the Python stuff is no longer
 built, so it goes away. Rest of the changelog:
 https://gitlab.com/LibreGames/jumpnbump/-/tags/1.61

---
 games/jumpnbump/Makefile               | 10 ++--------
 games/jumpnbump/distinfo               |  4 ++--
 games/jumpnbump/patches/patch-Makefile | 10 +++++-----
 games/jumpnbump/pkg/PLIST              | 10 +++-------
 4 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/games/jumpnbump/Makefile b/games/jumpnbump/Makefile
index 7ce81d6e1ad..da974691a5b 100644
--- a/games/jumpnbump/Makefile
+++ b/games/jumpnbump/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2019/07/12 20:46:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.5 2019/09/14 19:13:16 bcallah Exp $
 
-V =		1.60
+V =		1.61
 COMMENT =	game of cute bunnies jumping on each other's heads
 DISTNAME =	jumpnbump-${V}
 CATEGORIES =	games x11
-REVISION =	0
 
 HOMEPAGE =	https://gitlab.com/LibreGames/jumpnbump
 MAINTAINER =	Brian Callahan <bcallah@openbsd.org>
@@ -16,11 +15,6 @@ WANTLIB += SDL2 SDL2_mixer SDL2_net bz2 c m z
 
 MASTER_SITES =	https://gitlab.com/LibreGames/jumpnbump/-/archive/${V}/
 
-MODULES =	lang/python
-MODPY_BUILDDEP =	No
-MODPY_RUNDDEP =		No
-MODPY_ADJ_FILES =	menu/jumpnbump_menu.py.pre
-
 BUILD_DEPENDS =	devel/gettext,-tools
 
 LIB_DEPENDS =	archivers/bzip2 \
diff --git a/games/jumpnbump/distinfo b/games/jumpnbump/distinfo
index 0d82a0d3431..07febdd561c 100644
--- a/games/jumpnbump/distinfo
+++ b/games/jumpnbump/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jumpnbump-1.60.tar.gz) = hRlfv6+CQz/pZ641c6gYS5dnFlJbzgbUnEVumtPBZ3Y=
-SIZE (jumpnbump-1.60.tar.gz) = 435469
+SHA256 (jumpnbump-1.61.tar.gz) = LxjyDZ8xwNLhdliE+PpKLyKO5CoPzNKAyuHAmnlR+X0=
+SIZE (jumpnbump-1.61.tar.gz) = 435882
diff --git a/games/jumpnbump/patches/patch-Makefile b/games/jumpnbump/patches/patch-Makefile
index 69162ec7d1a..be2a7308d9d 100644
--- a/games/jumpnbump/patches/patch-Makefile
+++ b/games/jumpnbump/patches/patch-Makefile
@@ -1,12 +1,12 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2018/06/14 23:38:06 bcallah Exp $
+$OpenBSD: patch-Makefile,v 1.2 2019/09/14 19:13:16 bcallah Exp $
 
 Install manual pages to the correct location.
 
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -61,7 +61,7 @@ install:
- 	mkdir -p $(DESTDIR)$(DATADIR)/appdata/
+@@ -63,7 +63,7 @@ install:
+ 	mkdir -p $(DESTDIR)$(DATADIR)/metainfo/
  	mkdir -p $(DESTDIR)$(DATADIR)/applications/
  	mkdir -p $(DESTDIR)$(DATADIR)/icons/
 -	mkdir -p $(DESTDIR)$(DATADIR)/man/man6/
@@ -15,11 +15,11 @@ Index: Makefile
  	install -m 644 data/jumpbump.dat \
  		$(DESTDIR)$(GAMEDATADIR)/jumpnbump/jumpbump.dat
 @@ -73,7 +73,7 @@ install:
- 		$(DESTDIR)$(DATADIR)/applications/jumpnbump-menu.desktop
+ 		$(DESTDIR)$(DATADIR)/applications/jumpnbump.desktop
  	install -m 644 dist/jumpnbump.png \
  		$(DESTDIR)$(DATADIR)/icons/jumpnbump.png
 -	install -m 644 dist/jumpnbump.6 $(DESTDIR)$(DATADIR)/man/man6/
 +	install -m 644 dist/jumpnbump.6 $(DESTDIR)$(PREFIX)/man/man6/
  
- 	$(MAKE) -C menu install
+ #	$(MAKE) -C menu install
  
diff --git a/games/jumpnbump/pkg/PLIST b/games/jumpnbump/pkg/PLIST
index 5358dbf1cc7..0409a10c90e 100644
--- a/games/jumpnbump/pkg/PLIST
+++ b/games/jumpnbump/pkg/PLIST
@@ -1,18 +1,14 @@
-@comment $OpenBSD: PLIST,v 1.2 2018/06/27 21:03:47 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2019/09/14 19:13:16 bcallah Exp $
 @bin bin/gobpack
 @bin bin/jnbpack
 @bin bin/jnbunpack
 @bin bin/jumpnbump
-bin/jumpnbump-menu
 @man man/man6/jumpnbump.6
-share/appdata/
-share/appdata/jumpnbump.appdata.xml
-share/applications/jumpnbump-menu.desktop
 share/applications/jumpnbump.desktop
 share/icons/
 share/icons/jumpnbump.png
 share/jumpnbump/
 share/jumpnbump/jumpbump.dat
-share/jumpnbump/jumpnbump_menu.glade
-share/locale/fr/LC_MESSAGES/jumpnbump-menu.mo
+share/metainfo/
+share/metainfo/jumpnbump.appdata.xml
 @tag update-desktop-database