From owner-p4-projects@FreeBSD.ORG  Mon Dec  4 18:39:35 2006
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 1A32C16A513; Mon,  4 Dec 2006 18:39:35 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D256F16A500
	for <perforce@freebsd.org>; Mon,  4 Dec 2006 18:39:31 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5495043CA6
	for <perforce@freebsd.org>; Mon,  4 Dec 2006 18:38:57 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB4IdV98090526
	for <perforce@freebsd.org>; Mon, 4 Dec 2006 18:39:31 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB4IdVpT090519
	for perforce@freebsd.org; Mon, 4 Dec 2006 18:39:31 GMT
	(envelope-from millert@freebsd.org)
Date: Mon, 4 Dec 2006 18:39:31 GMT
Message-Id: <200612041839.kB4IdVpT090519@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 111049 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: Mon, 04 Dec 2006 18:39:35 -0000

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

Change 111049 by millert@millert_g5tower on 2006/12/04 18:39:07

	Install man page

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/file_cmds/ls/Makefile#2 edit
.. //depot/projects/trustedbsd/sedarwin8/darwin/file_cmds/ls/Makefile.postamble#2 edit
.. //depot/projects/trustedbsd/sedarwin8/darwin/file_cmds/ls/Makefile.preamble#2 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/file_cmds/ls/Makefile#2 (text+ko) ====

@@ -7,8 +7,6 @@
 # and Makefile.postamble (both optional), and Makefile will include them.
 #
 
-include ../../../Makeconfig
-
 NAME = ls
 
 PROJECTVERSION = 2.8
@@ -20,7 +18,7 @@
 
 OTHERSRCS = Makefile Makefile.preamble Makefile.postamble ls.1
 
-OTHER_CFLAGS =	-DCOLORLS -I$(EXPORT_HDRS)/bsd -I$(EXPORT_HDRS)/security \
+OTHER_CFLAGS =	-DCOLORLS \
 		-I/System/Library/Frameworks/System.framework/PrivateHeaders
 OTHER_LDFLAGS = -lncurses
 
@@ -35,8 +33,6 @@
 
 
 
-NEXTSTEP_BUILD_OUTPUT_DIR = $(DARWIN_ROOT)/file_cmds/Build/$(NAME)
-
 NEXTSTEP_OBJCPLUS_COMPILER = /usr/bin/cc
 WINDOWS_OBJCPLUS_COMPILER = $(DEVDIR)/gcc
 PDO_UNIX_OBJCPLUS_COMPILER = $(NEXTDEV_BIN)/gcc

==== //depot/projects/trustedbsd/sedarwin8/darwin/file_cmds/ls/Makefile.postamble#2 (text+ko) ====

@@ -1,1 +1,6 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Postamble.Common
+INSTALL_AS_USER = $(BINOWN)
+INSTALL_AS_GROUP = $(BINGRP)
+
+after_install:
+	install -m 755 -o $(MANOWN) -g $(MANGRP) -d $(DSTROOT)/usr/share/man/man1
+	install -m 644 -o $(MANOWN) -g $(MANGRP) -c ls.1 $(DSTROOT)/usr/share/man/man1

==== //depot/projects/trustedbsd/sedarwin8/darwin/file_cmds/ls/Makefile.preamble#2 (text+ko) ====

@@ -1,1 +1,2 @@
-include $(CoreOSMakefiles)/ProjectBuilder/Makefile.Preamble.Common
+-include ../../../Makeconfig
+OTHER_CFLAGS += -I$(EXPORT_HDRS)/bsd -I$(EXPORT_HDRS)/security