Date: Sun, 17 Mar 2013 08:56:31 +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: r314412 - head/games/quake-extras Message-ID: <201303170856.r2H8uVjO023330@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Sun Mar 17 08:56:30 2013 New Revision: 314412 URL: http://svnweb.freebsd.org/changeset/ports/314412 Log: - Trim old-school Makefile header - Convert to new OPTIONS framework (courtesy of jgh@) - Remove i386 restriction for SKYBOXES option: I fixed `archivers/nwreckdum' in r250781 three years ago - Generally cleanup Makefile while here, drop maintainership - Merge pkg-message into pkg-descr and make the latter useful Deleted: head/games/quake-extras/pkg-message Modified: head/games/quake-extras/Makefile head/games/quake-extras/pkg-descr Modified: head/games/quake-extras/Makefile ============================================================================== --- head/games/quake-extras/Makefile Sun Mar 17 08:27:46 2013 (r314411) +++ head/games/quake-extras/Makefile Sun Mar 17 08:56:30 2013 (r314412) @@ -1,9 +1,5 @@ -# New ports collection makefile for: quake-extras -# Date created: 10 May 2006 -# Whom: alepulver -# +# Created by: Alejandro Pulver <alepulver@FreeBSD.org> # $FreeBSD$ -# PORTNAME= extras PORTVERSION= 1.1 @@ -16,77 +12,74 @@ PKGNAMEPREFIX= ${Q1PKGNAMEPREFIX} DISTFILES= # DIST_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME} -MAINTAINER= danfe@FreeBSD.org -COMMENT= Addons for Quake +MAINTAINER= ports@FreeBSD.org +COMMENT= Various add-ons for games of Quake/QuakeWorld and alike NO_BUILD= yes NO_WRKSUBDIR= yes -OPTIONS= LITS "Coloured lighting (FuhQuake/JoeQuake based)" on \ - REMODEL "High quality models" on \ - RETEXTURE_HQ "High quality textures (200MB)" off \ - RETEXTURE_LW "Low (still good) quality textures (15MB)" on \ - SKYBOXES "Skyboxes (sky replacement images)" on - DATADIR= ${Q1DIR} LITSFILE= fuhquake-lits.rar SKINSFILE= SKINSbmodels-48files-4-23-05.zip SKYFILE= fuhquake-skyboxes.zip -.include "${.CURDIR}/../quake-data/Makefile.include" +OPTIONS_DEFINE= LITS REMODEL RETEXTURE_HQ RETEXTURE_LW SKYBOXES +OPTIONS_DEFAULT= LITS REMODEL RETEXTURE_LW SKYBOXES -.include <bsd.port.pre.mk> +LITS_DESC= Colored lighting (FuhQuake/JoeQuake based) +REMODEL_DESC= High quality models +RETEXTURE_HQ_DESC= High quality textures (200MB) +RETEXTURE_LW_DESC= Low (still good) quality textures (15MB) +SKYBOXES_DESC= Skyboxes (sky replacement images) -# FIXME: SKYBOXES option only enabled for i386, as the unpacking program -# "nwreckdum" fails when receiving SIGXFSZ on !i386 platforms. +.include <bsd.port.options.mk> -.if !defined(WITHOUT_REMODEL) || \ - (!defined(WITHOUT_SKYBOXES) && ${ARCH} == "i386") +.if ${PORT_OPTIONS:MREMODEL} || ${PORT_OPTIONS:MSKYBOXES} EXTRACT_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip .endif -.if !defined(WITHOUT_LITS) +.if ${PORT_OPTIONS:MLITS} EXTRACT_DEPENDS+= unrar:${PORTSDIR}/archivers/unrar .endif -.if !defined(WITHOUT_LITS) +.if ${PORT_OPTIONS:MLITS} DISTFILES+= ${LITSFILE}:fq PLIST_SUB+= LITS="" .else PLIST_SUB+= LITS="@comment " .endif -.if !defined(WITHOUT_REMODEL) +.if ${PORT_OPTIONS:MREMODEL} DISTFILES+= ${SKINSFILE}:remod PLIST_SUB+= REMOD="" .else PLIST_SUB+= REMOD="@comment " .endif -.if defined(WITH_RETEXTURE_HQ) +.if ${PORT_OPTIONS:MRETEXTURE_HQ} TEXFILE= qrp-maptextures-2007-10-06r2-7files.zip TEX_EXT= tga -.elif !defined(WITHOUT_RETEXTURE_LW) +.elif ${PORT_OPTIONS:MRETEXTURE_LW} TEXFILE= qrp-maptextures-2007-10-20r2-7files-low.zip TEX_EXT= jpg .endif -.if !defined(WITHOUT_RETEXTURE_LW) || defined(WITH_RETEXTURE_HQ) +.if ${PORT_OPTIONS:MRETEXTURE_LW} || ${PORT_OPTIONS:MRETEXTURE_HQ} DISTFILES+= ${TEXFILE}:retex PLIST_SUB+= RETEX="" EXT="${TEX_EXT}" .else PLIST_SUB+= RETEX="@comment " .endif -.if !defined(WITHOUT_REMODEL) || !defined(WITHOUT_RETEXTURE_LW) || \ - defined(WITH_RETEXTURE_HQ) +.if ${PORT_OPTIONS:MREMODEL} || ${PORT_OPTIONS:MRETEXTURE_LW} || \ + ${PORT_OPTIONS:MRETEXTURE_HQ} PLIST_SUB+= TEX_DIR="" .else PLIST_SUB+= TEX_DIR="@comment " .endif -.if !defined(WITHOUT_SKYBOXES) && ${ARCH} == "i386" +.if ${PORT_OPTIONS:MSKYBOXES} DISTFILES+= ${SKYFILE}:fq EXTRACT_DEPENDS+= nwreckdum:${PORTSDIR}/archivers/nwreckdum PLIST_SUB+= SKYBOX="" @@ -95,52 +88,52 @@ PLIST_SUB+= SKYBOX="@comment " .endif do-extract: -.if !defined(WITHOUT_LITS) +.if ${PORT_OPTIONS:MLITS} @${MKDIR} ${WRKDIR}/lits - @cd ${WRKDIR}/lits && \ - unrar x ${DISTDIR}/${DIST_SUBDIR}/${LITSFILE} >/dev/null + @cd ${WRKDIR}/lits && unrar x -y -idq \ + ${DISTDIR}/${DIST_SUBDIR}/${LITSFILE} .endif -.if !defined(WITHOUT_REMODEL) || !defined(WITHOUT_RETEXTURE_LW) || \ - defined(WITH_RETEXTURE_HQ) +.if ${PORT_OPTIONS:MREMODEL} || ${PORT_OPTIONS:MRETEXTURE_LW} || \ + ${PORT_OPTIONS:MRETEXTURE_HQ} @${MKDIR} ${WRKDIR}/textures .endif -.if !defined(WITHOUT_REMODEL) +.if ${PORT_OPTIONS:MREMODEL} @cd ${WRKDIR}/textures && \ ${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/${SKINSFILE} @${RM} ${WRKDIR}/textures/readme.txt -# Make links for compatibility. +# Make links for compatibility @cd ${WRKDIR}/textures && \ for f in `${LS} | ${GREP} -E '[[:alnum:]]+_[[:digit:]]+'`; do \ ${LN} -s $$f `${ECHO_CMD} $$f | ${SED} -E -e 's/([[:alnum:]]+)_.+/\1/'`.mdl_`${ECHO_CMD} $$f | ${SED} -E -e 's/[[:alnum:]]+_(.+)/\1/'`; \ done .endif -.if !defined(WITHOUT_RETEXTURE_LW) || defined(WITH_RETEXTURE_HQ) - @cd ${WRKDIR} && \ - ${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/${TEXFILE} "*.pk3" && \ - ${UNZIP_CMD} -qo *.pk3 && ${RM} *.pk3 +.if ${PORT_OPTIONS:MRETEXTURE_LW} || ${PORT_OPTIONS:MRETEXTURE_HQ} + @cd ${WRKDIR} && ${UNZIP_CMD} -qo \ + ${DISTDIR}/${DIST_SUBDIR}/${TEXFILE} "*.pk3" && \ + ${UNZIP_CMD} -qo *.pk3 && ${RM} *.pk3 @cd ${WRKDIR}/textures && for tex in *.link; do ln -s `${CAT} $$tex` \ - `${ECHO_CMD} $$tex | ${SED} -e 's|\.link|.${TEX_EXT}|'`; done + `${ECHO_CMD} $$tex | ${SED} -e 's|\.link|.${TEX_EXT}|'`; done .endif -.if !defined(WITHOUT_SKYBOXES) && ${ARCH} == "i386" +.if ${PORT_OPTIONS:MSKYBOXES} @cd ${WRKDIR} && ${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/${SKYFILE} @nwreckdum -d ${WRKDIR}/skyboxes -p ${WRKDIR}/pakX.pak >/dev/null .endif do-install: -.if !defined(WITHOUT_LITS) - ${MKDIR} ${DATADIR}/id1/lits +.if ${PORT_OPTIONS:MLITS} + @${MKDIR} ${DATADIR}/id1/lits ${INSTALL_DATA} ${WRKSRC}/lits/* ${DATADIR}/id1/lits .endif -.if !defined(WITHOUT_REMODEL) || !defined(WITHOUT_RETEXTURE_LW) || \ - defined(WITH_RETEXTURE_HQ) - ${CP} -R ${WRKSRC}/textures ${DATADIR}/id1 +.if ${PORT_OPTIONS:MREMODEL} || ${PORT_OPTIONS:MRETEXTURE_LW} || \ + ${PORT_OPTIONS:MRETEXTURE_HQ} + ${CP} -a ${WRKSRC}/textures ${DATADIR}/id1 .endif -.if !defined(WITHOUT_REMODEL) - cd ${DATADIR}/id1/textures && \ - ${LN} -s . bmodels && ${LN} -s . progs +.if ${PORT_OPTIONS:MREMODEL} + cd ${DATADIR}/id1/textures && ${LN} -s . bmodels && ${LN} -s . progs .endif -.if !defined(WITHOUT_SKYBOXES) && ${ARCH} == "i386" - ${CP} -R ${WRKSRC}/skyboxes/* ${DATADIR}/id1 +.if ${PORT_OPTIONS:MSKYBOXES} + ${CP} -a ${WRKSRC}/skyboxes/* ${DATADIR}/id1 .endif -.include <bsd.port.post.mk> +.include "${.CURDIR}/../quake-data/Makefile.include" +.include <bsd.port.mk> Modified: head/games/quake-extras/pkg-descr ============================================================================== --- head/games/quake-extras/pkg-descr Sun Mar 17 08:27:46 2013 (r314411) +++ head/games/quake-extras/pkg-descr Sun Mar 17 08:56:30 2013 (r314412) @@ -1 +1,8 @@ -This port optionally installs Quake addons. +This port installs various optional add-ons for games of Quake/QuakeWorld +and their spin-offs, collected all over the Internet. + +To load a skybox, type "loadsky <skybox>", where "<skybox>" can be one of +"dmcw", "frozendust", and "snow2". + +Note that the lits are only for FuhQuake and JoeQuake based clients. Low +quality textures require a client with JPEG support.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303170856.r2H8uVjO023330>