From owner-svn-src-projects@FreeBSD.ORG  Wed May 18 08:26:59 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9FAD41065672;
	Wed, 18 May 2011 08:26:59 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 763318FC0C;
	Wed, 18 May 2011 08:26:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4I8Qxb6068355;
	Wed, 18 May 2011 08:26:59 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4I8Qx6m068350;
	Wed, 18 May 2011 08:26:59 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201105180826.p4I8Qx6m068350@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Wed, 18 May 2011 08:26:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222052 - in projects/pf/pf45/contrib/pf: ftp-proxy man
	pflogd
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 May 2011 08:26:59 -0000

Author: bz
Date: Wed May 18 08:26:59 2011
New Revision: 222052
URL: http://svn.freebsd.org/changeset/base/222052

Log:
  Cleanup changes from the merge from openbsd.

Modified:
  projects/pf/pf45/contrib/pf/ftp-proxy/ftp-proxy.8
  projects/pf/pf45/contrib/pf/ftp-proxy/ftp-proxy.c
  projects/pf/pf45/contrib/pf/man/pf.os.5
  projects/pf/pf45/contrib/pf/pflogd/privsep.c

Modified: projects/pf/pf45/contrib/pf/ftp-proxy/ftp-proxy.8
==============================================================================
--- projects/pf/pf45/contrib/pf/ftp-proxy/ftp-proxy.8	Wed May 18 07:40:12 2011	(r222051)
+++ projects/pf/pf45/contrib/pf/ftp-proxy/ftp-proxy.8	Wed May 18 08:26:59 2011	(r222052)
@@ -14,7 +14,9 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: February 26 2008 $
+.\" $FreeBSD$
+.\"
+.Dd February 26, 2008
 .Dt FTP-PROXY 8
 .Os
 .Sh NAME

Modified: projects/pf/pf45/contrib/pf/ftp-proxy/ftp-proxy.c
==============================================================================
--- projects/pf/pf45/contrib/pf/ftp-proxy/ftp-proxy.c	Wed May 18 07:40:12 2011	(r222051)
+++ projects/pf/pf45/contrib/pf/ftp-proxy/ftp-proxy.c	Wed May 18 08:26:59 2011	(r222052)
@@ -16,6 +16,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/queue.h>
 #include <sys/types.h>
 #include <sys/time.h>

Modified: projects/pf/pf45/contrib/pf/man/pf.os.5
==============================================================================
--- projects/pf/pf45/contrib/pf/man/pf.os.5	Wed May 18 07:40:12 2011	(r222051)
+++ projects/pf/pf45/contrib/pf/man/pf.os.5	Wed May 18 08:26:59 2011	(r222052)
@@ -13,6 +13,7 @@
 .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
 .\" $FreeBSD$
 .\"
 .Dd May 31 2007

Modified: projects/pf/pf45/contrib/pf/pflogd/privsep.c
==============================================================================
--- projects/pf/pf45/contrib/pf/pflogd/privsep.c	Wed May 18 07:40:12 2011	(r222051)
+++ projects/pf/pf45/contrib/pf/pflogd/privsep.c	Wed May 18 08:26:59 2011	(r222052)
@@ -16,6 +16,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>