From owner-svn-src-stable@FreeBSD.ORG  Tue Nov 23 01:39:31 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F2CD4106566B;
	Tue, 23 Nov 2010 01:39:30 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C60CC8FC12;
	Tue, 23 Nov 2010 01:39:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAN1dUPC012920;
	Tue, 23 Nov 2010 01:39:30 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAN1dUvR012917;
	Tue, 23 Nov 2010 01:39:30 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201011230139.oAN1dUvR012917@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 23 Nov 2010 01:39:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215730 - in stable/8: etc/periodic/security
	tools/build/mk
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Nov 2010 01:39:31 -0000

Author: delphij
Date: Tue Nov 23 01:39:30 2010
New Revision: 215730
URL: http://svn.freebsd.org/changeset/base/215730

Log:
  MFC r204459 (antonie):
  
  Add files to remove when MK_PKGTOOLS=no.
  
  MFC r215045 [1]:
  
  Hide 460.chkportsum in MK_PKGTOOLS != no case.
  
  Submitted by:	Alex Kozlov <spam rm-rf kiev ua> [1]

Modified:
  stable/8/etc/periodic/security/Makefile
  stable/8/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/8/etc/periodic/security/   (props changed)
  stable/8/tools/build/mk/   (props changed)

Modified: stable/8/etc/periodic/security/Makefile
==============================================================================
--- stable/8/etc/periodic/security/Makefile	Tue Nov 23 01:32:44 2010	(r215729)
+++ stable/8/etc/periodic/security/Makefile	Tue Nov 23 01:39:30 2010	(r215730)
@@ -7,7 +7,6 @@ FILES=	100.chksetuid \
 	300.chkuid0 \
 	400.passwdless \
 	410.logincheck \
-	460.chkportsum \
 	700.kernelmsg \
 	800.loginfail \
 	900.tcpwrap \
@@ -28,4 +27,8 @@ FILES+=	500.ipfwdenied \
 FILES+=	520.pfdenied
 .endif
 
+.if ${MK_PKGTOOLS} != "no"
+FILES+=	460.chkportsum
+.endif
+
 .include <bsd.prog.mk>

Modified: stable/8/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/8/tools/build/mk/OptionalObsoleteFiles.inc	Tue Nov 23 01:32:44 2010	(r215729)
+++ stable/8/tools/build/mk/OptionalObsoleteFiles.inc	Tue Nov 23 01:39:30 2010	(r215730)
@@ -1213,6 +1213,23 @@ OLD_FILES+=usr/share/man/man1/nc.1.gz
 # to be filled in
 #.endif
 
+.if ${MK_PKGTOOLS} == no
+OLD_FILES+=etc/periodic/security/460.chkportsum
+OLD_FILES+=etc/periodic/weekly/400.status-pkg
+OLD_FILES+=usr/sbin/pkg_add
+OLD_FILES+=usr/sbin/pkg_create
+OLD_FILES+=usr/sbin/pkg_delete
+OLD_FILES+=usr/sbin/pkg_info
+OLD_FILES+=usr/sbin/pkg_updating
+OLD_FILES+=usr/sbin/pkg_version
+OLD_FILES+=usr/share/man/man1/pkg_add.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_create.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_delete.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_info.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_updating.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_version.1.gz
+.endif
+
 .if ${MK_PROFILE} == no
 OLD_FILES+=usr/lib/libalias_cuseeme_p.a
 OLD_FILES+=usr/lib/libalias_dummy_p.a