From e309760bac7fa48f392f41c4c8552c8c6960ccc4 Mon Sep 17 00:00:00 2001
From: krion <krion@FreeBSD.org>
Date: Thu, 16 Oct 2003 07:52:01 +0000
Subject: - Unbreak this port on -current - Maintainer informed

PR:		58093
Submitted by:	Michael Edenfield <kutulu@kutulu.org>
---
 irc/party/Makefile            |  4 ---
 irc/party/files/patch-party.c | 64 +++++++++++++++++++++++++++++++++++++++++++
 irc/party/files/patch-party.h | 11 ++++++++
 3 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100644 irc/party/files/patch-party.c
 create mode 100644 irc/party/files/patch-party.h

(limited to 'irc')

diff --git a/irc/party/Makefile b/irc/party/Makefile
index f8ff45e2d00c..419d9d3b99d8 100644
--- a/irc/party/Makefile
+++ b/irc/party/Makefile
@@ -18,10 +18,6 @@ MAN1=	party.1
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 do-install:
 	${INSTALL_SCRIPT} -g nobody -o nobody -m 4711 ${WRKSRC}/party ${PREFIX}/bin
 	${MKDIR} ${PREFIX}/lib/party
diff --git a/irc/party/files/patch-party.c b/irc/party/files/patch-party.c
new file mode 100644
index 000000000000..2d9d5a5cfa03
--- /dev/null
+++ b/irc/party/files/patch-party.c
@@ -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 --git a/irc/party/files/patch-party.h b/irc/party/files/patch-party.h
new file mode 100644
index 000000000000..df57a217a2a6
--- /dev/null
+++ b/irc/party/files/patch-party.h
@@ -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();
-- 
cgit