cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to prboom-1.5.0.

Browse Source 
comments & ok rfreeman@
This commit is contained in:
bentley 2013-03-31 21:09:32 +00:00
parent 53c923680e
commit 11950d7f77
6 changed files with 44 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
games/prboom/Makefile
View File

@ -1,20 +1,17 @@
# $OpenBSD: Makefile,v 1.21 2013/03/11 11:07:40 espie Exp $
# $OpenBSD: Makefile,v 1.22 2013/03/31 21:09:32 bentley 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 \
graphics/png
@ -22,7 +19,8 @@ LIB_DEPENDS = devel/sdl-mixer \
CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include/libpng" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=--disable-cpu-opt
CONFIGURE_ARGS+=--disable-cpu-opt \
--with-waddir=${TRUEPREFIX}/share/doom
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/autotools
FAKE_FLAGS += gamesdir=${PREFIX}/bin \

7
games/prboom/distinfo
View File

@ -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

16
games/prboom/patches/patch-configure
View File

@ -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"
$OpenBSD: patch-configure,v 1.7 2013/03/31 21:09:32 bentley Exp $
--- 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/20 03:15:36 jolan Exp $
+ 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/20 03:15:36 jolan Exp $
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

24
games/prboom/patches/patch-src_SDL_i_sshot_c Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-src_SDL_i_sshot_c,v 1.1 2013/03/31 21:09:33 bentley Exp $
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);
}

24
games/prboom/patches/patch-src_m_misc_c
View File

@ -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 */

10
games/prboom/pkg/PLIST
View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.3 2004/09/15 00:46:10 espie Exp $
bin/prboom
bin/prboom-game-server
@comment $OpenBSD: PLIST,v 1.4 2013/03/31 21:09:33 bentley Exp $
@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
@ -14,5 +14,5 @@ share/doc/prboom/README
share/doc/prboom/README.compat
share/doc/prboom/README.demos
share/doc/prboom/boom.txt
share/prboom/
share/prboom/prboom.wad
share/doom/
share/doom/prboom.wad