Date: Sun, 20 Feb 2005 14:58:39 -0800 (PST) From: Eric Anholt <anholt@leguin.anholt.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/77810: [PATCH] Unbreak games/yadex build on 64-bit Message-ID: <200502202258.j1KMwdaK002548@leguin.anholt.net> Resent-Message-ID: <200502202300.j1KN0bww005360@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200502202258.j1KMwdaK002548>