From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Feb 20 23:00:38 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5445916A4CE for ; Sun, 20 Feb 2005 23:00:38 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DFC2143D54 for ; Sun, 20 Feb 2005 23:00:37 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id j1KN0bG8005361 for ; Sun, 20 Feb 2005 23:00:37 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id j1KN0bww005360; Sun, 20 Feb 2005 23:00:37 GMT (envelope-from gnats) Resent-Date: Sun, 20 Feb 2005 23:00:37 GMT Resent-Message-Id: <200502202300.j1KN0bww005360@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Eric Anholt Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C9A1F16A4CE for ; Sun, 20 Feb 2005 22:58:40 +0000 (GMT) Received: from leguin.anholt.net (69-30-77-85.dq1sn.easystreet.com [69.30.77.85]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4DD9743D1D for ; Sun, 20 Feb 2005 22:58:40 +0000 (GMT) (envelope-from anholt@leguin.anholt.net) Received: from leguin.anholt.net (localhost [127.0.0.1]) by leguin.anholt.net (8.13.3/8.13.1) with ESMTP id j1KMwd5s002549 for ; Sun, 20 Feb 2005 14:58:39 -0800 (PST) (envelope-from anholt@leguin.anholt.net) Received: (from anholt@localhost) by leguin.anholt.net (8.13.3/8.13.1/Submit) id j1KMwdaK002548; Sun, 20 Feb 2005 14:58:39 -0800 (PST) (envelope-from anholt) Message-Id: <200502202258.j1KMwdaK002548@leguin.anholt.net> Date: Sun, 20 Feb 2005 14:58:39 -0800 (PST) From: Eric Anholt To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/77810: [PATCH] Unbreak games/yadex build on 64-bit X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Eric Anholt List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2005 23:00:38 -0000 >Number: 77810 >Category: ports >Synopsis: [PATCH] Unbreak games/yadex build on 64-bit >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Feb 20 23:00:36 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Eric Anholt >Release: FreeBSD 5.3-STABLE amd64 >Organization: >Environment: System: FreeBSD leguin.anholt.net 5.3-STABLE FreeBSD 5.3-STABLE #5: Fri Feb 4 17:09:17 PST 2005 anholt@leguin.anholt.net:/usr/src/stable/sys/amd64/compile/MYKERNEL amd64 >Description: Unbreaks the build of yadex on 64-bit. Couldn't find suitable wads to test on. >How-To-Repeat: >Fix: --- yadex-64bit.diff begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/games/yadex/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- Makefile 25 Feb 2004 09:51:08 -0000 1.7 +++ Makefile 20 Feb 2005 22:30:21 -0000 @@ -21,13 +21,7 @@ MAN6= yadex.6 ybsp.6 -.include - -.if ${ARCH} == "alpha" || ${ARCH} == "amd64" -BROKEN= "Does not compile on alpha or amd64" -.endif - post-install: ${CHMOD} 644 ${PREFIX}/etc/yadex/${PORTVERSION}/yadex.cfg -.include +.include Index: files/patch-macro.cc =================================================================== RCS file: files/patch-macro.cc diff -N files/patch-macro.cc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-macro.cc 1 Jan 2005 22:19:29 -0000 @@ -0,0 +1,14 @@ +--- src/macro.cc.orig Sat Jan 1 14:19:10 2005 ++++ src/macro.cc Sat Jan 1 14:19:14 2005 +@@ -85,9 +85,10 @@ + // This is awful, but who cares ? + while (*fmt) + { +- va_list l = list; ++ va_list l; + const char *macro_name = 0; + const char *macro_value = 0; ++ va_copy(l, list); + while (macro_name = va_arg (l, const char *)) + { + macro_value = va_arg (l, const char *); Index: files/patch-yadex.h =================================================================== RCS file: files/patch-yadex.h diff -N files/patch-yadex.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-yadex.h 1 Jan 2005 22:24:10 -0000 @@ -0,0 +1,22 @@ +--- src/yadex.h.orig Sat Jan 1 14:23:40 2005 ++++ src/yadex.h Sat Jan 1 14:23:50 2005 +@@ -95,13 +95,13 @@ + #define F_I16_D "hd" + #define F_I16_H "hX" + +-typedef unsigned long u32; +-#define F_U32_D "lu" +-#define F_U32_H "lX" ++typedef unsigned int u32; ++#define F_U32_D "u" ++#define F_U32_H "X" + +-typedef signed long i32; +-#define F_I32_D "ld" +-#define F_I32_H "lX" ++typedef signed int i32; ++#define F_I32_D "d" ++#define F_I32_H "X" + + + /* --- yadex-64bit.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: