From owner-svn-ports-all@FreeBSD.ORG Tue Jul 8 08:51:32 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CF390FCB; Tue, 8 Jul 2014 08:51:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BC26E2A8F; Tue, 8 Jul 2014 08:51:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s688pWuH038761; Tue, 8 Jul 2014 08:51:32 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s688pVNg038755; Tue, 8 Jul 2014 08:51:31 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201407080851.s688pVNg038755@svn.freebsd.org> From: Alexey Dokuchaev Date: Tue, 8 Jul 2014 08:51:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361201 - in head/games: quake-data quake2-data quake3-data X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jul 2014 08:51:32 -0000 Author: danfe Date: Tue Jul 8 08:51:31 2014 New Revision: 361201 URL: http://svnweb.freebsd.org/changeset/ports/361201 QAT: https://qat.redports.org/buildarchive/r361201/ Log: 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' Modified: head/games/quake-data/Makefile.include head/games/quake2-data/Makefile.include head/games/quake3-data/Makefile head/games/quake3-data/Makefile.include Modified: head/games/quake-data/Makefile.include ============================================================================== --- head/games/quake-data/Makefile.include Tue Jul 8 08:47:41 2014 (r361200) +++ head/games/quake-data/Makefile.include Tue Jul 8 08:51:31 2014 (r361201) @@ -5,13 +5,13 @@ Q1PKGNAMEPREFIX?= quake- Q1DIR?= ${LOCALBASE}/share/quake .if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == ${Q1PKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED) -. error include before if using Q1PKGNAMEPREFIX +IGNORE= is using Q1PKGNAMEPREFIX, but included too early .endif MAKE_ENV+= Q1DIR="${Q1DIR}" -PLIST_SUB+= Q1DIR="${Q1DIR:S/${LOCALBASE}\///}" +PLIST_SUB+= Q1DIR="${Q1DIR:S|${LOCALBASE}/||}" SUB_LIST+= Q1DIR="${Q1DIR}" -.if ${PORTNAME} != "data" +.if ${PORTNAME} != data RUN_DEPENDS+= ${Q1DIR}/id1/pak0.pak:${PORTSDIR}/games/quake-data .endif Modified: head/games/quake2-data/Makefile.include ============================================================================== --- head/games/quake2-data/Makefile.include Tue Jul 8 08:47:41 2014 (r361200) +++ head/games/quake2-data/Makefile.include Tue Jul 8 08:51:31 2014 (r361201) @@ -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 Modified: head/games/quake3-data/Makefile ============================================================================== --- head/games/quake3-data/Makefile Tue Jul 8 08:47:41 2014 (r361200) +++ head/games/quake3-data/Makefile Tue Jul 8 08:51:31 2014 (r361201) @@ -5,13 +5,12 @@ PORTNAME= data DISTVERSION= 1.32b-3 PORTREVISION= 2 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_IDSOFTWARE} -MASTER_SITE_SUBDIR= quake3/linux +MASTER_SITES= IDSOFTWARE/quake3/linux PKGNAMEPREFIX= ${Q3PKGNAMEPREFIX} DISTNAME= linuxq3apoint-${DISTVERSION}.x86 EXTRACT_SUFX= .run -MAINTAINER= ports@FreeBSD.org +MAINTAINER= games@FreeBSD.org COMMENT= Quake III Arena data files DATADIR= ${Q3DIR} @@ -32,8 +31,8 @@ TEAMARENA_DESC= Install Quake III Team do-extract: @${RM} -rf ${WRKDIR} @${MKDIR} ${WRKDIR} - @cd ${WRKDIR} && ${TAIL} +356 \ - ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | ${TAR} xzf - + @${TAIL} +356 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \ + ${TAR} xzf - -C ${WRKDIR} do-install: @${MKDIR} ${STAGEDIR}${DATADIR} Modified: head/games/quake3-data/Makefile.include ============================================================================== --- head/games/quake3-data/Makefile.include Tue Jul 8 08:47:41 2014 (r361200) +++ head/games/quake3-data/Makefile.include Tue Jul 8 08:51:31 2014 (r361201) @@ -5,13 +5,13 @@ Q3PKGNAMEPREFIX?= quake3- Q3DIR?= ${LOCALBASE}/share/quake3 .if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == ${Q3PKGNAMEPREFIX} && defined(OPTIONSMKINCLUDED) -. error include before if using Q3PKGNAMEPREFIX +IGNORE= is using Q3PKGNAMEPREFIX, but included too early .endif MAKE_ENV+= Q3DIR="${Q3DIR}" -PLIST_SUB+= Q3DIR="${Q3DIR:S/${LOCALBASE}\///}" +PLIST_SUB+= Q3DIR="${Q3DIR:S|${LOCALBASE}/||}" SUB_LIST+= Q3DIR="${Q3DIR}" -.if ${PORTNAME} != "data" +.if ${PORTNAME} != data RUN_DEPENDS+= ${Q3DIR}/baseq3/pak1.pk3:${PORTSDIR}/games/quake3-data .endif