diff -urN /usr/ports/games/xblast/Makefile games/xblast/Makefile
--- /usr/ports/games/xblast/Makefile	2011-07-03 15:09:59.000000000 +0900
+++ games/xblast/Makefile	2011-07-31 22:16:55.000000000 +0900
@@ -9,30 +9,32 @@
 PORTVERSION=	2.10.4
 PORTREVISION=	8
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}/Sources/${PORTVERSION} \
-			${PORTNAME}/Images/${IMAGES_DATE} \
-			${PORTNAME}/Levels/${LEVELS_DATE} \
-			${PORTNAME}/Models/${MODELS_DATE}
+MASTER_SITES=	SF/${PORTNAME}/Sources/${PORTVERSION} \
+		SF/${PORTNAME}/Images/${IMAGES_DATE}:images \
+		SF/${PORTNAME}/Levels/${LEVELS_DATE}:levels \
+		SF/${PORTNAME}/Models/${MODELS_DATE}:models
 .if !defined(WITHOUT_SOUND)
-MASTER_SITE_SUBDIR+=	${PORTNAME}/Musics/${MUSICS_DATE} \
-			${PORTNAME}/Sounds/${SOUNDS_DATE}
+MASTER_SITES+=	SF/${PORTNAME}/Musics/${MUSICS_DATE}:musics \
+		SF/${PORTNAME}/Sounds/${SOUNDS_DATE}:sounds
 .else
 PKGNAMESUFFIX=	-nosound
 .endif
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		images-${IMAGES_DATE}${EXTRACT_SUFX} \
-		levels-${LEVELS_DATE}${EXTRACT_SUFX} \
-		models-${MODELS_DATE}${EXTRACT_SUFX}
+		images-${IMAGES_DATE}${EXTRACT_SUFX}:images \
+		levels-${LEVELS_DATE}${EXTRACT_SUFX}:levels \
+		models-${MODELS_DATE}${EXTRACT_SUFX}:models
 .if !defined(WITHOUT_SOUND)
-DISTFILES+=	musics-${MUSICS_DATE}${EXTRACT_SUFX} \
-		sounds${EXTRACT_SUFX}
+DISTFILES+=	musics-${MUSICS_DATE}${EXTRACT_SUFX}:musics \
+		sounds${EXTRACT_SUFX}:sounds
 .endif
 DIST_SUBDIR=	xblast
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multi-player real-time strategy game for X11
 
+LICENSE=	GPLv2 GPLv3
+LICENSE_COMB=	dual
+
 .if defined(WITHOUT_SOUND)
 WITHOUT_SDL=	yes
 .endif
@@ -41,10 +43,11 @@
 .endif
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-admin
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
 		AUTOMAKE="${TRUE}"
+MAKE_JOBS_SAFE=	yes
 
 MAN6=		xblast.6