From 0ae102bc5d51a0a76be84cd7cadc335a6b30ffac Mon Sep 17 00:00:00 2001 From: Christoph Mallon Date: Tue, 12 Feb 2013 19:53:44 +0100 Subject: [PATCH] games/quake2-ctf: Set NO_WRKSUBDIR and BUILD_WRKSRC instead of abusing WRKSRC. This allows simplification of USE_DOS2UNIX patterns. --- games/quake2-ctf/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/games/quake2-ctf/Makefile b/games/quake2-ctf/Makefile index f0204d4..ebdec23 100644 --- a/games/quake2-ctf/Makefile +++ b/games/quake2-ctf/Makefile @@ -20,8 +20,10 @@ MAINTAINER= danfe@FreeBSD.org COMMENT= Quake II CTF (Capture The Flag) modification USE_ZIP= yes -USE_DOS2UNIX= ../../../ctf/readme.txt ../../../ctf/server.cfg -WRKSRC= ${WRKDIR}/${CTF_SRC:S/.tar.gz//}/src/ctf +USE_DOS2UNIX= ctf/readme.txt ctf/server.cfg +NO_WRKSUBDIR= yes +BUILD_WRKSRC= ${WRKSRC}/${CTF_SRC:S/.tar.gz//}/src/ctf +PATCH_WRKSRC= ${BUILD_WRKSRC} LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK} @@ -41,17 +43,17 @@ do-extract: ${DISTDIR}/${DIST_SUBDIR}/${CTF_DATA} -x *.dll *.ico post-extract: - @${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC} + @${CP} ${FILESDIR}/${MAKEFILE} ${BUILD_WRKSRC} do-install: ${MKDIR} ${Q2DIR}/ctf - ${INSTALL_PROGRAM} ${WRKSRC}/game.so ${Q2DIR}/ctf + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/game.so ${Q2DIR}/ctf .for f in *.cfg *.pak ${INSTALL_DATA} ${WRKDIR}/ctf/${f} ${Q2DIR}/ctf .endfor .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR} + ${INSTALL_DATA} ${BUILD_WRKSRC}/docs/* ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/ctf/readme.txt ${DOCSDIR} .endif -- 1.8.1.3