From owner-svn-ports-all@FreeBSD.ORG  Thu Nov 22 11:20:34 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 82F93BFB;
 Thu, 22 Nov 2012 11:20:34 +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 4F1FF8FC14;
 Thu, 22 Nov 2012 11:20:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAMBKYj3062362;
 Thu, 22 Nov 2012 11:20:34 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAMBKYwn062361;
 Thu, 22 Nov 2012 11:20:34 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201211221120.qAMBKYwn062361@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Thu, 22 Nov 2012 11:20:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307642 - head/games/doomlegacy
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Nov 2012 11:20:34 -0000

Author: danfe
Date: Thu Nov 22 11:20:33 2012
New Revision: 307642
URL: http://svnweb.freebsd.org/changeset/ports/307642

Log:
  - Do not require absolute paths for 3rd-party IWADs: search DOOMWADDIR only
    if specified file name does not contain any slashes (that is, now there
    is a difference between `-iwad plutonia.wad' and `-iwad ./plutonia.wad')
  - Utilize per-architecture feature of new OPTIONS framework
  
  Feature safe:	yes

Modified:
  head/games/doomlegacy/Makefile

Modified: head/games/doomlegacy/Makefile
==============================================================================
--- head/games/doomlegacy/Makefile	Thu Nov 22 11:01:57 2012	(r307641)
+++ head/games/doomlegacy/Makefile	Thu Nov 22 11:20:33 2012	(r307642)
@@ -31,13 +31,8 @@ PORTDOCS=	*
 SVN_REV=	845
 
 OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "i386"
-OPTIONS_DEFINE+=	ASM
-OPTIONS_DEFAULT=	ASM
-.endif
+OPTIONS_DEFINE_i386=	ASM
+OPTIONS_DEFAULT_i386=	ASM
 
 .include <bsd.port.options.mk>
 
@@ -57,9 +52,10 @@ post-patch: .SILENT
 		${WRKSRC}/z_zone.c
 # Adjust config and save games directory name to be less ambiguous
 	${REINPLACE_CMD} -e 's|\.legacy|.${PORTNAME}|' ${WRKSRC}/doomdef.h
-# Change default value of DOOMWADDIR
-	${REINPLACE_CMD} -e 's,\(doomwaddir = \)"\.",\1"${DMDIR}", ; \
-		1306,1309d' ${WRKSRC}/d_main.c
+# Change default value of DOOMWADDIR; better support for relative paths
+	${REINPLACE_CMD} -e 's|\(doomwaddir = \)"\."|\1"${DMDIR}"| ; \
+		1306,1309d' -e "s|s\[0\] ==[^)]*|strchr(s, '/')|" \
+			${WRKSRC}/d_main.c
 # Remove broken dependency file (wrong paths inside) and a copy of GPL
 	${RM} ${WRKSRC}/sdl.dep ; ${TOUCH} ${WRKSRC}/sdl.dep
 	${RM} ${WRKSRC}/_doc/LICENSE.txt
@@ -73,4 +69,4 @@ do-install:
 .endif
 
 .include "${.CURDIR}/../doom-data/Makefile.include"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>