- Update to version 2.2.2.

- Use SF macro in MASTER_SITES.
- Redefine EXTRACT_SUFX instead of DISTNAME to avoid changing WRKSRC.
- Change USE_SDL from "yes" (obsolete) to "sdl".
- Respect CFLAGS.
- Remove IGNORE for FreeBSD < 5.x (unsupported).
- Remove files/patch-configure (was integrated).
- Misc format on pkg-message.

PR:		ports/109586
Submitted by:	alepulver (myself)
Approved by:	Travis Poppe <tlp@LiquidX.org> (maintainer)

4 files changed, 17 insertions, 30 deletions

diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile
index 408bf5aa8c6..253d49ee4aa 100644
--- a/games/stratagus/Makefile
+++ b/games/stratagus/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	stratagus
-PORTVERSION=	2.1
-PORTREVISION=	3
+PORTVERSION=	2.2.2
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+MASTER_SITES=	SF
+EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	tlp@liquidx.org
 COMMENT=	Free cross-platform real-time strategy gaming engine
@@ -20,14 +18,11 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
 USE_GMAKE=	yes
 USE_LUA=	5.0
-USE_SDL=	yes
+USE_SDL=	sdl
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
-CFLAGS=		-I${LUA_INCDIR}
-LDFLAGS=	-L${LUA_LIBDIR}
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-		EXTRA_CFLAGS="${CFLAGS}" EXTRA_LIBS="${LDFLAGS}"
-WRKSRC=		${WRKDIR}/stratagus-040702
+CFLAGS+=	-I${LUA_INCDIR}
+CONFIGURE_ENV=	LDFLAGS="-L${LUA_LIBDIR} -lm"
 
 OPTIONS=	OPENGL "Enable OpenGL support" on \
 		MIKMOD "Enable Mikmod support" off \
@@ -37,10 +32,6 @@ PLIST_FILES=	bin/stratagus
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-IGNORE=		does not run properly on FreeBSD 4.x
-.endif
-
 .if defined(WITH_OPENGL)
 CONFIGURE_ARGS+=--with-opengl
 .endif
@@ -57,7 +48,13 @@ LIB_DEPENDS+=	vorbisfile.4:${PORTSDIR}/audio/libvorbis
 CONFIGURE_ARGS+=--without-ogg
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|-ldl||; s|gcc|${CC}|' \
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
 post-install:
+	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD}
 
 .include <bsd.port.post.mk>
diff --git a/games/stratagus/distinfo b/games/stratagus/distinfo
index ae550872662..dc01d2f6450 100644
--- a/games/stratagus/distinfo
+++ b/games/stratagus/distinfo
@@ -1,3 +1,3 @@
-MD5 (stratagus-2.1-src.tar.gz) = ff6b2070b66e8847eeed6bedc24ad8bb
-SHA256 (stratagus-2.1-src.tar.gz) = 1a5fb943ebc9422a18d165ba57deeae406d3d5e2cba171dfe15608732a22326b
-SIZE (stratagus-2.1-src.tar.gz) = 995686
+MD5 (stratagus-2.2.2-src.tar.gz) = 0e116a9d4080dbca6dad78b7d34fec8f
+SHA256 (stratagus-2.2.2-src.tar.gz) = b01417a32358a4f234d2d093fff932e3dd526c1bdba1bf0b95fb6aed52e1c9be
+SIZE (stratagus-2.2.2-src.tar.gz) = 931693
diff --git a/games/stratagus/files/patch-configure b/games/stratagus/files/patch-configure
deleted file mode 100644
index 4384cc74fdf..00000000000
--- a/games/stratagus/files/patch-configure
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./configure.orig	Thu Jul  1 22:46:35 2004
-+++ ./configure	Mon Jul 17 19:23:06 2006
-@@ -3229,9 +3229,6 @@
- 	VIDEO_LIBS="$VIDEO_LIBS -lwsock32 -lws2_32 -lmingwex -lgmon"
-     fi
- fi
--if test "$ARCH" = "bsd"; then
--    VIDEO_LIBS="$VIDEO_LIBS -lc"
--fi
- 
- 
- 
diff --git a/games/stratagus/pkg-message b/games/stratagus/pkg-message
index 869d6ea6909..f7802044232 100644
--- a/games/stratagus/pkg-message
+++ b/games/stratagus/pkg-message
@@ -1,4 +1,5 @@
 ------------------------------------------------------------------------------
+
 NOTE: This is only the engine. If you wish to play a game that uses the
 Stratagus engine, you must manually download the Stratagus game data.
 
@@ -11,4 +12,5 @@ For more information, please take a look at the following URL:
 http://stratagus.sourceforge.net/games.shtml
 
 Enjoy!
+
 ------------------------------------------------------------------------------