From owner-p4-projects@FreeBSD.ORG  Sun Jul 17 14:03:14 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E260816A420; Sun, 17 Jul 2005 14:03:13 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BCAFC16A41C
	for <perforce@freebsd.org>; Sun, 17 Jul 2005 14:03:13 +0000 (GMT)
	(envelope-from soc-tyler@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8AEB843D45
	for <perforce@freebsd.org>; Sun, 17 Jul 2005 14:03:13 +0000 (GMT)
	(envelope-from soc-tyler@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6HE3D5p018274
	for <perforce@freebsd.org>; Sun, 17 Jul 2005 14:03:13 GMT
	(envelope-from soc-tyler@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6HE3DiM018271
	for perforce@freebsd.org; Sun, 17 Jul 2005 14:03:13 GMT
	(envelope-from soc-tyler@freebsd.org)
Date: Sun, 17 Jul 2005 14:03:13 GMT
Message-Id: <200507171403.j6HE3DiM018271@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-tyler@freebsd.org using -f
From: soc-tyler <soc-tyler@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 80390 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Sun, 17 Jul 2005 14:03:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=80390

Change 80390 by soc-tyler@soc-tyler_launchd on 2005/07/17 14:02:56

	Start merging FreeBSD-CURRENT init(8) code in a manner similar to that used by zarzycki@ with 10.3's init(8) code to 10.4's launchd(8) release.
	Oh, and add some other stuff

Affected files ...

.. //depot/projects/soc2005/launchd/Makefile#5 edit
.. //depot/projects/soc2005/launchd/includes/launch.h#5 edit
.. //depot/projects/soc2005/launchd/init.8#3 add
.. //depot/projects/soc2005/launchd/init.c#4 add
.. //depot/projects/soc2005/launchd/launchd.8#1 add
.. //depot/projects/soc2005/launchd/launchd_debugd.8#1 add

Differences ...

==== //depot/projects/soc2005/launchd/Makefile#5 (text+ko) ====

@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PROG=	launchd
-SRCS=	launchd.c liblaunch.c launchdebugd.c launchproxy.c init.c
+SRCS=	launchd.c liblaunch.c init.c
+#launchdebugd.c launchproxy.c
 MAN=	launchd.conf.5 launchd.plist.5 init.8 launchd.8 \
 	launchd_debug.8 launchproxy.8 rc.8 service.8 
 	

==== //depot/projects/soc2005/launchd/includes/launch.h#5 (text+ko) ====

@@ -58,7 +58,7 @@
 #define _BUILD_DARWIN_
 #endif
 
-#ifdef _BUILD_DARWIN_
+#ifndef _BUILD_DARWIN_
 // on Darwin-based systems, LOG_LAUNCHD is defined for syslog()
 #define LOG_LAUNCHD LOG_DAEMON
 #endif