From owner-svn-ports-head@FreeBSD.ORG Sun May 12 13:06:47 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 488367B4; Sun, 12 May 2013 13:06:47 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 3B344ABA; Sun, 12 May 2013 13:06:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4CD6lj4007149; Sun, 12 May 2013 13:06:47 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4CD6kes007147; Sun, 12 May 2013 13:06:46 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201305121306.r4CD6kes007147@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 12 May 2013 13:06:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317957 - head/games/quake2-extras X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 May 2013 13:06:47 -0000 Author: danfe Date: Sun May 12 13:06:46 2013 New Revision: 317957 URL: http://svnweb.freebsd.org/changeset/ports/317957 Log: Trim Makefile header; convert to OptionsNG (courtesy of jgh@). Modified: head/games/quake2-extras/Makefile head/games/quake2-extras/pkg-descr Modified: head/games/quake2-extras/Makefile ============================================================================== --- head/games/quake2-extras/Makefile Sun May 12 13:06:43 2013 (r317956) +++ head/games/quake2-extras/Makefile Sun May 12 13:06:46 2013 (r317957) @@ -1,9 +1,5 @@ -# New ports collection makefile for: quake2-extras -# Date created: 27 Jul 2006 -# Whom: alepulver -# +# Created by: Alejandro Pulver # $FreeBSD$ -# PORTNAME= extras PORTVERSION= 1.0 @@ -22,9 +18,12 @@ COMMENT= Quake II extras (high quality t USE_ZIP= yes NO_WRKSUBDIR= yes -OPTIONS= RETEXTURE "Install high quality textures" on \ - RETEXTURE_FULL "Install more textures (120MB)" off \ - SKINS "Install high quality skins" off +OPTIONS_DEFINE= RETEXTURE RETEXTURE_FULL SKINS +OPTIONS_DEFAULT= RETEXTURE + +RETEXTURE_DESC= Install high quality textures +RETEXTURE_FULL_DESC= Install more textures (120MB) +SKINS_DESC= Install high quality skins LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} @@ -33,15 +32,14 @@ RETEX_FULL= all_q2_textures_07_17_2006.z SKINS= models.zip .include "${.CURDIR}/../quake2-data/Makefile.include" +.include -.include - -.if defined(WITH_RETEXTURE_FULL) || defined(WITH_SKINS) +.if ${PORT_OPTIONS:MRETEXTURE_FULL} || ${PORT_OPTIONS:MSKINS} BUILD_DEPENDS+= nwreckdum:${PORTSDIR}/archivers/nwreckdum PLIST_FILES+= %%Q2DIR%%/baseq2/pak20.pak .endif -.if defined(WITH_RETEXTURE) && !defined(WITH_RETEXTURE_FULL) +.if ${PORT_OPTIONS:MRETEXTURE} && ${PORT_OPTIONS:MRETEXTURE_FULL} .for i in ${RETEX_PAKS} DISTFILES+= pak${i}.pak:retex PLIST_FILES+= %%Q2DIR%%/baseq2/pak${i}.pak @@ -51,47 +49,47 @@ PLIST_SUB+= RETEX="" PLIST_SUB+= RETEX="@comment " .endif -.if defined(WITH_RETEXTURE_FULL) +.if ${PORT_OPTIONS:MRETEXTURE_FULL} DISTFILES+= ${RETEX_FULL}:retex2 EXTRACT_ONLY+= ${RETEX_FULL} PLIST_FILES+= %%Q2DIR%%/baseq2/pak10.pak .endif -.if defined(WITH_SKINS) +.if ${PORT_OPTIONS:MSKINS} DISTFILES+= ${SKINS}:retex2 EXTRACT_ONLY+= ${SKINS} PLIST_FILES+= %%Q2DIR%%/baseq2/pak20.pak .endif post-extract: -.if defined(WITH_RETEXTURE_FULL) +.if ${PORT_OPTIONS:MRETEXTURE_FULL} @${MKDIR} ${WRKSRC}/pak10 @${MV} ${WRKSRC}/textures ${WRKSRC}/pak10 .endif -.if defined(WITH_SKINS) +.if ${PORT_OPTIONS:MSKINS} @${MKDIR} ${WRKSRC}/pak20 @${MV} ${WRKSRC}/models ${WRKSRC}/pak20 .endif do-build: -.if defined(WITH_RETEXTURE_FULL) +.if ${PORT_OPTIONS:MRETEXTURE_FULL} @nwreckdum -c -p ${WRKSRC}/pak10.pak -d ${WRKSRC}/pak10 .endif -.if defined(WITH_SKINS) +.if ${PORT_OPTIONS:MSKINS} @nwreckdum -c -p ${WRKSRC}/pak20.pak -d ${WRKSRC}/pak20 .endif do-install: -.if defined(WITH_RETEXTURE) && !defined(WITH_RETEXTURE_FULL) -.for i in ${RETEX_PAKS} +.if ${PORT_OPTIONS:MRETEXTURE} && empty(PORT_OPTIONS:MRETEXTURE_FULL) +. for i in ${RETEX_PAKS} ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/pak${i}.pak ${Q2DIR}/baseq2 -.endfor +. endfor .endif -.if defined(WITH_RETEXTURE_FULL) +.if ${PORT_OPTIONS:MRETEXTURE_FULL} ${INSTALL_DATA} ${WRKSRC}/pak10.pak ${Q2DIR}/baseq2 .endif -.if defined(WITH_SKINS) +.if ${PORT_OPTIONS:MSKINS} ${INSTALL_DATA} ${WRKSRC}/pak20.pak ${Q2DIR}/baseq2 .endif -.include +.include Modified: head/games/quake2-extras/pkg-descr ============================================================================== --- head/games/quake2-extras/pkg-descr Sun May 12 13:06:43 2013 (r317956) +++ head/games/quake2-extras/pkg-descr Sun May 12 13:06:46 2013 (r317957) @@ -1,6 +1,6 @@ -This port installs various Quake II extras: +This port installs several Quake II extras: -- High quality texture pack (requires support in engine). -- High quality skin pack (requires JPEG and PNG support in engine). + - High quality texture pack (requires support in engine) + - High quality skin pack (requires JPEG and PNG support in engine) WWW: http://www-personal.umich.edu/~jimw/q2/index.htm