From e963fc2be260c63f8f15b5ebffc61aac955e15b1 Mon Sep 17 00:00:00 2001 From: Yorick Hardy Date: Wed, 15 Apr 2020 08:20:39 +0200 Subject: [PATCH] exult-snapshot: update to exult-1.7.0 This is the latest snapshot "release", documented as 1.7.0git on github. The project does not tag the source code release in git. --- exult-snapshot/Makefile | 4 ++-- exult-snapshot/PLIST | 1 - exult-snapshot/distinfo | 10 ++++------ exult-snapshot/patches/patch-Makefile.am | 15 --------------- .../patch-audio_midi__drivers_forked__player.cc | 16 ---------------- 5 files changed, 6 insertions(+), 40 deletions(-) delete mode 100644 exult-snapshot/patches/patch-Makefile.am delete mode 100644 exult-snapshot/patches/patch-audio_midi__drivers_forked__player.cc diff --git a/exult-snapshot/Makefile b/exult-snapshot/Makefile index 6c1661bdd8..870a1ba62b 100644 --- a/exult-snapshot/Makefile +++ b/exult-snapshot/Makefile @@ -1,12 +1,12 @@ # $NetBSD$ -PKGNAME= ${GITHUB_PROJECT}-20181209 +PKGNAME= ${GITHUB_PROJECT}-1.7.0 DISTNAME= ${GITHUB_TAG} GITHUB_PROJECT= exult CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GITHUB:=exult/} DIST_SUBDIR= ${GITHUB_PROJECT} -GITHUB_TAG= 872079cfe80f912af50dabdcf09ff1bd4bb72a9a +GITHUB_TAG= 417092710fc8a17992cc10a9a9993a9123771aa5 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://exult.sourceforge.net/ diff --git a/exult-snapshot/PLIST b/exult-snapshot/PLIST index 271b8c7fa7..686d46ae78 100644 --- a/exult-snapshot/PLIST +++ b/exult-snapshot/PLIST @@ -14,7 +14,6 @@ share/exult/bg_mr_faces.vga share/exult/bg_paperdol.vga share/exult/exult.flx share/exult/exult_bg.flx -share/exult/exult_iphone.flx share/exult/exult_si.flx share/exult/exultmsg.txt share/exult/midisfx.flx diff --git a/exult-snapshot/distinfo b/exult-snapshot/distinfo index e1a46811c1..7e39522158 100644 --- a/exult-snapshot/distinfo +++ b/exult-snapshot/distinfo @@ -1,8 +1,6 @@ $NetBSD$ -SHA1 (exult/872079cfe80f912af50dabdcf09ff1bd4bb72a9a-872079cfe80f912af50dabdcf09ff1bd4bb72a9a.tar.gz) = e72b551decd13fd25b1214fb9496eb13072b95c3 -RMD160 (exult/872079cfe80f912af50dabdcf09ff1bd4bb72a9a-872079cfe80f912af50dabdcf09ff1bd4bb72a9a.tar.gz) = 2874dec57dbc01532a595a311330d196aa39bcd9 -SHA512 (exult/872079cfe80f912af50dabdcf09ff1bd4bb72a9a-872079cfe80f912af50dabdcf09ff1bd4bb72a9a.tar.gz) = 6649905fe7b6601408c4cdb1d7979876157e790532b0099e4d04a4232266b6dd873472203777a2a34929c41915de8a91a903dc7b0f2ba16ae62dc3e9c77c7c3b -Size (exult/872079cfe80f912af50dabdcf09ff1bd4bb72a9a-872079cfe80f912af50dabdcf09ff1bd4bb72a9a.tar.gz) = 6615025 bytes -SHA1 (patch-Makefile.am) = 38d10967223230dfec2684938ada56250520fd08 -SHA1 (patch-audio_midi__drivers_forked__player.cc) = a25bb70adf7abc9f891569155d892d99c118563b +SHA1 (exult/417092710fc8a17992cc10a9a9993a9123771aa5-417092710fc8a17992cc10a9a9993a9123771aa5.tar.gz) = bb94ba0fea7f26966db1e258f5cb6a85f443837f +RMD160 (exult/417092710fc8a17992cc10a9a9993a9123771aa5-417092710fc8a17992cc10a9a9993a9123771aa5.tar.gz) = c4330b0bb750b940ed3cfdb6bd16e94bf2d3b156 +SHA512 (exult/417092710fc8a17992cc10a9a9993a9123771aa5-417092710fc8a17992cc10a9a9993a9123771aa5.tar.gz) = a795a0ca1c549e8ebec0798d2c80e1153952e91f6306371a0c3d89897822919758f70dd9b833ab7c6b23fa73e8b65ff26d31460ebe2b36321f32b0f73bc2490c +Size (exult/417092710fc8a17992cc10a9a9993a9123771aa5-417092710fc8a17992cc10a9a9993a9123771aa5.tar.gz) = 7731435 bytes diff --git a/exult-snapshot/patches/patch-Makefile.am b/exult-snapshot/patches/patch-Makefile.am deleted file mode 100644 index e6d9bb5343..0000000000 --- a/exult-snapshot/patches/patch-Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD$ - -Help libtool. - ---- Makefile.am.orig 2016-12-03 18:17:22.000000000 +0000 -+++ Makefile.am -@@ -8,7 +8,7 @@ AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/he - $(SDL_CFLAGS) $(VORBIS_CFLAGS) $(OGG_CFLAGS) $(INCDIRS) $(WINDOWING_SYSTEM) \ - $(DEBUG_FLAGS) $(CPPFLAGS) -DEXULT_DATADIR=\"$(EXULT_DATADIR)\" - --CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(DEBUG_FLAGS) $(CXXFLAGS) $(LDFLAGS) -o $(EXE_TARGET) -+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) $(DEBUG_FLAGS) $(CXXFLAGS) $(LDFLAGS) -o $(EXE_TARGET) - - if BUILD_MODS - MODSDIR=content diff --git a/exult-snapshot/patches/patch-audio_midi__drivers_forked__player.cc b/exult-snapshot/patches/patch-audio_midi__drivers_forked__player.cc deleted file mode 100644 index 0704d2b130..0000000000 --- a/exult-snapshot/patches/patch-audio_midi__drivers_forked__player.cc +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD$ - ---- audio/midi_drivers/forked_player.cc.orig 2017-05-13 09:27:33.000000000 +0000 -+++ audio/midi_drivers/forked_player.cc -@@ -39,7 +39,11 @@ const MidiDriver::MidiDriverDesc forked_ - // NB: This function doesn't return unless execlp fails! - static void playFJmidifile(const char *name) - { -+#ifdef __NetBSD__ -+ execlp("midiplay","midiplay","-v","-v",name,static_cast0); -+#else - execlp("playmidi","playmidi","-v","-v","-e",name,static_cast(0)); -+#endif - } - - forked_player::forked_player() : repeat_(false), forked_job(-1)