From owner-svn-src-stable-6@FreeBSD.ORG Wed Nov 5 14:15:22 2008 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B3231065670; Wed, 5 Nov 2008 14:15:22 +0000 (UTC) (envelope-from danger@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 480D18FC31; Wed, 5 Nov 2008 14:15:22 +0000 (UTC) (envelope-from danger@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mA5EFMAH028896; Wed, 5 Nov 2008 14:15:22 GMT (envelope-from danger@svn.freebsd.org) Received: (from danger@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA5EFMVm028895; Wed, 5 Nov 2008 14:15:22 GMT (envelope-from danger@svn.freebsd.org) Message-Id: <200811051415.mA5EFMVm028895@svn.freebsd.org> From: Daniel Gerzo Date: Wed, 5 Nov 2008 14:15:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184687 - in stable/6/usr.sbin/portsnap: . portsnap X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Nov 2008 14:15:22 -0000 Author: danger (doc committer) Date: Wed Nov 5 14:15:22 2008 New Revision: 184687 URL: http://svn.freebsd.org/changeset/base/184687 Log: MFC rev. 183041: - remove superfluous word PR: docs/127401 Submitted by: Mick Charles Beaver Approved by: re@ (blackend) Modified: stable/6/usr.sbin/portsnap/ (props changed) stable/6/usr.sbin/portsnap/portsnap/portsnap.8 Modified: stable/6/usr.sbin/portsnap/portsnap/portsnap.8 ============================================================================== --- stable/6/usr.sbin/portsnap/portsnap/portsnap.8 Wed Nov 5 14:14:31 2008 (r184686) +++ stable/6/usr.sbin/portsnap/portsnap/portsnap.8 Wed Nov 5 14:15:22 2008 (r184687) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 13, 2005 +.Dd September 15, 2008 .Dt PORTSNAP 8 .Os FreeBSD .Sh NAME @@ -60,7 +60,7 @@ Store working files (e.g. downloaded upd .Pa /var/db/portsnap , or as given in the configuration file.) .It Fl f Ar conffile -Read the configuration from from +Read the configuration from .Ar conffile . (default: .Pa /etc/portsnap.conf ) From owner-svn-src-stable-6@FreeBSD.ORG Thu Nov 6 13:32:49 2008 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 67FD610656AD; Thu, 6 Nov 2008 13:32:49 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 564978FC25; Thu, 6 Nov 2008 13:32:49 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mA6DWnas056805; Thu, 6 Nov 2008 13:32:49 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA6DWnN1056804; Thu, 6 Nov 2008 13:32:49 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <200811061332.mA6DWnN1056804@svn.freebsd.org> From: Ken Smith Date: Thu, 6 Nov 2008 13:32:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184724 - stable/6/release X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Nov 2008 13:32:49 -0000 Author: kensmith Date: Thu Nov 6 13:32:49 2008 New Revision: 184724 URL: http://svn.freebsd.org/changeset/base/184724 Log: Oops. Correct a mis-merge. This piece of r183860 didn't make it through while doing the merge. PR: misc/128610 Submitted by: veron x503 hotmail com Approved by: re (blackend, kib) Modified: stable/6/release/Makefile Modified: stable/6/release/Makefile ============================================================================== --- stable/6/release/Makefile Thu Nov 6 13:28:50 2008 (r184723) +++ stable/6/release/Makefile Thu Nov 6 13:32:49 2008 (r184724) @@ -1109,7 +1109,7 @@ CD_DISC2_PKGS= ${CD_PACKAGE_TREE}/disc2 CD_DISC3_PKGS= ${CD_PACKAGE_TREE}/disc3 .endif .if exists(${CD_PACKAGE_TREE}/dvd1) -CD_DVD_PKGS= ${CD_PACKAGE_TREE}/dvd1 +CD_DVD1_PKGS= ${CD_PACKAGE_TREE}/dvd1 .endif .endif .endif From owner-svn-src-stable-6@FreeBSD.ORG Fri Nov 7 22:06:50 2008 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F10551065670; Fri, 7 Nov 2008 22:06:50 +0000 (UTC) (envelope-from blackend@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DE8138FC16; Fri, 7 Nov 2008 22:06:50 +0000 (UTC) (envelope-from blackend@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mA7M6omV094057; Fri, 7 Nov 2008 22:06:50 GMT (envelope-from blackend@svn.freebsd.org) Received: (from blackend@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA7M6oKx094056; Fri, 7 Nov 2008 22:06:50 GMT (envelope-from blackend@svn.freebsd.org) Message-Id: <200811072206.mA7M6oKx094056@svn.freebsd.org> From: Marc Fonvieille Date: Fri, 7 Nov 2008 22:06:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184755 - stable/6/usr.sbin/sysinstall X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Nov 2008 22:06:51 -0000 Author: blackend (doc committer) Date: Fri Nov 7 22:06:50 2008 New Revision: 184755 URL: http://svn.freebsd.org/changeset/base/184755 Log: MFC: rev. 184753 Update ports number and size of Ports Collection. Approved by: re (kib) Modified: stable/6/usr.sbin/sysinstall/dist.c Modified: stable/6/usr.sbin/sysinstall/dist.c ============================================================================== --- stable/6/usr.sbin/sysinstall/dist.c Fri Nov 7 22:06:04 2008 (r184754) +++ stable/6/usr.sbin/sysinstall/dist.c Fri Nov 7 22:06:50 2008 (r184755) @@ -303,8 +303,8 @@ distMaybeSetPorts(dialogMenuItem *self) { dialog_clear_norefresh(); if (!msgYesNo("Would you like to install the FreeBSD ports collection?\n\n" - "This will give you ready access to over 14,900 ported software packages,\n" - "at a cost of around 440MB of disk space when \"clean\" and possibly\n" + "This will give you ready access to over 19,000 ported software packages,\n" + "at a cost of around 445MB of disk space when \"clean\" and possibly\n" "much more than that when a lot of the distribution tarballs are loaded\n" "(unless you have the extra discs available from a FreeBSD CD/DVD distribution\n" "and can mount them on /cdrom, in which case this is far less of a problem).\n\n"