Date: Sat, 30 Aug 2003 18:32:46 -0400 (EDT) From: Michael Edenfield <kutulu@kutulu.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/56214: net/cap: file build on -current Message-ID: <20030830223246.15FF8B82A@wombat.localnet> Resent-Message-ID: <200308302240.h7UMeHQm065620@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 56214 >Category: ports >Synopsis: net/cap: file build on -current >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: Sat Aug 30 15:40:17 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: o varargs -> stdarg o remove non-existant host from {MASTER,PATCH}_SITES: # host ftp-ns.rutgers.edu Host not found. >How-To-Repeat: >Fix: --- cap.patch begins here --- diff -urN cap.orig/Makefile cap/Makefile --- cap.orig/Makefile Thu Feb 20 13:50:52 2003 +++ cap/Makefile Sat Aug 30 18:20:58 2003 @@ -9,9 +9,7 @@ PORTVERSION= 6.0.198 PORTREVISION= 1 CATEGORIES= net -MASTER_SITES= ftp://ftp-ns.rutgers.edu/pub/cap/ \ - ftp://ftp-ns.rutgers.edu/pub/cap/cap.patches/ \ - ftp://munnari.OZ.AU/mac/ \ +MASTER_SITES= ftp://munnari.OZ.AU/mac/ \ ftp://munnari.OZ.AU/mac/cap.patches/ \ ftp://ftp.kuis.kyoto-u.ac.jp/net/cap/ \ ftp://ftp.kuis.kyoto-u.ac.jp/net/cap/cap60.patches/ @@ -19,8 +17,7 @@ patches.144-154.tar.Z patches.155-162.tar.Z \ patches.163-182.tar.Z patches.183-192.tar.Z -PATCH_SITES= ftp://ftp-ns.rutgers.edu/pub/cap/cap.patches/ \ - ftp://munnari.OZ.AU/mac/cap.patches/ +PATCH_SITES= ftp://munnari.OZ.AU/mac/cap.patches/ PATCHFILES= cap60.patch193 cap60.patch194 cap60.patch195 cap60.patch196 \ cap60.patch197 cap60.patch198 diff -urN cap.orig/files/patch-lib-cap-ablog.c cap/files/patch-lib-cap-ablog.c --- cap.orig/files/patch-lib-cap-ablog.c Mon Feb 3 07:11:14 2003 +++ cap/files/patch-lib-cap-ablog.c Sat Aug 30 18:26:48 2003 @@ -1,6 +1,6 @@ ---- lib/cap/ablog.c.orig Mon Feb 3 01:16:00 2003 -+++ lib/cap/ablog.c Mon Feb 3 03:48:59 2003 -@@ -24,6 +24,7 @@ +--- lib/cap/ablog.c.orig Sat Aug 30 18:19:18 2003 ++++ lib/cap/ablog.c Sat Aug 30 18:25:05 2003 +@@ -24,13 +24,14 @@ * */ @@ -8,6 +8,14 @@ #include <stdio.h> #include <sys/types.h> #include <sys/time.h> + #include <netat/appletalk.h> + + #ifdef USEVPRINTF +-# include <varargs.h> ++# include <stdarg.h> + #endif USEVPRINTF + #ifdef USETIMES + # include <time.h> @@ -66,8 +67,13 @@ * This is something all machine should, but don't have :-) */ @@ -23,7 +31,20 @@ #ifndef USEVPRINTF /* Bletch - gotta do it because pyramids don't work the other way */ -@@ -91,7 +97,7 @@ +@@ -79,19 +85,16 @@ + char *fmt; + #else USEVPRINTF + /*VARARGS*/ +-logit(va_alist) +-va_dcl ++logit(int level, char *fmt, ...) + #endif USEVPRINTF + { + static char *mytod(); + #ifdef USEVPRINTF +- register char *fmt; + va_list args; +- int level; #endif USEVPRINTF int saveerr; extern int errno; @@ -32,3 +53,14 @@ #ifndef __FreeBSD__ extern char *sys_errlist[]; #endif +@@ -101,9 +104,7 @@ + + saveerr = errno; + #ifdef USEVPRINTF +- va_start(args); +- level = va_arg(args, int); +- fmt = va_arg(args, char *); ++ va_start(args, fmt); + #endif USEVPRINTF + + if (dlevel < (level & L_LVL)) --- cap.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030830223246.15FF8B82A>