3 files changed, 36 insertions, 19 deletions

diff --git a/games/quake2-ctf/Makefile b/games/quake2-ctf/Makefile
index 12fa744ce9f6..590346bb51fb 100644
--- a/games/quake2-ctf/Makefile
+++ b/games/quake2-ctf/Makefile
@@ -6,26 +6,27 @@
 #
 
 PORTNAME=	ctf
-PORTVERSION=	1.50
+PORTVERSION=	1.52
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_IDSOFTWARE:S|$|:data,src|}
-MASTER_SITE_SUBDIR=	quake2/ctf/:data \
-			quake2/ctf/source/:src
+MASTER_SITES=	${MASTER_SITE_IDSOFTWARE:S|$|:data|} \
+		http://offload1.icculus.org/quake2/files/:src
+MASTER_SITE_SUBDIR=	quake2/ctf/:data
 PKGNAMEPREFIX=	${Q2PKGNAMEPREFIX}
 DISTFILES=	${CTF_DATA}:data \
 		${CTF_SRC}:src
+DIST_SUBDIR=	quake2lnx
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Quake II CTF (Capture The Flag) modification
 
 USE_ZIP=	yes
-NO_WRKSUBDIR=	yes
+WRKSRC=		${WRKDIR}/${CTF_SRC:S/.tar.gz//}/src/ctf
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/${LATEST_LINK}
 
-CTF_DATA=	q2ctf${PORTVERSION:S/.//}.zip
-CTF_SRC=	q2ctf-1.02-source.shar.Z
+CTF_DATA=	q2ctf150.zip
+CTF_SRC=	quake2-r0.16.2.tar.gz
 
 .include "${.CURDIR}/../quake2-data/Makefile.include"
 
@@ -33,10 +34,10 @@ CTF_SRC=	q2ctf-1.02-source.shar.Z
 
 do-extract:
 	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR} && \
-		uncompress -c ${DISTDIR}/${CTF_SRC} | ${TAIL} +394 | ${SH}
+	@${TAR} zxf ${DISTDIR}/${DIST_SUBDIR}/${CTF_SRC} -C ${WRKDIR} \
+		--include "${CTF_SRC:S/.tar.gz//}/src/ctf/*"
 	@${UNZIP_CMD} -aq -d ${WRKDIR}/ctf \
-		${DISTDIR}/${CTF_DATA} -x *.dll *.ico
+		${DISTDIR}/${DIST_SUBDIR}/${CTF_DATA} -x *.dll *.ico
 
 post-extract:
 	@${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC}
@@ -45,11 +46,12 @@ do-install:
 	${MKDIR} ${Q2DIR}/ctf
 	${INSTALL_PROGRAM} ${WRKSRC}/game.so ${Q2DIR}/ctf
 .for f in *.cfg *.pak
-	${INSTALL_DATA} ${WRKSRC}/ctf/${f} ${Q2DIR}/ctf
+	${INSTALL_DATA} ${WRKDIR}/ctf/${f} ${Q2DIR}/ctf
 .endfor
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/ctf/readme.txt ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/ctf/readme.txt ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/games/quake2-ctf/distinfo b/games/quake2-ctf/distinfo
index 43bd65563abc..83a96032eb70 100644
--- a/games/quake2-ctf/distinfo
+++ b/games/quake2-ctf/distinfo
@@ -1,6 +1,6 @@
-MD5 (q2ctf150.zip) = 89218caf5950b17663d4f81df7e8f893
-SHA256 (q2ctf150.zip) = 5e85db1bff51aa53e12307bd3251aa4b507b5a7a47004a862d8ae3777c5a87c1
-SIZE (q2ctf150.zip) = 9559697
-MD5 (q2ctf-1.02-source.shar.Z) = 1644c4fd145a74160f3f013452ee4103
-SHA256 (q2ctf-1.02-source.shar.Z) = e6efdfddb55ba9f573e030886032a6609590cf2a992bdea1630bd217afa1d72a
-SIZE (q2ctf-1.02-source.shar.Z) = 277487
+MD5 (quake2lnx/q2ctf150.zip) = 89218caf5950b17663d4f81df7e8f893
+SHA256 (quake2lnx/q2ctf150.zip) = 5e85db1bff51aa53e12307bd3251aa4b507b5a7a47004a862d8ae3777c5a87c1
+SIZE (quake2lnx/q2ctf150.zip) = 9559697
+MD5 (quake2lnx/quake2-r0.16.2.tar.gz) = 872fee27fb13a2a4c8876d5973c3c691
+SHA256 (quake2lnx/quake2-r0.16.2.tar.gz) = 98cea3cbd70bd1f195e5190d0ae047c636e00e21dbc6cc5bdee4acd52876d3e9
+SIZE (quake2lnx/quake2-r0.16.2.tar.gz) = 1496377
diff --git a/games/quake2-ctf/pkg-plist b/games/quake2-ctf/pkg-plist
index 6b618e4931bb..e6561ea19671 100644
--- a/games/quake2-ctf/pkg-plist
+++ b/games/quake2-ctf/pkg-plist
@@ -1,7 +1,22 @@
+%%PORTDOCS%%%%DOCSDIR%%/admin.gif
+%%PORTDOCS%%%%DOCSDIR%%/adminset.gif
+%%PORTDOCS%%%%DOCSDIR%%/automac.gif
+%%PORTDOCS%%%%DOCSDIR%%/ghost.jpg
+%%PORTDOCS%%%%DOCSDIR%%/grapple.jpg
+%%PORTDOCS%%%%DOCSDIR%%/layout.jpg
+%%PORTDOCS%%%%DOCSDIR%%/mainctf_back.jpg
+%%PORTDOCS%%%%DOCSDIR%%/menu.gif
+%%PORTDOCS%%%%DOCSDIR%%/q2ctf.html
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/say_team.gif
+%%PORTDOCS%%%%DOCSDIR%%/stats.jpg
+%%PORTDOCS%%%%DOCSDIR%%/tech1.gif
+%%PORTDOCS%%%%DOCSDIR%%/tech2.gif
+%%PORTDOCS%%%%DOCSDIR%%/tech3.gif
+%%PORTDOCS%%%%DOCSDIR%%/tech4.gif
 %%Q2DIR%%/ctf/game.so
 %%Q2DIR%%/ctf/pak0.pak
 %%Q2DIR%%/ctf/pak1.pak
 %%Q2DIR%%/ctf/server.cfg
-%%PORTDOCS%%%%DOCSDIR%%/readme.txt
 @dirrm %%Q2DIR%%/ctf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%