- Update to 0.4.0.2

- Fix build with gcc 4.2/AMD64

PR:		117697
Submitted by:	Dmitry Marakasov <amdmi3@amdmi3.ru> (maintainer)
Approved by:	portmgr (pav)

3 files changed, 9 insertions, 42 deletions

diff --git a/games/diameter/Makefile b/games/diameter/Makefile
index 6dc38220cc1d..2566af59c313 100644
--- a/games/diameter/Makefile
+++ b/games/diameter/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	diameter
-PORTVERSION=	0.4.0.1
-PORTREVISION=	1
+PORTVERSION=	0.4.0.2
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	gamediameter
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	amdmi3@amdmi3.ru
 COMMENT=	Arcade-style game with elements of economy and adventure
@@ -24,7 +22,6 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GL=		yes
 USE_SDL=	sdl mixer image
-USE_GCC=	3.4+
 USE_PYTHON=	yes
 
 WRKSRC=		${WRKDIR}/gamediameter
@@ -34,20 +31,8 @@ CONFIGURE_ENV=	CPPFLAGS="`${SDL_CONFIG} --cflags` -I${X11BASE}/include" \
 
 DATADIR=	${PREFIX}/share/gamediameter
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-.if ${ARCH} == "amd64" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile with GCC 4.2
-.endif
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e '/PKG_CONFIG/ s|libpng|libpng12|' \
-		-e 's|sdl-config|$$SDL_CONFIG|' \
-		-e '/LIBS/ s|-lSDL |`$$SDL_CONFIG --libs` |' \
-		-e '/^CFLAGS=.*march/ d' \
-		-e '/PKG_CHECK_MODULES/ s|^|#|' \
-		${WRKSRC}/configure
-
-.include <bsd.port.post.mk>
+	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|; /^CFLAGS=.*march/ d; \
+		/PKG_CONFIG/ s|libpng|libpng12|' ${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/games/diameter/distinfo b/games/diameter/distinfo
index 9f4dea60bba9..45c44da57a33 100644
--- a/games/diameter/distinfo
+++ b/games/diameter/distinfo
@@ -1,3 +1,3 @@
-MD5 (diameter-0.4.0.1.tar.bz2) = 9a6c397c99188d0dc214b4455c2bf032
-SHA256 (diameter-0.4.0.1.tar.bz2) = c62687bbd469cec4ef99f73bf4682b645119943dbd4f55143f60cc7427afe68f
-SIZE (diameter-0.4.0.1.tar.bz2) = 4760022
+MD5 (diameter-0.4.0.2.tar.bz2) = b9f8c0ea61f21ea33d802da83d28366a
+SHA256 (diameter-0.4.0.2.tar.bz2) = eaa1ba0b35c3ba25c16fa0104a2a3a6096d94c2a45a048006456932e340430ea
+SIZE (diameter-0.4.0.2.tar.bz2) = 4777529
diff --git a/games/diameter/files/patch-src-main.cpp b/games/diameter/files/patch-src-main.cpp
deleted file mode 100644
index 72ffee404f0b..000000000000
--- a/games/diameter/files/patch-src-main.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/main.cpp.orig	Mon Jan 29 18:36:35 2007
-+++ src/main.cpp	Wed Jan 31 16:36:40 2007
-@@ -9,7 +9,6 @@
- #ifdef _POSIX_C_SOURCE	// shut up pyconfig.h complaints
- #undef _POSIX_C_SOURCE
- #endif
--#include <Python.h>
- 
- #ifdef __unix__
- #else
-@@ -41,6 +40,7 @@
- #include "./res/loadworld.h"
- #include "./wor/pylevel.h"
- 
-+#include <Python.h>
- 
- TextureList TTemp;
- UTextureList TextureDelet;