On Fri, Sep 21 2018, Solene Rapenne <sol...@perso.pw> wrote: > Jonathan Gray <j...@jsg.id.au> wrote: >> On Fri, Sep 21, 2018 at 04:36:56PM +0200, Jeremie Courreges-Anglas wrote: >> > On Fri, Sep 07 2018, Solene Rapenne <sol...@perso.pw> wrote: >> > > Stuart Henderson <s...@spacehopper.org> wrote: >> > >> On 2018/08/08 10:46, Solene Rapenne wrote: >> > >> > while testing prboom I found this message in the console output: >> > >> > >> > >> > Couldn't load MIDI from /tmp/prboom-music-IaDpVf: /etc/timidity.cfg: >> > >> > No such file or directory >> > >> > >> > >> > and in fact the game had no music, only sounds. >> > >> > >> > >> > The following patch add audio/timidity as a LIB_DEPENDS, once >> > >> > timidity is installed, prboom plays the music as expected. >> > >> > This is documented in DESCR, so please also amend that file. >> > >> > Also in DESCR, ftp://ftp.idsoftware.com/idstuff/doom/doom-1.8.wad.gz >> > times out for me. My attempts at testing patches for games have mostly >> > failed so far. :) >> >> The id ftp was shut down. It has been widely mirrored for many years >> however, ie >> >> https://archive.org/download/ftp_ftp.idsoftware.com_2014.03/2014.03.ftp.idsoftware.com.tar/ftp.idsoftware.com%2Fidstuff%2Fdoom%2Fdoom-1.8.wad.gz >> ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/doom/doom-1.8.wad.gz >> >> https://archive.org/download/ftp_ftp.idsoftware.com_2014.03/2014.03.ftp.idsoftware.com.tar/ftp.idsoftware.com%2Fidstuff%2Fdoom%2Fdoom19s.zip >> ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/doom/doom19s.zip >> >> for the distfile used by games/doomdata/shareware > > I moved a large part of pkg/DESCR which should be in pkg/README and removed > the > timidity part as we want it as un RUN_DEPEND. > > I updated the url thanks to Jonathan Gray, I added the checksum, this let the > user the possibility to verify that the downloaded file is the right one and > in > case of host down, we can check if a file found on another mirror match this > one.
Nice, ok jca@ > Index: Makefile > =================================================================== > RCS file: /cvs/ports/games/prboom/Makefile,v > retrieving revision 1.25 > diff -u -p -r1.25 Makefile > --- Makefile 28 Sep 2017 23:12:48 -0000 1.25 > +++ Makefile 21 Sep 2018 17:03:38 -0000 > @@ -2,7 +2,7 @@ > > COMMENT= enhanced clone of Id Software's Doom game; multiplayer#' > DISTNAME= prboom-2.5.0 > -REVISION= 1 > +REVISION= 2 > > CATEGORIES= games x11 > > @@ -13,7 +13,9 @@ HOMEPAGE= http://prboom.sourceforge.net/ > # GPLv2+ > PERMIT_PACKAGE_CDROM= Yes > > -WANTLIB = SDL c m pthread z GL GLU SDL_mixer>=3 SDL_net>=1 png>=4 > +WANTLIB = SDL c m pthread GL GLU SDL_mixer>=3 SDL_net>=1 png>=4 > + > +RUN_DEPENDS = audio/timidity > > LIB_DEPENDS = devel/sdl-mixer \ > devel/sdl-net \ > cvs server: Diffing patches > cvs server: Diffing pkg > Index: pkg/DESCR > =================================================================== > RCS file: /cvs/ports/games/prboom/pkg/DESCR,v > retrieving revision 1.2 > diff -u -p -r1.2 DESCR > --- pkg/DESCR 24 Sep 2003 08:30:09 -0000 1.2 > +++ pkg/DESCR 21 Sep 2018 17:03:38 -0000 > @@ -2,18 +2,3 @@ PrBoom is a modified version of ID Softw > runs on several platforms (including Win32 and Unixes) and features > many additions to the original game. It also supports multiplayer > games. > - > -You will need an IWAD for PrBoom to be fully functional. An IWAD is > -the main data file containing the graphics and levels for Doom. If > -you have a copy of one of the original Doom games, simply copy your > -Doom, Doom 2, Ultimate Doom, or Final Doom IWAD (doom.wad, doom2.wad, > -tnt.wad, and plutonia.wad respectively) to ${PREFIX}/share/prboom/. > -If you do not possess any of those, you can use the shareware IWAD > -which is available at: > - > -ftp://ftp.idsoftware.com/idstuff/doom/doom-1.8.wad.gz > - > -Install it to ${PREFIX}/share/prboom as "doom.wad". > - > -If you wish to be able to play the Doom background music, simply > -install any FLAVOR of the audio/timidity port. > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/games/prboom/pkg/PLIST,v > retrieving revision 1.4 > diff -u -p -r1.4 PLIST > --- pkg/PLIST 31 Mar 2013 21:09:33 -0000 1.4 > +++ pkg/PLIST 21 Sep 2018 17:03:38 -0000 > @@ -4,6 +4,7 @@ > @man man/man5/boom.cfg.5 > @man man/man6/prboom-game-server.6 > @man man/man6/prboom.6 > +share/doc/pkg-readmes/${PKGSTEM} > share/doc/prboom/ > @comment share/doc/prboom/AUTHORS > @comment share/doc/prboom/COPYING > Index: pkg/README > =================================================================== > RCS file: pkg/README > diff -N pkg/README > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ pkg/README 21 Sep 2018 17:03:38 -0000 > @@ -0,0 +1,12 @@ > +You will need an IWAD for PrBoom to be fully functional. An IWAD is > +the main data file containing the graphics and levels for Doom. If > +you have a copy of one of the original Doom games, simply copy your > +Doom, Doom 2, Ultimate Doom, or Final Doom IWAD (doom.wad, doom2.wad, > +tnt.wad, and plutonia.wad respectively) to ${PREFIX}/share/prboom/. > +If you do not possess any of those, you can use the shareware IWAD > +which is available at: > + > +ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/doom/doom-1.8.wad.gz > +SHA256 (doom-1.8.wad.gz) = WM9qVjtjGkdWFjCvpidthTwnB5NC95aewwBpZdqFV6E= > + > +Install it to ${PREFIX}/share/prboom as "doom.wad". > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
