Update to 2.4.0.0

PR:		ports/150675
Submitted by:	KATO Tsuguru <tkato432 at yahoo.com>

3 files changed, 73 insertions, 61 deletions

diff --git a/games/asc/Makefile b/games/asc/Makefile
index 6befcc848780..e6b4e66b29c4 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -6,58 +6,89 @@
 #
 
 PORTNAME=	asc
-PORTVERSION=	1.16.4.0
-PORTREVISION=	6
+PORTVERSION=	2.4.0.0
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}-hq/ASC%20Source/1.16.4
-DISTNAME=	${PORTNAME}-source-${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}-hq/ASC%20Source/${PORTVERSION:R} \
+		http://www.asc-hq.org/music/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ASC_MUSICS}
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A turn based, multiplayer strategic game with very nice graphics
 
-LIB_DEPENDS=	paragui.4:${PORTSDIR}/x11-toolkits/paragui \
-		sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
+		${LOCALBASE}/lib/libloki.so:${PORTSDIR}/devel/loki
+LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis \
+		boost_regex.4:${PORTSDIR}/devel/boost-libs \
+		sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
+		expat.6:${PORTSDIR}/textproc/expat2
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+OPTIONS=	MUSIC "Install extra music files" off \
+		XVID "Enable Xvid support" off
 
-USE_SDL=	image mm mixer sdl
 USE_BZIP2=	yes
-USE_GMAKE=	yes
+USE_SDL=	image mixer sound sdl
+USE_WX=		2.4+
+WX_CONF_ARGS=	absolute
+USE_LUA=	5.1
+LUA_COMPS=	lua
 USE_PERL5_BUILD=yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="`${SDL_CONFIG} --cflags`" \
-		CXXFLAGS="-D_UNICODE_BROKEN_" \
-		LIBS="`${SDL_CONFIG} --libs` -lm"
-
-CONFIGURE_ARGS=	--disable-paraguitest	\
-		--prefix=${PREFIX}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-OPTIONS=	MUSIC "Install extra music files" off
+MAN6=		asc.6 asc_demount.6 asc_mapedit.6 asc_mount.6 \
+		asc_weaponguide.6
+PLIST_FILES=	bin/asc bin/asc_demount bin/asc_mapedit bin/asc_mount \
+		bin/asc_weaponguide \
+		%%DATADIR%%/asc2_dlg.zip %%DATADIR%%/main.ascdat
+PLIST_DIRS=	${ASC_MUSICDIR} %%DATADIR%%
 
-MAN6=		asc.6 asc_demount.6 asc_mount.6 asc_mapedit.6 asc_makegfx.6 asc_weaponguide.6
+CFLAGS+=	-D_UNICODE_BROKEN_
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_MUSIC)
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} frontiers.mp3 time_to_strike.mp3 machine_wars.mp3
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-PLIST_SUB+=	MUSIC:=""
+ASC_MUSICS=	frontiers.ogg time_to_strike.ogg machine_wars.ogg
+ASC_MUSICDIR=	%%DATADIR%%/music
+.for file in ${ASC_MUSICS}
+PLIST_FILES+=	${ASC_MUSICDIR}/${file}
+.endfor
+.else
+.undef ASC_MUSICS
+.undef ASC_MUSICDIR
+.endif
+
+.if defined(WITH_XVID)
+LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
 .else
-PLIST_SUB+=	MUSIC:="@comment "
+CONFIGURE_ENV+=	ac_cv_lib_xvidcore_xvid_encore=no
 .endif
 
-pre-configure:
+post-extract:
 .if defined(WITH_MUSIC)
-	${CP}  ${DISTDIR}/frontiers.mp3 ${WRKSRC}/data/music
-	${CP}  ${DISTDIR}/time_to_strike.mp3 ${WRKSRC}/data/music
-	${CP}  ${DISTDIR}/machine_wars.mp3 ${WRKSRC}/data/music
+.for file in ${ASC_MUSICS}
+	@${TAR} -C ${DISTDIR}/${DIST_SUBDIR} -cf - ${file} | \
+		${TAR} -C ${WRKSRC}/data/music --unlink -xf -
+.endfor
 .endif
 
-pre-build:
-	@${FIND} ${WRKSRC}/source -name \*.cpp | ${XARGS} ${REINPLACE_CMD} \
-		-e 's|<malloc.h>|<stdlib.h>|'
-	@${FIND} ${WRKSRC}/source -name \*.h | ${XARGS} ${REINPLACE_CMD} \
-		-e 's|<malloc.h>|<stdlib.h>|'
+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'
+	@${REINPLACE_CMD} -e \
+		's|/games/|/|g ; \
+		 s|lua >=|lua-5.1 >=|g ; \
+		 /if test/s|==|=|g' ${WRKSRC}/configure
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/games/asc/distinfo b/games/asc/distinfo
index cf0d9bd45a93..9eb7157c875c 100644
--- a/games/asc/distinfo
+++ b/games/asc/distinfo
@@ -1,12 +1,12 @@
-MD5 (asc-source-1.16.4.0.tar.bz2) = 9d0f7ff5c33271e096753ef07d768798
-SHA256 (asc-source-1.16.4.0.tar.bz2) = 9c69f1197117116a22612a6823c34ad5d30d7fc634ee35f9a6d10395aa272264
-SIZE (asc-source-1.16.4.0.tar.bz2) = 11730677
-MD5 (frontiers.mp3) = 560f5783836b309906e57e77417f3864
-SHA256 (frontiers.mp3) = a0b1f65897eb122c1748ba08d5a376029750a1b035bf0202ebbeb9fd0176fd28
-SIZE (frontiers.mp3) = 4407769
-MD5 (time_to_strike.mp3) = f0ab3c633f51430af0445ecaa02e3197
-SHA256 (time_to_strike.mp3) = a330211d1a8ce1ab6ea19cc4a02e207a8cd4cede4f3946f9a0012c7d0523de54
-SIZE (time_to_strike.mp3) = 3242969
-MD5 (machine_wars.mp3) = c383139928613c7b081835c3d4a28fa8
-SHA256 (machine_wars.mp3) = e7b0337656a1dd9c4809bb9a620a015c1bc3898d7dde6ba2e2a0e7c0ce12313b
-SIZE (machine_wars.mp3) = 2905989
+MD5 (asc/asc-2.4.0.0.tar.bz2) = 8c18a7cf84cb53b04527d864301d405d
+SHA256 (asc/asc-2.4.0.0.tar.bz2) = 100e0eb26abeec101209f7e40c15286c4ee87f47aa6df9b5f13352fd080d01e4
+SIZE (asc/asc-2.4.0.0.tar.bz2) = 38154743
+MD5 (asc/frontiers.ogg) = c27415246734d59e27e6a786ee4820d2
+SHA256 (asc/frontiers.ogg) = eabc9b07d1db07626fa817a30dad23b11aada059e32c08914d2d0cf1d58c7fff
+SIZE (asc/frontiers.ogg) = 4691844
+MD5 (asc/time_to_strike.ogg) = 0f4de5275ab649f4426d110840e3e1ea
+SHA256 (asc/time_to_strike.ogg) = 0334a027b8a45a5df88e1e3e7db9cace2def02396fbcc794d157289e41c9ad05
+SIZE (asc/time_to_strike.ogg) = 3830679
+MD5 (asc/machine_wars.ogg) = b4421ddd67a9e44d90a49a1d8bdf44c3
+SHA256 (asc/machine_wars.ogg) = bd7f330c06090d98e5ba0dac5a691af1804ba383b783b7b2f960bc2e53400a77
+SIZE (asc/machine_wars.ogg) = 3138308
diff --git a/games/asc/pkg-plist b/games/asc/pkg-plist
deleted file mode 100644
index 33b7a2f50175..000000000000
--- a/games/asc/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-bin/asc
-bin/asc_demount
-bin/asc_makegfx
-bin/asc_mapedit
-bin/asc_mount
-bin/asc_weaponguide
-share/games/asc/asc_dlg.zip
-share/games/asc/buildings.con
-share/games/asc/main.con
-share/games/asc/mk1.con
-share/games/asc/trrobj.con
-share/games/asc/trrobj2.con
-share/games/asc/units-mk3.con
-%%MUSIC:%%share/games/asc/music/frontiers.mp3
-%%MUSIC:%%share/games/asc/music/time_to_strike.mp3
-%%MUSIC:%%share/games/asc/music/machine_wars.mp3
-%%MUSIC:%%@dirrm share/games/asc/music
-@dirrm share/games/asc
-@dirrmtry share/games