From 688ab61be741f66220dfbf93ffa516bc525506ca Mon Sep 17 00:00:00 2001 From: danfe Date: Tue, 8 Jul 2014 08:51:31 +0000 Subject: Reduce the differences between `quake*-data' ports: - Consistently use vertical bar (pipe) in :S substitutions - Do not abuse .error statement, set IGNORE knob instead - Drop some unnecessary quotation marks in comparisons - Add a comment on why we cannot depend on particular .pak file - Simplify extraction of the `linuxq3apoint-1.32b-3.x86.run' --- games/quake2-data/Makefile.include | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'games/quake2-data') diff --git a/games/quake2-data/Makefile.include b/games/quake2-data/Makefile.include index 3b83e37ccb4d..2f52221b769c 100644 --- a/games/quake2-data/Makefile.include +++ b/games/quake2-data/Makefile.include @@ -48,7 +48,7 @@ Q2PKGNAMEPREFIX?= quake2- Q2DIR?= ${LOCALBASE}/share/quake2 -.if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == "${Q2PKGNAMEPREFIX}" && defined(OPTIONSMKINCLUDED) +.if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == ${Q2PKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED) IGNORE= is using Q2PKGNAMEPREFIX, but included too early .endif @@ -56,6 +56,7 @@ MAKE_ENV+= Q2DIR="${Q2DIR}" PLIST_SUB+= Q2DIR="${Q2DIR:S|${LOCALBASE}/||}" SUB_LIST+= Q2DIR="${Q2DIR}" -.if ${PORTNAME} != "data" +.if ${PORTNAME} != data +# Not depending on the particular .pak file since they are OPTIONS-dependent RUN_DEPENDS+= ${Q2DIR}:${PORTSDIR}/games/quake2-data .endif -- cgit