Changes: * Integrate with "doom-data". * Remove ONLY_FOR_ARCHS, use correctly the "nasm" dependency. * Add OPTIONS (for x86 asm). * Make wrapper script.
Dear maintainer, Alejandro Pulver <alejandro@varnet.biz> submitted a various PRs in an effort to the clean up DooM based ports on in the FreeBSD ports collection. He suggests adding a new port for the datafiles (ports/86439), and modifying all doom ports to make use of it. Please have a look at the changes, and say, if you approve them: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/86446 Simon
State Changed From-To: open->feedback Awaiting maintainer's reply.
Responsible Changed From-To: freebsd-ports-bugs->barner Grab.
>Submitter-Id: current-users >Originator: Alejandro Pulver >Organization: >Confidential: no >Synopsis: Re: ports/86446: [UPDATE] games/doomlegacy: integrate with "doom-data", remove ONLY_FOR_ARCHS >Severity: non-critical >Priority: low >Category: ports >Class: update >Release: FreeBSD 5.4-RELEASE i386 >Environment: >Description: This patch has to be applied to the previous patch. Changes: * Bring back "ONLY_FOR_ARCHS=i386" (compiles with -fPIC, but doesn't run - produces a segmentation fault). * Fix wrapper script (replace a "find" with "mkdir"). >How-To-Repeat: >Fix: --- new.diff begins here --- --- ../../pkgd/sent/doom/doomlegacy.diff Wed Sep 21 19:08:01 2005 +++ doomlegacy.diff Sun Sep 25 21:49:04 2005 @@ -1,7 +1,7 @@ diff -urN /usr/ports/games/doomlegacy/Makefile doomlegacy/Makefile --- /usr/ports/games/doomlegacy/Makefile Sat Mar 5 20:17:29 2005 -+++ doomlegacy/Makefile Mon Sep 19 20:49:04 2005 -@@ -11,46 +11,33 @@ ++++ doomlegacy/Makefile Sun Sep 25 21:42:58 2005 +@@ -11,46 +11,35 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= legacy_${PORTVERSION}_src @@ -20,6 +20,8 @@ -USE_XLIB= yes -USE_GMAKE= yes ++ONLY_FOR_ARCHS= i386 ++ USE_GL= yes -USE_SDL= mixer +USE_GMAKE= yes @@ -58,7 +60,7 @@ pre-build: cd ${WRKSRC}/linux_x/sndserv && ${GMAKE} clean -@@ -58,20 +45,29 @@ +@@ -58,20 +47,29 @@ @${LN} -s ${WRKSRC}/linux_x/sndserv/linux/llsndserv ${WRKDIR}/bin do-install: @@ -91,7 +93,7 @@ + +.include <bsd.port.pre.mk> + -+.if ${ARCH} == "i386" && defined(WITH_X86_ASM) ++.if defined(WITH_X86_ASM) +BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/nasm +MAKE_ARGS+= USEASM=1 .endif @@ -101,7 +103,7 @@ +.include <bsd.port.post.mk> diff -urN /usr/ports/games/doomlegacy/files/legacy.in doomlegacy/files/legacy.in --- /usr/ports/games/doomlegacy/files/legacy.in Wed Dec 31 21:00:00 1969 -+++ doomlegacy/files/legacy.in Sun Sep 18 12:22:54 2005 ++++ doomlegacy/files/legacy.in Sun Sep 25 21:35:43 2005 @@ -0,0 +1,20 @@ +#!/bin/sh + @@ -112,7 +114,7 @@ + +cd %%DATADIR%% || exit 1 + -+find * -type d -exec mkdir -p ~/.legacy/{} \; || exit 1 ++mkdir -p ~/.legacy +find * -type f -exec ln -sf %%DATADIR%%/{} ~/.legacy/{} \; || exit 1 + +cd %%DMDIR%% || exit 1 --- new.diff ends here ---
State Changed From-To: feedback->patched PR analysed, ready commit. Waiting for feedback on ports/86445, so we can do the whole DooM conversion in one sweep.
State Changed From-To: patched->closed Committed. Thanks!