pkgsrc-WIP-changes archive

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

sais: update to new code base



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Wed Dec 14 15:51:10 2022 +0100
Changeset:	8c4250d8bd5379a90587c6a47528c184e1f786ed

Modified Files:
	sais/DESCR
	sais/Makefile
	sais/PLIST
	sais/distinfo
Added Files:
	sais/patches/patch-src_is__fileio.h
Removed Files:
	sais/TODO
	sais/patches/patch-aa

Log Message:
sais: update to new code base

Works now.

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

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

diffstat:
 sais/DESCR                          |  4 ++--
 sais/Makefile                       | 44 +++++++++++++++++++++----------------
 sais/PLIST                          | 19 ++++++++++++++--
 sais/TODO                           |  1 -
 sais/distinfo                       |  7 +++---
 sais/patches/patch-aa               | 18 ---------------
 sais/patches/patch-src_is__fileio.h | 14 ++++++++++++
 7 files changed, 62 insertions(+), 45 deletions(-)

diffs:
diff --git a/sais/DESCR b/sais/DESCR
index dc662bc764..8ecb346581 100644
--- a/sais/DESCR
+++ b/sais/DESCR
@@ -1,2 +1,2 @@
-This is an SDL port of "Strange Adventures in Infinite Space".
-You'll need to provide the data files to use it.
+Strange Adventures in Infinite Space, a time-limited space exploration
+game.
diff --git a/sais/Makefile b/sais/Makefile
index d22e951f17..cd50bd53a8 100644
--- a/sais/Makefile
+++ b/sais/Makefile
@@ -1,26 +1,32 @@
-# $NetBSD: Makefile,v 1.1 2013/09/02 19:06:35 thomasklausner Exp $
+# $NetBSD$
 
-DISTNAME=		sais-nick-20060509
-PKGNAME=		${DISTNAME:S/-nick//}
-CATEGORIES=		games
-MASTER_SITES=		#
+DISTNAME=	sais-1.6.3
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_GITHUB:=kuroneko/}
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
-MAINTAINER=		pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=		https://zork.net/~nick/sais/
-COMMENT=		Strange Adventures in Infinite Space engine (SDL port)
-LICENSE=		gnu-gpl-v2
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://github.com/kuroneko/sais/
+COMMENT=	Strange Adventures in Infinite Space
+LICENSE=	gnu-gpl-v3
 
-INSTALLATION_DIRS=	bin
+USE_CMAKE=	yes
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	pkg-config
 
-USE_LANGUAGES+=	c++
-USE_TOOLS+=	gmake
-WRKSRC=		${WRKDIR}/sais
-BUILD_TARGET=	sais
+CMAKE_INSTALL_PREFIX=	${PREFIX}/libexec/sais
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sais ${DESTDIR}${PREFIX}/bin
+INSTALLATION_DIRS+=	bin
 
-.include "../../audio/SDL_mixer/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/SDL_image/buildlink3.mk"
+post-build:
+	${ECHO} '#!/bin/sh' > ${WRKDIR}/strange
+	${ECHO} 'cd ${PREFIX}/libexec/sais && ./strange' >> ${WRKDIR}/strange
+	${CHMOD} 755 ${WRKDIR}/strange
+
+post-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/strange ${DESTDIR}${PREFIX}/bin
+
+.include "../../devel/SDL2/buildlink3.mk"
+.include "../../audio/SDL2_mixer/buildlink3.mk"
+.include "../../devel/physfs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sais/PLIST b/sais/PLIST
index a7c14ce3bd..24b9655554 100644
--- a/sais/PLIST
+++ b/sais/PLIST
@@ -1,2 +1,17 @@
-@comment $NetBSD: PLIST,v 1.1 2013/09/02 19:06:35 thomasklausner Exp $
-bin/sais
+@comment $NetBSD$
+bin/strange
+libexec/sais/LICENSES.txt
+libexec/sais/README1st.txt
+libexec/sais/manual.txt
+libexec/sais/mods.txt
+libexec/sais/mods/eelfarm/gamedata/cards.ini
+libexec/sais/mods/eelfarm/gamedata/items.ini
+libexec/sais/mods/eelfarm/graphics/combtbg2.pcx
+libexec/sais/mods/flakgun/gamedata/cards.ini
+libexec/sais/mods/flakgun/gamedata/items.ini
+libexec/sais/mods/flakgun/gamedata/ships.ini
+libexec/sais/mods/flakgun/gamedata/systems.ini
+libexec/sais/mods/flakgun/gamedata/weapons.ini
+libexec/sais/mods/flakgun/graphics/weapons/frame019.tga
+libexec/sais/saisdata.zip
+libexec/sais/strange
diff --git a/sais/TODO b/sais/TODO
deleted file mode 100644
index e6224666ce..0000000000
--- a/sais/TODO
+++ /dev/null
@@ -1 +0,0 @@
-Dumps core during startup.
diff --git a/sais/distinfo b/sais/distinfo
index 216f0c0ec8..4d2b643d09 100644
--- a/sais/distinfo
+++ b/sais/distinfo
@@ -1,5 +1,6 @@
 $NetBSD: distinfo,v 1.1 2013/09/02 19:06:35 thomasklausner Exp $
 
-RMD160 (sais-nick-20060509.tar.gz) = 88e6e9080fab1e2b052a44b1bcd4f0057afac070
-Size (sais-nick-20060509.tar.gz) = 674775 bytes
-SHA1 (patch-aa) = 4b1c9bbc0cb19a8a63dc4568d147609fbb6e8c26
+BLAKE2s (sais-1.6.3.tar.gz) = 512900da760cb09a26d3c4786f5f5671874e4b956d7f5195cc4b52657e82365b
+SHA512 (sais-1.6.3.tar.gz) = 99ca8de25caf9d2dd62afd4a67a4d811feccc5dab0c0767a864f3eb70bb495c8b580bbd683f5d7261337750eddb8556de75a893386032e01049b86168b8072e8
+Size (sais-1.6.3.tar.gz) = 13511138 bytes
+SHA1 (patch-src_is__fileio.h) = 14c21154da05b2bf95c0a90504611c738e6ae3fb
diff --git a/sais/patches/patch-aa b/sais/patches/patch-aa
deleted file mode 100644
index f792e9acfa..0000000000
--- a/sais/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2013/09/02 19:06:35 thomasklausner Exp $
-
---- Makefile.orig	2008-03-14 09:31:42.000000000 +0000
-+++ Makefile
-@@ -1,11 +1,11 @@
- all: game
- 
--CPPFLAGS=-O2 $(shell sdl-config --cflags)
-+CPPFLAGS=-g -O0 $(shell sdl-config --cflags)
- LDFLAGS=$(shell sdl-config --libs) -lSDL_mixer -lSDL_image
- objfiles=$(patsubst %.cpp,%.o,$(wildcard *.cpp))
- 
- sais: $(objfiles) $(wildcard *.h)
--	$(CC) $(objfiles) -o sais $(CPPFLAGS) $(LDFLAGS)
-+	$(CXX) $(objfiles) -o sais $(CPPFLAGS) $(LDFLAGS)
- 
- 
- clean:
diff --git a/sais/patches/patch-src_is__fileio.h b/sais/patches/patch-src_is__fileio.h
new file mode 100644
index 0000000000..824e9d01a2
--- /dev/null
+++ b/sais/patches/patch-src_is__fileio.h
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Add missing header file.
+
+--- src/is_fileio.h.orig	2020-10-14 04:48:50.000000000 +0000
++++ src/is_fileio.h
+@@ -22,6 +22,7 @@
+ #define IS_FILEIO_H
+ 
+ #include <physfs.h>
++#include <stdarg.h>
+ 
+ typedef PHYSFS_File *   IS_FileHdl;
+ 


Home | Main Index | Thread Index | Old Index