diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2014-07-08 08:51:31 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2014-07-08 08:51:31 +0000 |
| commit | 0c65f94d0aa9b6fb6c1dbf68443136b7c8ae97a9 (patch) | |
| tree | ffb83bca73db8505fa31a6a02f1b382119344955 /games/quake2-data | |
| parent | 8468884d337892d23edf18600b42d5bf7a22bf85 (diff) | |
| download | ports-0c65f94d0aa9b6fb6c1dbf68443136b7c8ae97a9.tar.gz ports-0c65f94d0aa9b6fb6c1dbf68443136b7c8ae97a9.zip | |
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'
Notes
Notes:
svn path=/head/; revision=361201
Diffstat (limited to 'games/quake2-data')
| -rw-r--r-- | games/quake2-data/Makefile.include | 5 |
1 files changed, 3 insertions, 2 deletions
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 <bsd.port.options.mk> 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 |