From owner-svn-ports-head@FreeBSD.ORG  Fri Aug  9 08:35:55 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id DF11B42A;
 Fri,  9 Aug 2013 08:35:55 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CC83627A1;
 Fri,  9 Aug 2013 08:35:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r798ZtTR035445;
 Fri, 9 Aug 2013 08:35:55 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r798ZtsP035444;
 Fri, 9 Aug 2013 08:35:55 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201308090835.r798ZtsP035444@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Fri, 9 Aug 2013 08:35:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r324420 - 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
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Aug 2013 08:35:55 -0000

Author: danfe
Date: Fri Aug  9 08:35:55 2013
New Revision: 324420
URL: http://svnweb.freebsd.org/changeset/ports/324420

Log:
  Fix a typo made in r317957 during OptionsNG conversion and unbreak the
  build; also fix URI of the optional models.zip distfile while here.

Modified:
  head/games/quake2-extras/Makefile

Modified: head/games/quake2-extras/Makefile
==============================================================================
--- head/games/quake2-extras/Makefile	Fri Aug  9 08:24:10 2013	(r324419)
+++ head/games/quake2-extras/Makefile	Fri Aug  9 08:35:55 2013	(r324420)
@@ -6,7 +6,8 @@ PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	http://offload1.icculus.org/quake2/files/:retex \
 		http://www.icculus.org/quake2/files/:retex \
-		http://www-personal.umich.edu/~jimw/q2/files/:retex2
+		http://www-personal.umich.edu/~jimw/q2/files/:retex2 \
+		http://www-personal.umich.edu/~jimw/q2/aq2_install/:models
 PKGNAMEPREFIX=	${Q2PKGNAMEPREFIX}
 DISTFILES=	#
 DIST_SUBDIR=	${LATEST_LINK}
@@ -39,7 +40,7 @@ BUILD_DEPENDS+=	nwreckdum:${PORTSDIR}/ar
 PLIST_FILES+=	%%Q2DIR%%/baseq2/pak20.pak
 .endif
 
-.if ${PORT_OPTIONS:MRETEXTURE} && ${PORT_OPTIONS:MRETEXTURE_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
@@ -56,7 +57,7 @@ PLIST_FILES+=	%%Q2DIR%%/baseq2/pak10.pak
 .endif
 
 .if ${PORT_OPTIONS:MSKINS}
-DISTFILES+=	${SKINS}:retex2
+DISTFILES+=	${SKINS}:models
 EXTRACT_ONLY+=	${SKINS}
 PLIST_FILES+=	%%Q2DIR%%/baseq2/pak20.pak
 .endif