Hello ports@

Here is a patch updating my chocolate-doom port from 1.2.1 to the
latest version, 1.4.0. Daniel Dickman previously submitted a patch
to me updating to 1.3.0, however Edd Barrett informed me that the
1.4.0 version would not build on sparc64.

To summarize changes, the 1.4.0 and 1.5.0 release logs are here:
1.3.0 to 1.4.0: 
http://chocolate-doom.svn.sourceforge.net/viewvc/chocolate-doom/trunk/chocolate-doom/ChangeLog?r1=1869&r2=1941
1.2.1 to 1.3.0: 
http://chocolate-doom.svn.sourceforge.net/viewvc/chocolate-doom/trunk/chocolate-doom/ChangeLog?r1=1421&r2=1869

One thing to note is fraggle's efforts to add support for openbsd's
OPL device driver, and a software OPL emulator to play back doom's
music as closely as possible to the way it would have originally
sounded back in 1993 with the appropriate audio card :)

Please test, and Edd if you could let me know if this now builds
on sparc64, i would appreciate it :D Also if it doesn't, did you
ever get a chance to check and see if chocolate-doom 1.2.1 built
on sparc64? 

Comments?

tests/builds/runs good on i386

-ryan


? chocolate-doom.patch
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile    5 Jun 2009 22:38:04 -0000       1.3
+++ Makefile    5 Aug 2010 01:14:40 -0000
@@ -1,8 +1,8 @@
 # $OpenBSD: Makefile,v 1.3 2009/06/05 22:38:04 jasper Exp $
 
 COMMENT =      portable version of iD Software's Doom
-DISTNAME =     chocolate-doom-1.2.1
-PKGNAME =      ${DISTNAME}p0
+DISTNAME =     chocolate-doom-1.4.0
+PKGNAME =      ${DISTNAME}
 CATEGORIES =   games x11
 
 HOMEPAGE =     http://www.chocolate-doom.org/
@@ -17,9 +17,9 @@ PERMIT_DISTFILES_FTP =                Yes
 
 WANTLIB =      SDL c m pthread
 
-LIB_DEPENDS =  SDL_mixer.>=3::devel/sdl-mixer \
+LIB_DEPENDS =  SDL_mixer.>=4::devel/sdl-mixer \
                SDL_net.>=1::devel/sdl-net \
-               samplerate.>=1::audio/libsamplerate
+               samplerate.>=2::audio/libsamplerate
 
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=chocolate-doom/}
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/chocolate-doom/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo    5 Jun 2009 21:58:43 -0000       1.1.1.1
+++ distinfo    5 Aug 2010 01:14:40 -0000
@@ -1,5 +1,5 @@
-MD5 (chocolate-doom-1.2.1.tar.gz) = 3wTDgANO/3iea57hwBZJdw==
-RMD160 (chocolate-doom-1.2.1.tar.gz) = JACmlVqKRSlHJXB5Mo5ESAHD0vc=
-SHA1 (chocolate-doom-1.2.1.tar.gz) = OygCwPiosCvJxCXt4KE6qf0TFNc=
-SHA256 (chocolate-doom-1.2.1.tar.gz) = 
/61QqEf3B+pch4RNvZwTOebS0YK7XPbm9infQg9mKcE=
-SIZE (chocolate-doom-1.2.1.tar.gz) = 664600
+MD5 (chocolate-doom-1.4.0.tar.gz) = xrC7z3/aDmnYaFighgCjug==
+RMD160 (chocolate-doom-1.4.0.tar.gz) = vlVgh5rxgz3B+qHTUX/dYgAE4do=
+SHA1 (chocolate-doom-1.4.0.tar.gz) = 8gVn5VsfRVNBXEpK3UXz5dB8Gqw=
+SHA256 (chocolate-doom-1.4.0.tar.gz) = 
wOb5H991rDYT3vrhCw7vZqkpz3A1eTBqObgGZEZhqNM=
+SIZE (chocolate-doom-1.4.0.tar.gz) = 966186
Index: patches/patch-setup_Makefile_in
===================================================================
RCS file: /cvs/ports/games/chocolate-doom/patches/patch-setup_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-setup_Makefile_in
--- patches/patch-setup_Makefile_in     5 Jun 2009 22:27:29 -0000       1.2
+++ patches/patch-setup_Makefile_in     5 Aug 2010 01:14:40 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-setup_Makefile_in,v 1.2 2009/06/05 22:27:29 jasper Exp $
---- setup/Makefile.in.orig     Wed Dec 10 21:29:26 2008
-+++ setup/Makefile.in  Wed Dec 10 21:28:32 2008
-@@ -170,7 +170,7 @@ sysconfdir = @sysconfdir@
+$OpenBSD$
+--- setup/Makefile.in.orig     Wed Aug  4 10:25:08 2010
++++ setup/Makefile.in  Wed Aug  4 10:25:48 2010
+@@ -177,7 +177,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -gamesdir = $(prefix)/games
 +gamesdir = $(prefix)/bin
- AM_CFLAGS = -I../textscreen -I../src -DINSTALL_DIR="\"$(gamesdir)\""
+ AM_CFLAGS = -I../textscreen -I../src @SDLMIXER_CFLAGS@
  SOURCE_FILES = \
      compatibility.c   compatibility.h           \
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/games/chocolate-doom/patches/patch-src_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_Makefile_in
--- patches/patch-src_Makefile_in       5 Jun 2009 22:27:29 -0000       1.2
+++ patches/patch-src_Makefile_in       5 Aug 2010 01:14:40 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_Makefile_in,v 1.2 2009/06/05 22:27:29 jasper Exp $
---- src/Makefile.in.orig       Wed Dec 10 21:27:14 2008
-+++ src/Makefile.in    Wed Dec 10 21:27:39 2008
-@@ -239,7 +239,7 @@ sysconfdir = @sysconfdir@
+$OpenBSD$
+--- src/Makefile.in.orig       Wed Aug  4 10:26:17 2010
++++ src/Makefile.in    Wed Aug  4 10:26:31 2010
+@@ -248,7 +248,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -gamesdir = $(prefix)/games
 +gamesdir = $(prefix)/bin
- AM_CFLAGS = -I../textscreen -I../pcsound @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@
+ AM_CFLAGS = -I../opl -I../textscreen -I../pcsound @SDLMIXER_CFLAGS@ 
@SDLNET_CFLAGS@
  DEDSERV_FILES = \
  d_dedicated.c                              \

Reply via email to