sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-22 03:45:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reduce the differences between `quake*-data' ports:

Browse source 
- 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'
This commit is contained in:
Alexey Dokuchaev 2014-07-08 08:51:31 +00:00
parent 8468884d33
commit 0c65f94d0a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=361201
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
games/quake-data/Makefile.include
View file

@ -5,13 +5,13 @@ Q1PKGNAMEPREFIX?= quake-
Q1DIR?= ${LOCALBASE}/share/quake Q1DIR?= ${LOCALBASE}/share/quake
.if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == ${Q1PKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED) .if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == ${Q1PKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED)
. error include before <bsd.port.options.mk> if using Q1PKGNAMEPREFIX IGNORE= is using Q1PKGNAMEPREFIX, but <bsd.port.options.mk> included too early
.endif .endif
MAKE_ENV+= Q1DIR="${Q1DIR}" MAKE_ENV+= Q1DIR="${Q1DIR}"
PLIST_SUB+= Q1DIR="${Q1DIR:S/${LOCALBASE}\///}" PLIST_SUB+= Q1DIR="${Q1DIR:S|${LOCALBASE}/||}"
SUB_LIST+= Q1DIR="${Q1DIR}" SUB_LIST+= Q1DIR="${Q1DIR}"
.if ${PORTNAME} != "data" .if ${PORTNAME} != data
RUN_DEPENDS+= ${Q1DIR}/id1/pak0.pak:${PORTSDIR}/games/quake-data RUN_DEPENDS+= ${Q1DIR}/id1/pak0.pak:${PORTSDIR}/games/quake-data
.endif .endif

5
games/quake2-data/Makefile.include
View file

@ -48,7 +48,7 @@
Q2PKGNAMEPREFIX?= quake2- Q2PKGNAMEPREFIX?= quake2-
Q2DIR?= ${LOCALBASE}/share/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 IGNORE= is using Q2PKGNAMEPREFIX, but <bsd.port.options.mk> included too early
.endif .endif
@ -56,6 +56,7 @@ MAKE_ENV+= Q2DIR="${Q2DIR}"
PLIST_SUB+= Q2DIR="${Q2DIR:S|${LOCALBASE}/||}" PLIST_SUB+= Q2DIR="${Q2DIR:S|${LOCALBASE}/||}"
SUB_LIST+= Q2DIR="${Q2DIR}" 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 RUN_DEPENDS+= ${Q2DIR}:${PORTSDIR}/games/quake2-data
.endif .endif

9
games/quake3-data/Makefile
View file

@ -5,13 +5,12 @@ PORTNAME= data
DISTVERSION= 1.32b-3 DISTVERSION= 1.32b-3
PORTREVISION= 2 PORTREVISION= 2
CATEGORIES= games CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_IDSOFTWARE} MASTER_SITES= IDSOFTWARE/quake3/linux
MASTER_SITE_SUBDIR= quake3/linux
PKGNAMEPREFIX= ${Q3PKGNAMEPREFIX} PKGNAMEPREFIX= ${Q3PKGNAMEPREFIX}
DISTNAME= linuxq3apoint-${DISTVERSION}.x86 DISTNAME= linuxq3apoint-${DISTVERSION}.x86
EXTRACT_SUFX= .run EXTRACT_SUFX= .run
MAINTAINER= ports@FreeBSD.org MAINTAINER= games@FreeBSD.org
COMMENT= Quake III Arena data files COMMENT= Quake III Arena data files
DATADIR= ${Q3DIR} DATADIR= ${Q3DIR}
@ -32,8 +31,8 @@ TEAMARENA_DESC= Install Quake III Team Arena data files
do-extract: do-extract:
@${RM} -rf ${WRKDIR} @${RM} -rf ${WRKDIR}
@${MKDIR} ${WRKDIR} @${MKDIR} ${WRKDIR}
@cd ${WRKDIR} && ${TAIL} +356 \ @${TAIL} +356 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | ${TAR} xzf - ${TAR} xzf - -C ${WRKDIR}
do-install: do-install:
@${MKDIR} ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DATADIR}

6
games/quake3-data/Makefile.include
View file

@ -5,13 +5,13 @@ Q3PKGNAMEPREFIX?= quake3-
Q3DIR?= ${LOCALBASE}/share/quake3 Q3DIR?= ${LOCALBASE}/share/quake3
.if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == ${Q3PKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED) .if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == ${Q3PKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED)
. error include before <bsd.port.options.mk> if using Q3PKGNAMEPREFIX IGNORE= is using Q3PKGNAMEPREFIX, but <bsd.port.options.mk> included too early
.endif .endif
MAKE_ENV+= Q3DIR="${Q3DIR}" MAKE_ENV+= Q3DIR="${Q3DIR}"
PLIST_SUB+= Q3DIR="${Q3DIR:S/${LOCALBASE}\///}" PLIST_SUB+= Q3DIR="${Q3DIR:S|${LOCALBASE}/||}"
SUB_LIST+= Q3DIR="${Q3DIR}" SUB_LIST+= Q3DIR="${Q3DIR}"
.if ${PORTNAME} != "data" .if ${PORTNAME} != data
RUN_DEPENDS+= ${Q3DIR}/baseq3/pak1.pk3:${PORTSDIR}/games/quake3-data RUN_DEPENDS+= ${Q3DIR}/baseq3/pak1.pk3:${PORTSDIR}/games/quake3-data
.endif .endif