Date: Wed, 15 Oct 2003 18:37:12 -0400 (EDT) From: Michael Edenfield <kutulu@kutulu.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/58093: irc/party: fix build on 5.x Message-ID: <20031015223712.96C32B855@wombat.localnet> Resent-Message-ID: <200310152240.h9FMeD1i028516@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 58093
>Category: ports
>Synopsis: irc/party: fix build on 5.x
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Wed Oct 15 15:40:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Michael Edenfield
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD wombat.localnet 5.1-CURRENT FreeBSD 5.1-CURRENT #7: Sun Aug 24 21:35:57 EDT 2003 root@wombat.localnet:/usr/obj/usr/src/sys/ATHLON i386
>Description:
>How-To-Repeat:
>Fix:
--- patch.party begins here ---
diff -urN party.orig/files/patch-party.c party/files/patch-party.c
--- party.orig/files/patch-party.c Wed Dec 31 19:00:00 1969
+++ party/files/patch-party.c Wed Oct 15 18:34:46 2003
@@ -0,0 +1,64 @@
+--- party.c.orig Wed Oct 15 18:28:00 2003
++++ party.c Wed Oct 15 18:32:29 2003
+@@ -82,7 +82,7 @@
+ #include <errno.h>
+ #include <ctype.h>
+ #ifdef VAR_ARGS
+-#include <varargs.h>
++#include <stdarg.h>
+ #endif /*VAR_ARGS*/
+
+ char *version= "2.12"; /* current party version */
+@@ -787,23 +787,21 @@
+ #endif /*BSD*/
+
+ #ifdef VAR_ARGS
+-vint db(va_alist)
+-va_dcl
++vint db(char *msg, ...)
+ {
+ va_list ap;
+-char *msg;
+ long now;
+
+ if (debug)
+ {
+- va_start(ap);
+- msg= va_arg(ap, char *);
++ va_start(ap, msg);
+
+ now= time((long *)0);
+ fprintf(debug,"%8.8s: ",ctime(&now)+11);
+ vfprintf(debug,msg,ap);
+ fflush(debug);
+ }
++ va_end(ap);
+ }
+ #else
+ vint db(msg,arg1,arg2,arg3,arg4)
+@@ -823,15 +821,12 @@
+
+
+ #ifdef VAR_ARGS
+-vint err(va_alist)
+-va_dcl
++vint err(char *msg, ...)
+ {
+ va_list ap;
+-char *msg;
+ long now;
+
+- va_start(ap);
+- msg= va_arg(ap, char *);
++ va_start(ap, msg);
+ fprintf(stderr,"%s error: ",progname);
+ vfprintf(stderr,msg,ap);
+
+@@ -843,6 +838,7 @@
+ vfprintf(debug,msg,ap);
+ fflush(debug);
+ }
++ va_end(ap);
+ }
+ #else
+ vint err(msg,arg1,arg2,arg3,arg4)
diff -urN party.orig/files/patch-party.h party/files/patch-party.h
--- party.orig/files/patch-party.h Wed Dec 31 19:00:00 1969
+++ party/files/patch-party.h Wed Oct 15 18:35:01 2003
@@ -0,0 +1,11 @@
+--- party.h.orig Wed Oct 15 18:31:34 2003
++++ party.h Wed Oct 15 18:31:58 2003
+@@ -464,7 +464,7 @@
+ #ifdef BSD
+ int susp();
+ #endif /*BSD*/
+-vint err(), db();
++vint err(char *, ...), db(char *, ...);
+ char *getlogin(), *malloc(), *ctime(), *fgets(), *getenv();
+ char *chn_file_name(), *getline();
+ char *strchr(), *strpbrk(), *strrchr(), *strstr();
--- patch.party ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031015223712.96C32B855>