Date: Sat, 16 Mar 2013 13:33:12 +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: r314353 - in head/games: quake2-data quake2-data/files quake3-data Message-ID: <201303161333.r2GDXCYt069605@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Sat Mar 16 13:33:12 2013 New Revision: 314353 URL: http://svnweb.freebsd.org/changeset/ports/314353 Log: - Trim Makefile header per new style guidelines - Convert to contemporary OPTIONS framework - Cleanup Makefiles, fix a typo, reword pkg-descr - Add a hint where to look for data port logic description to quake3-data port and terminate an URL with slash while here Modified: head/games/quake2-data/Makefile head/games/quake2-data/Makefile.include head/games/quake2-data/files/Makefile head/games/quake2-data/pkg-descr head/games/quake3-data/Makefile.include head/games/quake3-data/pkg-descr Modified: head/games/quake2-data/Makefile ============================================================================== --- head/games/quake2-data/Makefile Sat Mar 16 13:01:12 2013 (r314352) +++ head/games/quake2-data/Makefile Sat Mar 16 13:33:12 2013 (r314353) @@ -1,9 +1,5 @@ -# New ports collection makefile for: quake2-data -# Date created: 28 Sep 2005 -# Whom: Alejandro Pulver <alejandro@varnet.biz> -# +# Created by: Alejandro Pulver <alejandro@varnet.biz> # $FreeBSD$ -# PORTNAME= data PORTVERSION= 3.20 @@ -19,13 +15,15 @@ DISTFILES= ${Q2_UPDATE}:data \ MAINTAINER= danfe@FreeBSD.org COMMENT= Quake II data files -#XXX need info-unzip for q2-314-demo-x86.exe +# XXX we need info-unzip for q2-314-demo-x86.exe USE_ZIP= yes NO_WRKSUBDIR= yes -OPTIONS= MANUAL "Install game manual" off \ - OPTIMIZED_CFLAGS "Enable compilation optimizations" on \ - SHAREWARE "Install demo version of the game data" off +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} @@ -36,24 +34,24 @@ Q2_SRC= q2src${PORTVERSION:S/.//}.shar. Q2_UPDATE= q2-${PORTVERSION}-x86-full.exe .include "Makefile.include" +.include <bsd.port.options.mk> -.include <bsd.port.pre.mk> - -.if defined(WITH_MANUAL) || defined(WITH_SHAREWARE) +.if ${PORT_OPTIONS:MMANUAL} || ${PORT_OPTIONS:MSHAREWARE} DISTFILES+= ${Q2_DEMO}:data .endif -.if defined(WITH_MANUAL) +.if ${PORT_OPTIONS:MMANUAL} PLIST_SUB+= MANUAL="" .else PLIST_SUB+= MANUAL="@comment " .endif -.if defined(WITH_OPTIMIZED_CFLAGS) -MAKE_ENV+= WITH_OPTIMIZED_CFLAGS=yes +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} +CFLAGS+= -ffast-math -funroll-loops -fomit-frame-pointer \ + -fexpensive-optimizations .endif -.if defined(WITH_SHAREWARE) +.if ${PORT_OPTIONS:MSHAREWARE} PLIST_SUB+= FULL="@comment " \ SHAREWARE="" .else @@ -69,11 +67,11 @@ do-extract: uncompress -c ${DISTDIR}/${Q2_SRC} | ${TAIL} +434 | ${SH} @${UNZIP_CMD} -q -d ${WRKDIR} \ ${DISTDIR}/${Q2_UPDATE} baseq2/* -x *.dll -.if defined(WITH_MANUAL) +.if ${PORT_OPTIONS:MMANUAL} @${UNZIP_CMD} -ajq -d ${WRKDIR}/DOCS \ ${DISTDIR}/${Q2_DEMO} Install/Data/DOCS/* .endif -.if defined(WITH_SHAREWARE) +.if ${PORT_OPTIONS:MSHAREWARE} @${RM} ${WRKDIR}/baseq2/pak[^0].pak @${UNZIP_CMD} -jq -d ${WRKDIR}/baseq2 \ ${DISTDIR}/${Q2_DEMO} Install/Data/baseq2/pak0.pak @@ -86,19 +84,19 @@ post-patch: @${REINPLACE_CMD} -e 's/__linux__/__unix__/' ${WRKSRC}/q_shared.[ch] do-install: - ${MKDIR} ${DATADIR}/baseq2 + @${MKDIR} ${DATADIR}/baseq2 ${INSTALL_PROGRAM} ${WRKSRC}/game.so ${DATADIR}/baseq2 ${CP} -R ${WRKSRC}/baseq2/* ${DATADIR}/baseq2 -.if defined(WITH_MANUAL) +.if ${PORT_OPTIONS:MMANUAL} @${MKDIR} ${DOCSDIR} - @${CP} -R ${WRKSRC}/DOCS ${DOCSDIR}/manual + ${CP} -R ${WRKSRC}/DOCS ${DOCSDIR}/manual .endif post-install: -.if !defined(WITH_SHAREWARE) +.if ! ${PORT_OPTIONS:MSHAREWARE} @${ECHO_CMD} @${CAT} ${PKGMESSAGE} @${ECHO_CMD} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/games/quake2-data/Makefile.include ============================================================================== --- head/games/quake2-data/Makefile.include Sat Mar 16 13:01:12 2013 (r314352) +++ head/games/quake2-data/Makefile.include Sat Mar 16 13:33:12 2013 (r314353) @@ -18,7 +18,7 @@ # exist. # - If the engine needs to load additional data (renderers, pak files, etc.) # don't install it in ${Q2DIR}, use ${PREFIX}/lib/${PORTNAME} instead and -# add that directory to the search paths immediatly after ${Q2DIR}. +# add that directory to the search paths immediately after ${Q2DIR}. # - The reason to use "~/.${PORTNAME}" for writing is in the case the program # isn't compatible with the original engine (e.g. new console variables, # different saved game format, etc.). If just the configuration is @@ -44,18 +44,18 @@ # For examples see the existing ports. # -# Set variables. +# Set variables -Q2PKGNAMEPREFIX?=quake2- +Q2PKGNAMEPREFIX?= quake2- Q2DIR?= ${LOCALBASE}/share/quake2 -# Add them to the ports system. +# Add them to the ports system MAKE_ENV+= Q2DIR="${Q2DIR}" PLIST_SUB+= Q2DIR="${Q2DIR:S/${LOCALBASE}\///}" SUB_LIST+= Q2DIR="${Q2DIR}" -# Add the dependency. +# Add the dependency .if ${PORTNAME} != "data" RUN_DEPENDS+= ${Q2DIR}:${PORTSDIR}/games/quake2-data Modified: head/games/quake2-data/files/Makefile ============================================================================== --- head/games/quake2-data/files/Makefile Sat Mar 16 13:01:12 2013 (r314352) +++ head/games/quake2-data/files/Makefile Sat Mar 16 13:33:12 2013 (r314353) @@ -53,11 +53,6 @@ SRCS= g_ai.c \ q_shared.c CFLAGS+= -Dstricmp=strcasecmp -.if defined(WITH_OPTIMIZED_CFLAGS) -CFLAGS+= -ffast-math -funroll-loops -fomit-frame-pointer \ - -fexpensive-optimizations -.endif - LDFLAGS+= -L/lib -L/usr/lib -lm .include <bsd.lib.mk> Modified: head/games/quake2-data/pkg-descr ============================================================================== --- head/games/quake2-data/pkg-descr Sat Mar 16 13:01:12 2013 (r314352) +++ head/games/quake2-data/pkg-descr Sat Mar 16 13:33:12 2013 (r314353) @@ -1,6 +1,9 @@ +Quake II data files. + This port installs the data files needed to run Quake II: the updates for the -original game, or the demo (shareware) data if requested. In the first case -you need to have a legitimate copy of the game in order to obtain the pak0.pak -file. +original game, or the demo (shareware) data if requested. + +For a full game, you need to have a legitimate copy of the game in order to +obtain the pak0.pak file. WWW: http://www.idsoftware.com/games/quake/quake2/ Modified: head/games/quake3-data/Makefile.include ============================================================================== --- head/games/quake3-data/Makefile.include Sat Mar 16 13:01:12 2013 (r314352) +++ head/games/quake3-data/Makefile.include Sat Mar 16 13:33:12 2013 (r314353) @@ -1,8 +1,9 @@ -# Makefile for defining variables used by other Quake3 related ports +# Makefile for defining variables used by other Quake3 related ports. See +# `games/quake2-data/Makefile.include' for extensive description. # Set variables -Q3PKGNAMEPREFIX?=quake3- +Q3PKGNAMEPREFIX?= quake3- Q3DIR?= ${PREFIX}/share/quake3 # Add them to the environment Modified: head/games/quake3-data/pkg-descr ============================================================================== --- head/games/quake3-data/pkg-descr Sat Mar 16 13:01:12 2013 (r314352) +++ head/games/quake3-data/pkg-descr Sat Mar 16 13:33:12 2013 (r314353) @@ -6,4 +6,4 @@ the update, and has an option to install You still need to have a legitimate copy of the game in order to obtain the *.pk3 files. -WWW: http://www.idsoftware.com/games/quake/quake3-arena +WWW: http://www.idsoftware.com/games/quake/quake3-arena/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303161333.r2GDXCYt069605>