Date: Thu, 22 Nov 2012 11:20:34 +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: r307642 - head/games/doomlegacy Message-ID: <201211221120.qAMBKYwn062361@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211221120.qAMBKYwn062361>