Fix build with -fno-common

While here add dependencies reported as missing by stage-qa.

4 files changed, 54 insertions, 6 deletions

diff --git a/games/prboom-plus/Makefile b/games/prboom-plus/Makefile
index 2e9294aaddbe..64f650880bab 100644
--- a/games/prboom-plus/Makefile
+++ b/games/prboom-plus/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	prboom-plus
 PORTVERSION=	2.5.1.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	SF
 
@@ -14,22 +14,26 @@ LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libsmpeg.so:multimedia/smpeg \
-		libpng.so:graphics/png
+		libpng.so:graphics/png \
+		libmad.so:audio/libmad \
+		libfluidsynth.so:audio/fluidsynth \
+		libvorbisfile.so:audio/libvorbis
 
 USES=		gmake localbase sdl
-USE_SDL=	mixer net sdl
+USE_GL=		gl
+USE_SDL=	image mixer net sdl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-waddir=${DATADIR}
 
+DATADIR=	${DMDIR}
+
 OPTIONS_DEFINE=	DOCS OPENGL
 OPTIONS_DEFAULT=OPENGL
 
-DATADIR=	${DMDIR}
-
-OPENGL_CONFIGURE_ENABLE=	gl
 OPENGL_USES=	gl
 OPENGL_USE=	GL=glu
+OPENGL_CONFIGURE_ENABLE=	gl
 
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
diff --git a/games/prboom-plus/files/patch-src_doomstat.c b/games/prboom-plus/files/patch-src_doomstat.c
new file mode 100644
index 000000000000..4ec38f26edec
--- /dev/null
+++ b/games/prboom-plus/files/patch-src_doomstat.c
@@ -0,0 +1,11 @@
+--- src/doomstat.c.orig	2010-12-16 21:37:35 UTC
++++ src/doomstat.c
+@@ -57,7 +57,7 @@ GameExe_t game_exe;
+ 
+ // e6y
+ // it's required for demos recorded in "demo compatibility" mode by boom201 for example
+-int demover;
++extern int demover;
+ 
+ int comp[COMP_TOTAL], default_comp[COMP_TOTAL];    // killough 10/98
+ 
diff --git a/games/prboom-plus/files/patch-src_gl__intern.h b/games/prboom-plus/files/patch-src_gl__intern.h
new file mode 100644
index 000000000000..d015d991eadb
--- /dev/null
+++ b/games/prboom-plus/files/patch-src_gl__intern.h
@@ -0,0 +1,22 @@
+--- src/gl_intern.h.orig	2011-10-05 10:23:00 UTC
++++ src/gl_intern.h
+@@ -450,8 +450,8 @@ void gld_StaticLightAlpha(float light, float alpha);
+ void gld_InitLightTable(void);
+ typedef float (*gld_CalcLightLevel_f)(int lightlevel);
+ typedef float (*gld_Calc2DLightLevel_f)(int lightlevel);
+-gld_CalcLightLevel_f gld_CalcLightLevel;
+-gld_Calc2DLightLevel_f gld_Calc2DLightLevel;
++extern gld_CalcLightLevel_f gld_CalcLightLevel;
++extern gld_Calc2DLightLevel_f gld_Calc2DLightLevel;
+ 
+ //fog
+ extern int gl_fog;
+@@ -459,7 +459,7 @@ extern int gl_use_fog;
+ void gl_EnableFog(int on);
+ void gld_SetFog(float fogdensity);
+ typedef float (*gld_CalcFogDensity_f)(sector_t *sector, int lightlevel, GLDrawItemType type);
+-gld_CalcFogDensity_f gld_CalcFogDensity;
++extern gld_CalcFogDensity_f gld_CalcFogDensity;
+ 
+ //HQ resize
+ unsigned char* gld_HQResize(GLTexture *gltexture, unsigned char *inputBuffer, int inWidth, int inHeight, int *outWidth, int *outHeight);
diff --git a/games/prboom-plus/files/patch-src_gl__light.c b/games/prboom-plus/files/patch-src_gl__light.c
new file mode 100644
index 000000000000..3a098613e7ee
--- /dev/null
+++ b/games/prboom-plus/files/patch-src_gl__light.c
@@ -0,0 +1,11 @@
+--- src/gl_light.c.orig	2011-08-21 10:39:08 UTC
++++ src/gl_light.c
+@@ -76,6 +76,8 @@ static float lighttable_glboom[5][256];
+ static float lighttable_gzdoom[256];
+ static float lighttable_fogbased[256];
+ 
++gld_Calc2DLightLevel_f gld_Calc2DLightLevel;
++
+ static void gld_InitLightTable_glboom(void);
+ static void gld_InitLightTable_gzdoom(void);
+ static void gld_InitLightTable_fogbased(void);