Date: Sat, 16 Jun 2001 00:52:05 -0700 From: "David O'Brien" <obrien@freebsd.org> To: freebsd-arch@freebsd.org Subject: `rcorder' patch Message-ID: <20010616005205.A39714@dragon.nuxi.com>
next in thread | raw e-mail | index | archive | help
This is the patch I sent to a NetBSD contact to see if they are willing
to apply this to their sources.
Index: Makefile
===================================================================
RCS file: /home/ncvs/src/sbin/rcorder/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile 2001/06/16 07:16:14 1.1.1.1
+++ Makefile 2001/06/16 07:46:35
@@ -1,4 +1,5 @@
# $NetBSD: Makefile,v 1.1 1999/11/23 05:28:20 mrg Exp $
+# $FreeBSD$
PROG= rcorder
SRCS= ealloc.c hash.c rcorder.c
@@ -8,6 +9,10 @@
DPADD+= ${LIBUTIL}
# XXX hack for make's hash.[ch]
+.if defined(.FreeBSD)
+CFLAGS+= -DORDER
+.else
CPPFLAGS+= -DORDER
+.endif
.include <bsd.prog.mk>
Index: ealloc.c
===================================================================
RCS file: /home/ncvs/src/sbin/rcorder/ealloc.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ealloc.c
--- ealloc.c 2001/06/16 07:16:14 1.1.1.1
+++ ealloc.c 2001/06/16 07:29:02
@@ -40,7 +40,12 @@
#include <sys/cdefs.h>
#ifndef lint
+#ifdef __FreeBSD__
+static const char rcsid[] =
+ "$FreeBSD$";
+#else
__RCSID("$NetBSD: ealloc.c,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $");
+#endif
#endif /* not lint */
#include <stdio.h>
Index: ealloc.h
===================================================================
RCS file: /home/ncvs/src/sbin/rcorder/ealloc.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ealloc.h
--- ealloc.h 2001/06/16 07:16:14 1.1.1.1
+++ ealloc.h 2001/06/16 07:29:14
@@ -1,4 +1,5 @@
/* $NetBSD: ealloc.h,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $ */
+/* $FreeBSD$ */
void *emalloc __P((size_t len));
char *estrdup __P((const char *str));
Index: hash.c
===================================================================
RCS file: /home/ncvs/src/sbin/rcorder/hash.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 hash.c
--- hash.c 2001/06/16 07:16:14 1.1.1.1
+++ hash.c 2001/06/16 07:46:25
@@ -46,7 +46,12 @@
#if 0
static char sccsid[] = "@(#)hash.c 8.1 (Berkeley) 6/6/93";
#else
+#ifdef __FreeBSD__
+static const char rcsid[] =
+ "$FreeBSD$";
+#else
__RCSID("$NetBSD: hash.c,v 1.1.1.1 1999/11/19 04:30:56 mrg Exp $");
+#endif
#endif
#endif /* not lint */
#endif
Index: hash.h
===================================================================
RCS file: /home/ncvs/src/sbin/rcorder/hash.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 hash.h
--- hash.h 2001/06/16 07:16:14 1.1.1.1
+++ hash.h 2001/06/16 07:28:20
@@ -38,6 +38,7 @@
* SUCH DAMAGE.
*
* from: @(#)hash.h 8.1 (Berkeley) 6/6/93
+ * $FreeBSD$
*/
/* hash.h --
Index: rcorder.8
===================================================================
RCS file: /home/ncvs/src/sbin/rcorder/rcorder.8,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 rcorder.8
--- rcorder.8 2001/06/16 07:16:14 1.1.1.1
+++ rcorder.8 2001/06/16 07:30:18
@@ -1,4 +1,5 @@
.\" $NetBSD: rcorder.8,v 1.2 2000/07/05 15:45:30 msaitoh Exp $
+.\" $FreeBSD$
.\"
.\" Copyright (c) 1998
.\" Perry E. Metzger. All rights reserved.
Index: rcorder.c
===================================================================
RCS file: /home/ncvs/src/sbin/rcorder/rcorder.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 rcorder.c
--- rcorder.c 2001/06/16 07:16:14 1.1.1.1
+++ rcorder.c 2001/06/16 07:46:04
@@ -41,11 +41,21 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#ifdef __FreeBSD__
+#include <libutil.h>
+#else
#include <util.h>
+#endif
#include "ealloc.h"
#include "sprite.h"
#include "hash.h"
+
+#if !defined(lint) && defined(__FreeBSD__)
+static const char rcsid[] =
+ "$FreeBSD$";
+#endif /* not lint */
+
#ifdef DEBUG
int debug = 0;
Index: sprite.h
===================================================================
RCS file: /home/ncvs/src/sbin/rcorder/sprite.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 sprite.h
--- sprite.h 2001/06/16 07:16:14 1.1.1.1
+++ sprite.h 2001/06/16 07:31:32
@@ -38,6 +38,7 @@
* SUCH DAMAGE.
*
* from: @(#)sprite.h 8.1 (Berkeley) 6/6/93
+ * $FreeBSD$
*/
/*
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-arch" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010616005205.A39714>