Date: Mon, 24 Mar 2014 00:25:55 +0200 (EET) From: Johannes Jost Meixner <xmj@chaot.net> To: FreeBSD-gnats-submit@freebsd.org Cc: acm@FreeBSD.org, xmj@chaot.net Subject: ports/187865: [PATCH] games/linux-quake4: Stage Message-ID: <18194111755715655594.enqueue@mx12.chaot.net> Resent-Message-ID: <201403232230.s2NMU2Fd051298@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187865
>Category: ports
>Synopsis: [PATCH] games/linux-quake4: Stage
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Mar 23 22:30:02 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Johannes Jost Meixner
>Release: FreeBSD 11.0-CURRENT amd64
>Organization:
Goldener Grund OUe
>Environment:
System: FreeBSD mx12.chaot.net 11.0-CURRENT FreeBSD 11.0-CURRENT #6: Wed Mar 19 11:02:48 EET 2014
>Description:
- Stagify
Port maintainer (acm@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 1.00.2014.03.22 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:
--- linux-quake4-1.4.2.patch begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 348894)
+++ Makefile (working copy)
@@ -3,6 +3,7 @@
PORTNAME= quake4
PORTVERSION= 1.4.2
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= games linux
MASTER_SITES= ${MASTER_SITE_IDSOFTWARE:S|$|quake4/linux/|} \
@@ -29,7 +30,6 @@
OPTIONS_DEFAULT= THREADS
-NO_STAGE= yes
.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>
@@ -58,48 +58,48 @@
do-install:
# Executables
- @${MKDIR} ${PREFIX}/${Q4DIR}
+ @${MKDIR} ${STAGEDIR}${PREFIX}/${Q4DIR}
.for FILE in quake4 q4ded
- ${INSTALL_SCRIPT} ${WRKSRC}/${PKGNAMEPREFIX}${FILE}.sh ${PREFIX}/bin/${PKGNAMEPREFIX}${FILE}
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/FreeBSD/x86/${FILE}.x86 ${PREFIX}/${Q4DIR}
+ ${INSTALL_SCRIPT} ${WRKSRC}/${PKGNAMEPREFIX}${FILE}.sh ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}${FILE}
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/FreeBSD/x86/${FILE}.x86 ${STAGEDIR}${PREFIX}/${Q4DIR}
.endfor
.if ${PORT_OPTIONS:MTHREADS}
- ${INSTALL_SCRIPT} ${WRKSRC}/${PKGNAMEPREFIX}quake4smp.sh ${PREFIX}/bin/${PKGNAMEPREFIX}quake4smp
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/FreeBSD/x86/quake4smp.x86 ${PREFIX}/${Q4DIR}
+ ${INSTALL_SCRIPT} ${WRKSRC}/${PKGNAMEPREFIX}quake4smp.sh ${STAGEDIR}${PREFIX}/bin/${PKGNAMEPREFIX}quake4smp
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/FreeBSD/x86/quake4smp.x86 ${STAGEDIR}${PREFIX}/${Q4DIR}
.endif
# Punkbuster
- @${MKDIR} ${PREFIX}/${Q4DIR}/pb/htm
- @${MKDIR} ${PREFIX}/${Q4DIR}/q4base
+ @${MKDIR} ${STAGEDIR}${PREFIX}/${Q4DIR}/pb/htm
+ @${MKDIR} ${STAGEDIR}${PREFIX}/${Q4DIR}/q4base
@cd ${WRKSRC} && \
${FIND} -E pb -type f -iregex ".*\.(so)" \
- -exec ${INSTALL_DATA} "{}" "${PREFIX}/${Q4DIR}/{}" \; && \
+ -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${PREFIX}/${Q4DIR}/{}" \; && \
${FIND} -E pb/htm -type f -iregex ".*\.(htm)" \
- -exec ${INSTALL_DATA} "{}" "${PREFIX}/${Q4DIR}/{}" \;
+ -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${PREFIX}/${Q4DIR}/{}" \;
# Q4base
@cd ${WRKSRC} && \
${FIND} -E q4base -type f -iregex ".*\.(cfg|scriptcfg|pk4|off)" \
- -exec ${INSTALL_DATA} "{}" "${PREFIX}/${Q4DIR}/{}" \;
+ -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${PREFIX}/${Q4DIR}/{}" \;
# All version (except germany) or only germany version
.if ${PORT_OPTIONS:MGERMANY}
@cd ${WRKSRC}/germany && \
${FIND} -E q4base -type f -iregex ".*\.(pk4)" \
- -exec ${INSTALL_DATA} "{}" "${PREFIX}/${Q4DIR}/{}" \;
+ -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${PREFIX}/${Q4DIR}/{}" \;
.else
@cd ${WRKSRC}/us && \
${FIND} -E q4base -type f -iregex ".*\.(pk4)" \
- -exec ${INSTALL_DATA} "{}" "${PREFIX}/${Q4DIR}/{}" \;
+ -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${PREFIX}/${Q4DIR}/{}" \;
.endif
# Documentation
.if ${PORT_OPTIONS:MDOCS}
@cd ${WRKSRC}/Docs && \
- ${FIND} * -type d -exec ${MKDIR} "${DOCSDIR}/{}" \; && \
- ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/{}" \;
- ${INSTALL_DATA} ${WRKSRC}/License.txt ${DOCSDIR}/LICENSE && \
- ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README && \
- ${INSTALL_DATA} ${WRKSRC}/pb/PBEULA.txt ${DOCSDIR}/PBEULA
+ ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DOCSDIR}/{}" \; && \
+ ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DOCSDIR}/{}" \;
+ ${INSTALL_DATA} ${WRKSRC}/License.txt ${STAGEDIR}${DOCSDIR}/LICENSE && \
+ ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/README && \
+ ${INSTALL_DATA} ${WRKSRC}/pb/PBEULA.txt ${STAGEDIR}${DOCSDIR}/PBEULA
.endif
post-install:
--- linux-quake4-1.4.2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?18194111755715655594.enqueue>