Hi,
Here is an update to prboom-1.5.0.
Works fine on amd64 + radeon hd4350. There's a problem with my laptop's
intel card but this exists with the previous version too, so I don't think
it should block the update.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/prboom/Makefile,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 Makefile
--- Makefile 11 Mar 2013 11:07:40 -0000 1.21
+++ Makefile 27 Mar 2013 06:26:48 -0000
@@ -1,19 +1,16 @@
# $OpenBSD: Makefile,v 1.21 2013/03/11 11:07:40 espie Exp $
COMMENT= enhanced clone of Id Software's Doom game; multiplayer
-DISTNAME= prboom-2.4.7
-REVISION = 1
+DISTNAME= prboom-2.5.0
CATEGORIES= games x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=prboom/}
HOMEPAGE= http://prboom.sourceforge.net/
-# GPL
+# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
WANTLIB = SDL c m pthread z GL GLU SDL_mixer>=3 SDL_net>=1 png>=4
-
-USE_GROFF = Yes
LIB_DEPENDS = devel/sdl-mixer \
devel/sdl-net \
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/prboom/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo 5 Apr 2007 15:38:11 -0000 1.9
+++ distinfo 27 Mar 2013 06:26:48 -0000
@@ -1,5 +1,2 @@
-MD5 (prboom-2.4.7.tar.gz) = mUL1IXZNf4nfIhikVtpPAg==
-RMD160 (prboom-2.4.7.tar.gz) = eMhUiVTdlUafgJm8j6aX9ippwX4=
-SHA1 (prboom-2.4.7.tar.gz) = Uq65M9t3C0gzExfcNX9sutMIVgA=
-SHA256 (prboom-2.4.7.tar.gz) = 3iLbqs0loPCxbFB6ojJqkLf13Pz4YsPccHaZbGGHzS8=
-SIZE (prboom-2.4.7.tar.gz) = 999524
+SHA256 (prboom-2.5.0.tar.gz) = ImwcRw+MyYMydTZAT0BaHQJs8KUYjGlKEkPMhjABS64=
+SIZE (prboom-2.5.0.tar.gz) = 1049505
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/games/prboom/patches/patch-configure,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-configure
--- patches/patch-configure 20 Nov 2006 03:15:36 -0000 1.6
+++ patches/patch-configure 27 Mar 2013 06:26:48 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-configure,v 1.6 2006/11/20 03:15:36 jolan Exp $
---- configure.orig Sun Nov 19 11:45:22 2006
-+++ configure Sun Nov 19 21:12:41 2006
-@@ -1913,9 +1913,9 @@ if test "${with_waddir+set}" = set; then
- DOOMWADDIR="$withval"
+--- configure.orig Sun Nov 9 12:22:17 2008
++++ configure Wed Mar 27 00:14:46 2013
+@@ -2422,9 +2422,9 @@ if test "${with_waddir+set}" = set; then
+ withval=$with_waddir; DOOMWADDIR="$withval"
else
if test "x$prefix" != xNONE; then
- DOOMWADDIR="$prefix/share/games/doom"
@@ -12,8 +12,8 @@ $OpenBSD: patch-configure,v 1.6 2006/11/
+ DOOMWADDIR="$ac_default_prefix/share/prboom"
fi
- fi;
-@@ -5999,7 +5999,7 @@ if test "${ac_cv_lib_png_png_create_info
+ fi
+@@ -6814,7 +6814,7 @@ if test "${ac_cv_lib_png_png_create_info_struct+set}"
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -22,7 +22,7 @@ $OpenBSD: patch-configure,v 1.6 2006/11/
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -6061,7 +6061,7 @@ if test $ac_cv_lib_png_png_create_info_s
+@@ -6874,7 +6874,7 @@ if test $ac_cv_lib_png_png_create_info_struct = yes; t
#define HAVE_LIBPNG 1
_ACEOF
Index: patches/patch-src_SDL_i_sshot_c
===================================================================
RCS file: patches/patch-src_SDL_i_sshot_c
diff -N patches/patch-src_SDL_i_sshot_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_SDL_i_sshot_c 27 Mar 2013 06:26:48 -0000
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+Fix build with png-1.5.
+
+--- src/SDL/i_sshot.c.orig Wed Mar 27 00:17:06 2013
++++ src/SDL/i_sshot.c Wed Mar 27 00:18:10 2013
+@@ -231,7 +231,7 @@ int I_ScreenShot (const char *fname)
+ if (fp)
+ {
+ png_struct *png_ptr = png_create_write_struct(
+- PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn);
++ PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn);
+
+ if (png_ptr)
+ {
+@@ -279,7 +279,7 @@ int I_ScreenShot (const char *fname)
+ break;
+ }
+ }
+- png_destroy_write_struct(&png_ptr, png_infopp_NULL);
++ png_destroy_write_struct(&png_ptr, NULL);
+ }
+ fclose(fp);
+ }
Index: patches/patch-src_m_misc_c
===================================================================
RCS file: patches/patch-src_m_misc_c
diff -N patches/patch-src_m_misc_c
--- patches/patch-src_m_misc_c 8 Jul 2011 20:38:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$OpenBSD: patch-src_m_misc_c,v 1.1 2011/07/08 20:38:01 naddy Exp $
-
-Fix build with png-1.5.
-
---- src/m_misc.c.orig Wed Jul 6 12:26:31 2011
-+++ src/m_misc.c Wed Jul 6 12:26:57 2011
-@@ -1041,7 +1041,7 @@ static void WritePNGfile(FILE* fp, const byte* data,
- png_infop info_ptr;
- boolean gl = !palette;
-
-- png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
png_error_ptr_NULL, error_fn, NULL);
-+ png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, error_fn,
NULL);
- png_set_compression_level(png_ptr, 2);
- if (png_ptr == NULL) { screenshot_write_error = true; return; }
- info_ptr = png_create_info_struct(png_ptr);
-@@ -1067,7 +1067,7 @@ static void WritePNGfile(FILE* fp, const byte* data,
-
- png_write_end(png_ptr, info_ptr);
- }
-- png_destroy_write_struct(&png_ptr, png_infopp_NULL);
-+ png_destroy_write_struct(&png_ptr, NULL);
- }
-
- #else /* HAVE_LIBPNG */
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/prboom/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 15 Sep 2004 00:46:10 -0000 1.3
+++ pkg/PLIST 27 Mar 2013 06:26:48 -0000
@@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.3 2004/09/15 00:46:10 espie Exp $
-bin/prboom
-bin/prboom-game-server
+@bin bin/prboom
+@bin bin/prboom-game-server
@man man/man5/boom.cfg.5
@man man/man6/prboom-game-server.6
@man man/man6/prboom.6
