- Update to version 2.5.0.0

PR:		ports/168601
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

2 files changed, 14 insertions, 16 deletions

diff --git a/games/asc/Makefile b/games/asc/Makefile
index e2df070bf129..0cf2b37255e8 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	asc
-PORTVERSION=	2.4.0.0
-PORTREVISION=	2
+PORTVERSION=	2.5.0.0
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}-hq/ASC%20Source/${PORTVERSION:R} \
 		http://www.asc-hq.org/music/
@@ -18,6 +17,8 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A turn based, multiplayer strategic game with very nice graphics
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/lib/libloki.so:${PORTSDIR}/devel/loki
 LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis \
@@ -26,8 +27,8 @@ LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis \
 		expat.6:${PORTSDIR}/textproc/expat2
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-OPTIONS=	MUSIC "Install extra music files" off \
-		XVID "Enable Xvid support" off
+OPTIONS_DEFINE=	MUSIC XVID
+MUSIC_DESC=	Install extra music files
 
 USE_BZIP2=	yes
 USE_SDL=	image mixer sound sdl
@@ -38,6 +39,7 @@ LUA_COMPS=	lua
 USE_PERL5_BUILD=yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+MAKE_JOBS_SAFE=	yes
 
 MAN6=		asc.6 asc_demount.6 asc_mapedit.6 asc_mount.6 \
 		asc_weaponguide.6
@@ -50,9 +52,9 @@ CFLAGS+=	-D_UNICODE_BROKEN_
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_MUSIC)
+.if ${PORT_OPTIONS:MMUSIC}
 ASC_MUSICS=	frontiers.ogg time_to_strike.ogg machine_wars.ogg
 ASC_MUSICDIR=	%%DATADIR%%/music
 .for file in ${ASC_MUSICS}
@@ -63,14 +65,14 @@ PLIST_FILES+=	${ASC_MUSICDIR}/${file}
 .undef ASC_MUSICDIR
 .endif
 
-.if defined(WITH_XVID)
+.if ${PORT_OPTIONS:MXVID}
 LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
 .else
 CONFIGURE_ENV+=	ac_cv_lib_xvidcore_xvid_encore=no
 .endif
 
 post-extract:
-.if defined(WITH_MUSIC)
+.if ${PORT_OPTIONS:MMUSIC}
 .for file in ${ASC_MUSICS}
 	@${TAR} -C ${DISTDIR}/${DIST_SUBDIR} -cf - ${file} | \
 		${TAR} -C ${WRKSRC}/data/music --unlink -xf -
@@ -78,13 +80,9 @@ post-extract:
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "*.cpp" -print0 | ${XARGS} -0 \
-		${REINPLACE_CMD} -e \
-		's|<malloc\.h>|<stdlib.h>|g'
 	@${FIND} ${WRKSRC} -name "Makefile.in" -print0 | ${XARGS} -0 \
 		${REINPLACE_CMD} -e \
-		's|/games/|/|g ; \
-		 s|$$(srcdir)/asc_makegfx.6||g'
+		's|/games/|/|g'
 	@${REINPLACE_CMD} -e \
 		's|/games/|/|g ; \
 		 s|lua >=|lua-5.1 >=|g ; \
@@ -93,4 +91,4 @@ post-patch:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/asc/distinfo b/games/asc/distinfo
index 87765d8f7c7e..40c1266f1dd9 100644
--- a/games/asc/distinfo
+++ b/games/asc/distinfo
@@ -1,5 +1,5 @@
-SHA256 (asc/asc-2.4.0.0.tar.bz2) = 100e0eb26abeec101209f7e40c15286c4ee87f47aa6df9b5f13352fd080d01e4
-SIZE (asc/asc-2.4.0.0.tar.bz2) = 38154743
+SHA256 (asc/asc-2.5.0.0.tar.bz2) = ad6edb629049bda615b7c9b3046ab33d35dbc25de39a5ed15b9279fe48f779c6
+SIZE (asc/asc-2.5.0.0.tar.bz2) = 42084514
 SHA256 (asc/frontiers.ogg) = eabc9b07d1db07626fa817a30dad23b11aada059e32c08914d2d0cf1d58c7fff
 SIZE (asc/frontiers.ogg) = 4691844
 SHA256 (asc/time_to_strike.ogg) = 0334a027b8a45a5df88e1e3e7db9cace2def02396fbcc794d157289e41c9ad05