Re: [PR PATCH] [Updated] Fix fillets-ng not including game data

[stellarskylark <stellarskylark@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 777 bytes --]

There is an updated pull request by stellarskylark against master on the void-packages repository

https://github.com/stellarskylark/void-packages master
https://github.com/void-linux/void-packages/pull/37720

Fix fillets-ng not including game data
Basically all I did was copy `do_install` from the `gnu-configure` build style and add a couple lines to copy the game data into `DESTDIR` as well. I chose to install it to `/usr/share/games/fillets-ng` because that is where Fillets looks for the game data by default.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc

A patch file from https://github.com/void-linux/void-packages/pull/37720.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37720.patch --]
[-- Type: text/x-diff, Size: 2482 bytes --]

From f828f3083c9dad769d98916304c8beaaa1bbfa80 Mon Sep 17 00:00:00 2001
From: Skylar Hill <stellarskylark@posteo.net>
Date: Tue, 28 Jun 2022 02:12:21 -0500
Subject: [PATCH 1/2] Fix fillets-ng not including game data

---
 srcpkgs/fillets-ng/template | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/fillets-ng/template b/srcpkgs/fillets-ng/template
index 8db27477c3c4..3678456e1407 100644
--- a/srcpkgs/fillets-ng/template
+++ b/srcpkgs/fillets-ng/template
@@ -1,7 +1,7 @@
 # Template file for 'fillets-ng'
 pkgname=fillets-ng
 version=1.0.1
-revision=2
+revision=3
 create_wrksrc=yes
 build_wrksrc="fillets-ng-${version}"
 build_style=gnu-configure
@@ -16,3 +16,12 @@ distfiles="${SOURCEFORGE_SITE}/fillets/fillets-ng-${version}.tar.gz
 checksum="329a4d9515d60bebdb657d070824933b993b85864b9d3e302e6361accab992da
  f0c979fb35ec550a43246fc209add8f45ca550a382c94d6383bb3f01b1073799"
 replaces="fillets-ng-data>=0"
+do_install() {
+  : ${make_cmd:=make}
+  : ${make_install_target:=install}
+
+  ${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
+
+  mkdir -p ${DESTDIR}/usr/share/games/fillets-ng
+  cp -r $wrksrc/fillets-ng-data-${version}/* ${DESTDIR}/usr/share/games/fillets-ng
+}

From 02b80ea1a46b7acd42c8acf660caae53d51be327 Mon Sep 17 00:00:00 2001
From: Skylar Hill <stellarskylark@posteo.net>
Date: Tue, 28 Jun 2022 02:26:58 -0500
Subject: [PATCH 2/2] Replace spaces with tabs

---
 srcpkgs/fillets-ng/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/fillets-ng/template b/srcpkgs/fillets-ng/template
index 3678456e1407..0aed94ccde14 100644
--- a/srcpkgs/fillets-ng/template
+++ b/srcpkgs/fillets-ng/template
@@ -17,11 +17,11 @@ checksum="329a4d9515d60bebdb657d070824933b993b85864b9d3e302e6361accab992da
  f0c979fb35ec550a43246fc209add8f45ca550a382c94d6383bb3f01b1073799"
 replaces="fillets-ng-data>=0"
 do_install() {
-  : ${make_cmd:=make}
-  : ${make_install_target:=install}
+	: ${make_cmd:=make}
+	: ${make_install_target:=install}
 
-  ${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
+	${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
 
-  mkdir -p ${DESTDIR}/usr/share/games/fillets-ng
-  cp -r $wrksrc/fillets-ng-data-${version}/* ${DESTDIR}/usr/share/games/fillets-ng
+	mkdir -p ${DESTDIR}/usr/share/games/fillets-ng
+	cp -r $wrksrc/fillets-ng-data-${version}/* ${DESTDIR}/usr/share/games/fillets-ng
 }