From Andre.Albsmeier@siemens.com  Sat Apr 30 10:48:37 2005
Return-Path: <Andre.Albsmeier@siemens.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 66F5016A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 30 Apr 2005 10:48:37 +0000 (GMT)
Received: from david.siemens.de (david.siemens.de [192.35.17.14])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8967843D2F
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 30 Apr 2005 10:48:36 +0000 (GMT)
	(envelope-from Andre.Albsmeier@siemens.com)
Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14])
	by david.siemens.de (8.12.6/8.12.6) with ESMTP id j3UAmZJ1000172
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 30 Apr 2005 12:48:35 +0200
Received: from mars.cert.siemens.com (mars.cert.siemens.com [139.25.19.9])
	by mail1.siemens.de (8.12.6/8.12.6) with ESMTP id j3UAmZKI013144
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 30 Apr 2005 12:48:35 +0200
Received: from mail-ct.mchp.siemens.de (mail-ct.mchp.siemens.de [139.25.31.51])
	by mars.cert.siemens.com (8.13.4/8.13.4/$SiemensCERT: mail/cert.mc.pre,v 1.66 2005/02/14 15:55:03 mailadm Exp $) with ESMTP id j3UAmZP0034926
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 30 Apr 2005 12:48:35 +0200 (CEST)
Received: from curry.mchp.siemens.de (curry [139.25.42.7])
	by mail-ct.mchp.siemens.de (8.12.11/8.12.11) with ESMTP id j3UAmYht015976
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 30 Apr 2005 12:48:34 +0200 (MEST)
Received: (from localhost)
	by curry.mchp.siemens.de (8.13.3/8.13.3) id j3UAmYHi058236
	for FreeBSD-gnats-submit@freebsd.org; Sat, 30 Apr 2005 12:48:34 +0200 (CEST)
Message-Id: <200504301048.j3UAmYk3055290@curry.mchp.siemens.de>
Date: Sat, 30 Apr 2005 12:48:34 +0200 (CEST)
From: Andre Albsmeier <Andre.Albsmeier@siemens.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] unbreak compilation of sysutils/xloadface on 5.4-STABLE
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         80473
>Category:       ports
>Synopsis:       [PATCH] unbreak compilation of sysutils/xloadface on 5.4-STABLE
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    novel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 30 10:50:01 GMT 2005
>Closed-Date:    Sat May 14 11:47:07 GMT 2005
>Last-Modified:  Sat May 14 11:47:07 GMT 2005
>Originator:     Andre Albsmeier
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:

FreeBSD 5.4-STABLE i386

>Description:

sysutils/xloadface is marked as BROKEN for ${OSVERSION} >= 500113

>How-To-Repeat:

Try to build it :-)

>Fix:

------------------------ start of patch ------------------------
--- widgets.c.orig	Fri Apr 29 16:37:58 2005
+++ widgets.c	Fri Apr 29 16:39:09 2005
@@ -18,7 +18,7 @@
 #include "LoadFace.h"
 #include "ArrangeBox.h"
 #include "MachineInfo.h"
-#include <varargs.h>
+#include <stdarg.h>
 #include "version.h"
 #include <math.h>
 #include <X11/Xresource.h>
@@ -49,7 +49,7 @@
 
 static void exitDisplay(),popdown(),showHelp(),popdownHelp();
 
-Widget mkWidget();
+Widget mkWidget(char* name, ...);
 
 static XrmOptionDescRec optionTable[] = {
 {"-interval",	"*interval",		XrmoptionSepArg,(caddr_t)NULL},
@@ -571,11 +571,9 @@
  *                 resource-name, resource, ... , NULL);
  */
 Widget
-mkWidget(va_alist)
-va_dcl
+mkWidget(char* name, ...)
 {
 	va_list arg;
-	char *name;
 	WidgetClass class;
 	Widget parent;
 	String argname;
@@ -583,8 +581,7 @@
 	int n = 0;
 	Arg args[20];
 	
-	va_start(arg);
-	name   = va_arg(arg,char*);
+	va_start(arg, name);
 	class  = va_arg(arg,WidgetClass);
 	parent = va_arg(arg,Widget);
 
------------------------ end of patch ------------------------
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->novel 
Responsible-Changed-By: novel 
Responsible-Changed-When: Mon May 2 08:31:53 GMT 2005 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=80473 
State-Changed-From-To: open->feedback 
State-Changed-By: novel 
State-Changed-When: Mon May 2 08:36:21 GMT 2005 
State-Changed-Why:  
Asked for maintainer approval. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=80473 

From: Roman Bogorodskiy <novel@FreeBSD.org>
To: bug-followup@FreeBSD.org, Andre.Albsmeier@siemens.com,
	kazu@jp.freebsd.org
Cc:  
Subject: Re: ports/80473: [PATCH] unbreak compilation of sysutils/xloadface on 5.4-STABLE
Date: Mon, 2 May 2005 08:36:09 +0000

 Dear maintainer of sysutils/xloadface, do you approve this patch:
 
 http://www.freebsd.org/cgi/query-pr.cgi?pr=80473 ?
 
 -Roman Bogorodskiy
State-Changed-From-To: feedback->closed 
State-Changed-By: novel 
State-Changed-When: Sat May 14 11:45:59 GMT 2005 
State-Changed-Why:  
Committed, thanks! Please, use diff(1) to generate updates next time. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=80473 
>Unformatted:
