Fix build on AMD64

3 files changed, 41 insertions, 4 deletions

diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile
index 72589a6c0d8b..c89f66b1ef26 100644
--- a/x11-toolkits/xview/Makefile
+++ b/x11-toolkits/xview/Makefile
@@ -30,10 +30,6 @@ MAN1=		msgfmt.1 xgettext.1 xview.1
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "amd64"
-BROKEN=		"Does not compile on amd64"
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's+/usr/X11R6+${PREFIX}+;' \
 	  ${WRKSRC}/config/XView.cf
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+attr+attr.c b/x11-toolkits/xview/files/patch-lib+libxview+attr+attr.c
new file mode 100644
index 000000000000..e5f00d68783a
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+attr+attr.c
@@ -0,0 +1,15 @@
+--- lib/libxview/attr/attr.c.orig	Wed May  5 15:36:36 2004
++++ lib/libxview/attr/attr.c	Wed May  5 15:37:13 2004
+@@ -91,7 +91,12 @@
+    /* These two variables are used instead of the paramters so that the
+       position in the lists is maintained after a recursive call. 
+    */
++
++#ifdef __amd64__
++   va_copy(valist,valist1);
++#else
+    valist = valist1;
++#endif
+    avlist = avlist1;
+ 
+    if( !avlist )
diff --git a/x11-toolkits/xview/files/patch-lib+libxview+base+xv.c b/x11-toolkits/xview/files/patch-lib+libxview+base+xv.c
new file mode 100644
index 000000000000..f47fdcb7391b
--- /dev/null
+++ b/x11-toolkits/xview/files/patch-lib+libxview+base+xv.c
@@ -0,0 +1,26 @@
+--- lib/libxview/base/xv.c.orig	Wed May  5 15:38:10 2004
++++ lib/libxview/base/xv.c	Wed May  5 15:40:31 2004
+@@ -556,7 +556,11 @@
+ 	case XV_KEY_DATA:
+ 	case XV_IS_SUBTYPE_OF:
+ 	    status = XV_OK;
++#ifdef __amd64__
++	    va_copy(args,args_save);
++#else
+ 	    args = args_save;
++#endif
+ 	    result = generic_get(object, &status, (Attr_attribute) attr, args);
+ 	    va_end(args);
+ 	    return result;
+@@ -575,7 +579,11 @@
+ 	 * Go to the beginning of the varargs list every time to insure each
+          * pkg gets the start of the  varargs.
+ 	 */
++#ifdef __amd64__
++        va_copy(args,args_save);
++#else
+         args = args_save;
++#endif
+ 
+ 	/* ask the object to handle the get */
+ 	result = (*(pkg->get)) (object, &status, (Attr_attribute) attr, args);