pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

f1spirit unbreak; filename is .tgz, but its a tar



Module Name:	pkgsrc-wip
Committed By:	i3enedek <pkgsrc%xn--rvztrtkrfrgp-bbb7j2b8f0b9d7a21oft.com@localhost>
Pushed By:	i3enedek
Date:		Fri Aug 21 22:45:22 2020 +0100
Changeset:	5ee58a5d18d47f860d496feb1a5dc1b752402052

Modified Files:
	f1spirit/Makefile
	f1spirit/distinfo
	f1spirit/patches/patch-build_linux_Makefile
Added Files:
	f1spirit/patches/patch-F1Shttp.cpp
Removed Files:
	f1spirit/patches/patch-sources_F1Shttp.cpp

Log Message:
f1spirit unbreak; filename is .tgz, but its a tar

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5ee58a5d18d47f860d496feb1a5dc1b752402052

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 f1spirit/Makefile                           |  6 +++++-
 f1spirit/distinfo                           | 12 ++++++------
 f1spirit/patches/patch-F1Shttp.cpp          | 14 ++++++++++++++
 f1spirit/patches/patch-build_linux_Makefile |  2 ++
 f1spirit/patches/patch-sources_F1Shttp.cpp  | 12 ------------
 5 files changed, 27 insertions(+), 19 deletions(-)

diffs:
diff --git a/f1spirit/Makefile b/f1spirit/Makefile
index 722c826b1b..c07acda360 100644
--- a/f1spirit/Makefile
+++ b/f1spirit/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Remake the Konami MSX1 classic F-1 Spirit
 LICENSE=	unlicense
 
 WRKSRC=		${WRKDIR}/f1spirit-0.rc9.1615
-#USE_TOOLS+=	make
+USE_TOOLS+=	tar
 USE_LANGUAGES=	c++03 c
 
 #LDFLAGS+=	-nostartfiles
@@ -27,6 +27,10 @@ SUBST_FILES.prefix=	f1spirit.sh
 SUBST_MESSAGE.prefix=	Fixing PREFIX.
 SUBST_VARS.prefix=	PREFIX
 
+# filename is .tgz, but its .tar
+do-extract:
+	cd ${WRKDIR} && ${TAR} xvf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
+
 pre-patch:
 	${CP} ${FILESDIR}/f1spirit ${WRKSRC}/f1spirit.sh
 	${MV} ${WRKSRC}/sources/* ${WRKSRC}
diff --git a/f1spirit/distinfo b/f1spirit/distinfo
index 0419aec1e7..502d79afc3 100644
--- a/f1spirit/distinfo
+++ b/f1spirit/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-SHA1 (f1spirit.src_0.rc9-1615.tgz) = 90a6a0a3b5f7dc18a3497d32bb580bf47e688c95
-RMD160 (f1spirit.src_0.rc9-1615.tgz) = fa91ca937f9e12812376aa7571b4089b83a864a1
-SHA512 (f1spirit.src_0.rc9-1615.tgz) = 7eff68c5e33bb8ad07f8cf238ad1596b83dc5889828747d591b1e319cbef9359b6f134ad92e222ad7947c01278cfd692f6bf729de007dd91b03d12fd3d805335
-Size (f1spirit.src_0.rc9-1615.tgz) = 18522073 bytes
-SHA1 (patch-build_linux_Makefile) = b47cfb4431f4833b036f7f1801399474123fb95f
-SHA1 (patch-sources_F1Shttp.cpp) = 83e7c3e878aaa9be40e34807e0b05aabbe21e3c3
+SHA1 (f1spirit.src_0.rc9-1615.tgz) = 9c0881b232d46125bd330485c3dcb4e21976e3f3
+RMD160 (f1spirit.src_0.rc9-1615.tgz) = d87297b4051de66b6be48f1c1f4b895d0861fb7b
+SHA512 (f1spirit.src_0.rc9-1615.tgz) = aaf627735d9353f221f7e6abb199a2fae8958a92b3f707be69a63d642df59b038d0b007d31777d24f5d03e59d87fe2d061b80fa6a0c7f79e5d14c57f1f0151f7
+Size (f1spirit.src_0.rc9-1615.tgz) = 31242240 bytes
+SHA1 (patch-F1Shttp.cpp) = ce501794347c57a6c0c4f8942b42f316fdb69f5a
+SHA1 (patch-build_linux_Makefile) = d5ae1c75fc14f053a87ab5a33798d9800c6723c8
diff --git a/f1spirit/patches/patch-F1Shttp.cpp b/f1spirit/patches/patch-F1Shttp.cpp
new file mode 100644
index 0000000000..77230c8b06
--- /dev/null
+++ b/f1spirit/patches/patch-F1Shttp.cpp
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Fixing curl header.
+
+--- F1Shttp.cpp.orig	2009-02-06 09:54:49.000000000 +0000
++++ F1Shttp.cpp
+@@ -3,7 +3,6 @@
+ #include "string.h"
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include "F1Shttp.h"
diff --git a/f1spirit/patches/patch-build_linux_Makefile b/f1spirit/patches/patch-build_linux_Makefile
index 27780078ce..a5527f4375 100644
--- a/f1spirit/patches/patch-build_linux_Makefile
+++ b/f1spirit/patches/patch-build_linux_Makefile
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Fixing flags.
+
 --- build/linux/Makefile.orig	2009-02-06 10:12:51.000000000 +0000
 +++ build/linux/Makefile
 @@ -1,6 +1,6 @@
diff --git a/f1spirit/patches/patch-sources_F1Shttp.cpp b/f1spirit/patches/patch-sources_F1Shttp.cpp
deleted file mode 100644
index 2755300d03..0000000000
--- a/f1spirit/patches/patch-sources_F1Shttp.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- F1Shttp.cpp.orig	2009-02-06 09:54:49.000000000 +0000
-+++ F1Shttp.cpp
-@@ -3,7 +3,6 @@
- #include "string.h"
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- #include "F1Shttp.h"


Home | Main Index | Thread Index | Old Index