From 0170684f564b59571cb387b2176e36ee97756cd9 Mon Sep 17 00:00:00 2001 From: beltofdespair Date: Thu, 21 Apr 2022 13:37:43 -0500 Subject: [PATCH 1/2] opentyrian: update to 2.1.20220318. --- srcpkgs/opentyrian/template | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/srcpkgs/opentyrian/template b/srcpkgs/opentyrian/template index 2f70a3b2a0a2..742aee8c2b3e 100644 --- a/srcpkgs/opentyrian/template +++ b/srcpkgs/opentyrian/template @@ -1,28 +1,29 @@ # Template file for 'opentyrian' pkgname=opentyrian -version=2.1.20130907 -revision=3 +version=2.1.20220318 +revision=1 _dataver=21 create_wrksrc=yes build_wrksrc=$pkgname-$version build_style=gnu-makefile hostmakedepends="pkg-config unzip" -makedepends="SDL_net-devel" +makedepends="SDL2_net-devel" short_desc="OSS port of the DOS shoot-em-up Tyrian" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/opentyrian/opentyrian" -distfiles="http://www.camanis.net/${pkgname}/releases/${pkgname}-${version}-src.tar.gz +distfiles="https://github.com/${pkgname}/${pkgname}/archive/refs/tags/v${version}.tar.gz http://camanis.net/tyrian/tyrian${_dataver}.zip" -checksum="f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f +checksum="e0c6afbb5d395c919f9202f4c9b3b4da7bd6e993e9da6152f995012577e1ccbd 7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277" replaces="opentyrian-data>=0" -CFLAGS="-Wno-error -fcommon" +_FLAGS="\n-Wno-error \\\\\n-fcommon \\\\" pre_build() { - vsed -i Makefile -e "s;-g0;$CFLAGS;" + vsed -i Makefile -e "s/pedantic \\\\/&${_FLAGS}/" } + do_install() { vbin ${pkgname} vman linux/man/${pkgname}.6 From 25cccdade8c1dba49d3280e208264497e3321896 Mon Sep 17 00:00:00 2001 From: beltofdespair <104115617+beltofdespair@users.noreply.github.com> Date: Mon, 25 Apr 2022 01:38:56 -0500 Subject: [PATCH 2/2] Update template --- srcpkgs/opentyrian/template | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/srcpkgs/opentyrian/template b/srcpkgs/opentyrian/template index 742aee8c2b3e..bf2a8c0ba6b2 100644 --- a/srcpkgs/opentyrian/template +++ b/srcpkgs/opentyrian/template @@ -1,41 +1,40 @@ # Template file for 'opentyrian' pkgname=opentyrian -version=2.1.20220318 -revision=1 +version=2.1.20130907 +revision=3 _dataver=21 create_wrksrc=yes build_wrksrc=$pkgname-$version build_style=gnu-makefile hostmakedepends="pkg-config unzip" -makedepends="SDL2_net-devel" +makedepends="SDL_net-devel" short_desc="OSS port of the DOS shoot-em-up Tyrian" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/opentyrian/opentyrian" -distfiles="https://github.com/${pkgname}/${pkgname}/archive/refs/tags/v${version}.tar.gz +distfiles="http://www.camanis.net/${pkgname}/releases/${pkgname}-${version}-src.tar.gz http://camanis.net/tyrian/tyrian${_dataver}.zip" -checksum="e0c6afbb5d395c919f9202f4c9b3b4da7bd6e993e9da6152f995012577e1ccbd +checksum="f54b6b3cedcefa187c9f605d6164aae29ec46a731a6df30d351af4c008dee45f 7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277" replaces="opentyrian-data>=0" -_FLAGS="\n-Wno-error \\\\\n-fcommon \\\\" +CFLAGS="-Wno-error -fcommon" pre_build() { - vsed -i Makefile -e "s/pedantic \\\\/&${_FLAGS}/" + vsed -i Makefile -e "s;-g0;$CFLAGS;" } - do_install() { - vbin ${pkgname} - vman linux/man/${pkgname}.6 - vinstall linux/${pkgname}.desktop 644 usr/share/applications - vinstall linux/icons/tyrian-128.png 644 usr/share/pixmaps ${pkgname}.png - vmkdir usr/share/${sourcepkg}/data - vcopy "${wrksrc}/tyrian${_dataver}/*" usr/share/${sourcepkg}/data - cat < manual.txt + vbin ${pkgname} + vman linux/man/${pkgname}.6 + vinstall linux/${pkgname}.desktop 644 usr/share/applications + vinstall linux/icons/tyrian-128.png 644 usr/share/pixmaps ${pkgname}.png + vmkdir usr/share/${sourcepkg}/data + vcopy "${wrksrc}/tyrian${_dataver}/*" usr/share/${sourcepkg}/data + cat < manual.txt ******** This is the original manual of the DOS game. The install instructions are obsolete, while the story and gameplay instructions starting in section "V) THE STORY" may still be useful. ******** EOT - sed 's/\r//' ${wrksrc}/tyrian${_dataver}/manual.doc >> manual.txt - vdoc manual.txt + sed 's/\r//' ${wrksrc}/tyrian${_dataver}/manual.doc >> manual.txt + vdoc manual.txt }