diff -urN /usr/ports/games/asc/Makefile games/asc/Makefile
--- /usr/ports/games/asc/Makefile	2013-12-12 21:50:18.000000000 +0900
+++ games/asc/Makefile	2014-01-06 00:00:00.000000000 +0900
@@ -2,12 +2,11 @@
 # $FreeBSD: head/games/asc/Makefile 336255 2013-12-12 11:14:49Z bapt $
 
 PORTNAME=	asc
-PORTVERSION=	2.5.0.0
-PORTREVISION=	2
+PORTVERSION=	2.6.0.0
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}-hq/ASC%20Source/${PORTVERSION:R} \
-		http://www.asc-hq.org/music/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ASC_MUSICS}
+		http://www.asc-hq.org/music/:music
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ASC_MUSICS:S/$/:music/}
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -27,36 +26,47 @@
 OPTIONS_DEFINE=	MUSIC XVID
 MUSIC_DESC=	Install extra music files
 
-USES=		perl5 pkgconfig
 USE_BZIP2=	yes
+USES=		gmake perl5 pkgconfig
 USE_SDL=	image mixer sound sdl
 USE_WX=		2.4+
 WX_CONF_ARGS=	absolute
 USE_LUA=	5.1
 LUA_COMPS=	lua
 USE_PERL5=	build
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-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%%
-
 CFLAGS+=	-D_UNICODE_BROKEN_
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
+PLIST_FILES=	bin/asc \
+		bin/asc_demount \
+		bin/asc_mapedit \
+		bin/asc_mount \
+		bin/asc_weaponguide \
+		man/man6/asc.6.gz \
+		man/man6/asc_demount.6.gz \
+		man/man6/asc_mapedit.6.gz \
+		man/man6/asc_mount.6.gz \
+		man/man6/asc_weaponguide.6.gz \
+		share/appdata/asc.appdata.xml \
+		%%DATADIR%%/asc2_dlg.zip \
+		%%DATADIR%%/main.ascdat
+PLIST_DIRS=	${ASC_MUSICDIR} \
+		%%DATADIR%%
+PLIST_DIRSTRY=	share/appdata
+
+DESKTOP_ENTRIES="Advanced Strategic Command" "Turn based strategic game" "" \
+		"${PORTNAME}" "" ""
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMUSIC}
 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}
+.for i in ${ASC_MUSICS}
+PLIST_FILES+=	${ASC_MUSICDIR}/${i}
 .endfor
 .else
 .undef ASC_MUSICS
@@ -71,9 +81,8 @@
 
 post-extract:
 .if ${PORT_OPTIONS:MMUSIC}
-.for file in ${ASC_MUSICS}
-	@${TAR} -C ${DISTDIR}/${DIST_SUBDIR} -cf - ${file} | \
-		${TAR} -C ${WRKSRC}/data/music --unlink -xf -
+.for i in ${ASC_MUSICS}
+	@(cd ${DISTDIR}/${DIST_SUBDIR} && ${PAX} -rw ${i} ${WRKSRC}/data/music)
 .endfor
 .endif
 
@@ -85,8 +94,7 @@
 		's|/games/|/|g ; \
 		 s|lua >=|lua-5.1 >=|g ; \
 		 /if test/s|==|=|g' ${WRKSRC}/configure
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	@${REINPLACE_CMD} -e \
+		's|? 0 :|? (void)0 :|' ${WRKSRC}/source/errors.h
 
 .include <bsd.port.mk>
diff -urN /usr/ports/games/asc/distinfo games/asc/distinfo
--- /usr/ports/games/asc/distinfo	2013-11-06 22:00:21.000000000 +0900
+++ games/asc/distinfo	2014-01-06 00:00:00.000000000 +0900
@@ -1,5 +1,5 @@
-SHA256 (asc/asc-2.5.0.0.tar.bz2) = ad6edb629049bda615b7c9b3046ab33d35dbc25de39a5ed15b9279fe48f779c6
-SIZE (asc/asc-2.5.0.0.tar.bz2) = 42084514
+SHA256 (asc/asc-2.6.0.0.tar.bz2) = e59caa549dc8d8a321211f60652cc809cbbf37d000ee85af790e676d9656cbbb
+SIZE (asc/asc-2.6.0.0.tar.bz2) = 42280527
 SHA256 (asc/frontiers.ogg) = eabc9b07d1db07626fa817a30dad23b11aada059e32c08914d2d0cf1d58c7fff
 SIZE (asc/frontiers.ogg) = 4691844
 SHA256 (asc/time_to_strike.ogg) = 0334a027b8a45a5df88e1e3e7db9cace2def02396fbcc794d157289e41c9ad05
diff -urN /usr/ports/games/asc/files/patch-tools-groupfile.cpp games/asc/files/patch-tools-groupfile.cpp
--- /usr/ports/games/asc/files/patch-tools-groupfile.cpp	2013-11-06 22:00:21.000000000 +0900
+++ games/asc/files/patch-tools-groupfile.cpp	1970-01-01 09:00:00.000000000 +0900
@@ -1,10 +0,0 @@
---- source/tools/groupfile.cpp.orig	Sat Oct 30 21:00:02 2004
-+++ source/tools/groupfile.cpp	Sat Oct 30 21:14:57 2004
-@@ -15,6 +15,7 @@
-  *                                                                         *
-  ***************************************************************************/
- #include "groupfile.h"
-+#include <algorithm>
- 
- 
- bool lessCat(AbstractEntry const * a, AbstractEntry const * b) {