Date: Tue, 8 Jul 2014 07:07:05 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361191 - head/games/quake2-data Message-ID: <201407080707.s68775Fp087810@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Tue Jul 8 07:07:05 2014 New Revision: 361191 URL: http://svnweb.freebsd.org/changeset/ports/361191 QAT: https://qat.redports.org/buildarchive/r361191/ Log: - Cleanup, modernize MASTER_SITES and optimize away MASTER_SITE_SUBDIR - Switch to using vertical bars as regex separators, since they do not require escaping of the slash (when used as path separator) - Move OPTIONS block where it belongs (closer to <bsd.port.options.mk>) - Turn .error into IGNORE statement; reclaim maintainership back Modified: head/games/quake2-data/Makefile head/games/quake2-data/Makefile.include Modified: head/games/quake2-data/Makefile ============================================================================== --- head/games/quake2-data/Makefile Tue Jul 8 07:05:54 2014 (r361190) +++ head/games/quake2-data/Makefile Tue Jul 8 07:07:05 2014 (r361191) @@ -5,34 +5,31 @@ PORTNAME= data PORTVERSION= 3.20 PORTREVISION= 3 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_IDSOFTWARE:S|$|:data,src|} -MASTER_SITE_SUBDIR= quake2/:data \ - quake2/source/:src +MASTER_SITES= IDSOFTWARE/quake2/:data IDSOFTWARE/quake2/source/:src PKGNAMEPREFIX= ${Q2PKGNAMEPREFIX} -DISTFILES= ${Q2_UPDATE}:data \ - ${Q2_SRC}:src +DISTFILES= ${Q2_UPDATE}:data ${Q2_SRC}:src -MAINTAINER= ports@FreeBSD.org +MAINTAINER= danfe@FreeBSD.org COMMENT= Quake II data files # XXX we need info-unzip for q2-314-demo-x86.exe USES= zip:infozip NO_WRKSUBDIR= yes -OPTIONS_DEFINE= MANUAL OPTIMIZED_CFLAGS SHAREWARE -OPTIONS_DEFAULT= OPTIMIZED_CFLAGS - -MANUAL_DESC= Install game HTML manual -SHAREWARE_DESC= Install demo version of the game data - LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} DATADIR= ${Q2DIR} DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK} Q2_DEMO= q2-314-demo-x86.exe -Q2_SRC= q2src${PORTVERSION:S/.//}.shar.Z +Q2_SRC= q2src${PORTVERSION:S|.||}.shar.Z Q2_UPDATE= q2-${PORTVERSION}-x86-full.exe +OPTIONS_DEFINE= MANUAL OPTIMIZED_CFLAGS SHAREWARE +OPTIONS_DEFAULT= OPTIMIZED_CFLAGS + +MANUAL_DESC= Install the game HTML manual +SHAREWARE_DESC= Install demo version of the game data + .include "Makefile.include" # must be included before bsd.port.options.mk .include <bsd.port.options.mk> Modified: head/games/quake2-data/Makefile.include ============================================================================== --- head/games/quake2-data/Makefile.include Tue Jul 8 07:05:54 2014 (r361190) +++ head/games/quake2-data/Makefile.include Tue Jul 8 07:07:05 2014 (r361191) @@ -49,11 +49,11 @@ Q2PKGNAMEPREFIX?= quake2- Q2DIR?= ${LOCALBASE}/share/quake2 .if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == "${Q2PKGNAMEPREFIX}" && defined(OPTIONSMKINCLUDED) -. error include before <bsd.port.options.mk> if using Q2PKGNAMEPREFIX +IGNORE= is using Q2PKGNAMEPREFIX, but <bsd.port.options.mk> included too early .endif MAKE_ENV+= Q2DIR="${Q2DIR}" -PLIST_SUB+= Q2DIR="${Q2DIR:S/${LOCALBASE}\///}" +PLIST_SUB+= Q2DIR="${Q2DIR:S|${LOCALBASE}/||}" SUB_LIST+= Q2DIR="${Q2DIR}" .if ${PORTNAME} != "data"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407080707.s68775Fp087810>