From owner-p4-projects@FreeBSD.ORG  Thu Jun 17 23:37:11 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C037B1065676; Thu, 17 Jun 2010 23:37:11 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 84CB9106564A
	for <perforce@FreeBSD.org>; Thu, 17 Jun 2010 23:37:11 +0000 (UTC)
	(envelope-from bfiedler@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 724858FC0C
	for <perforce@FreeBSD.org>; Thu, 17 Jun 2010 23:37:11 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5HNbBsH006775
	for <perforce@FreeBSD.org>; Thu, 17 Jun 2010 23:37:11 GMT
	(envelope-from bfiedler@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5HNbBgf006773
	for perforce@freebsd.org; Thu, 17 Jun 2010 23:37:11 GMT
	(envelope-from bfiedler@FreeBSD.org)
Date: Thu, 17 Jun 2010 23:37:11 GMT
Message-Id: <201006172337.o5HNbBgf006773@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bfiedler@FreeBSD.org using -f
From: Benjamin Fiedler <bfiedler@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 179741 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Jun 2010 23:37:12 -0000

http://p4web.freebsd.org/@@179741?ac=10

Change 179741 by bfiedler@freebsd-7803 on 2010/06/17 23:36:28

	Sdiff now compiles on FreeBSD (w/ warnings), but depends on external headers in /usr/src

Affected files ...

.. //depot/projects/soc2010/bsdtextproc/sdiff/Makefile#2 edit
.. //depot/projects/soc2010/bsdtextproc/sdiff/common.h#2 edit
.. //depot/projects/soc2010/bsdtextproc/sdiff/sdiff.c#2 edit

Differences ...

==== //depot/projects/soc2010/bsdtextproc/sdiff/Makefile#2 (text+ko) ====

@@ -1,5 +1,16 @@
 #	$OpenBSD: Makefile,v 1.4 2006/02/20 08:38:18 otto Exp $
 
+
+#.if defined(__FreeBSD__)
+
+INCLUDEDIR+=/usr/src/crypto/openssh/openbsd-compat /usr/src/contrib/traceroute/lbl
+
+.for dir in ${INCLUDEDIR}
+          CFLAGS+= -I${dir}
+.endfor
+
+#.endif
+
 PROG=sdiff
 SRCS=common.c edit.c sdiff.c
 COPTS+=-Wall -W
@@ -7,4 +18,6 @@
 LDADD+=	-lutil
 DPADD+=	${LIBUTIL}
 
+
+
 .include <bsd.prog.mk>

==== //depot/projects/soc2010/bsdtextproc/sdiff/common.h#2 (text+ko) ====

@@ -5,4 +5,8 @@
  * Public domain.
  */
 
+#ifdef __FreeBSD__
+#include "gnuc.h"
+#endif
+
 __dead void cleanup(const char *);

==== //depot/projects/soc2010/bsdtextproc/sdiff/sdiff.c#2 (text+ko) ====

@@ -22,7 +22,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <util.h>
+
+#ifdef __FreeBSD__
+	#include <sys-queue.h>
+	#include <stdint.h>
+	#include <libutil.h>
+#else
+	#include <util.h>
+#endif
 
 #include "common.h"
 #include "extern.h"