From owner-svn-src-all@FreeBSD.ORG Fri Apr 6 17:49:12 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 53A1E106566B; Fri, 6 Apr 2012 17:49:12 +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 255948FC0C; Fri, 6 Apr 2012 17:49:12 +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 q36HnC9i019790; Fri, 6 Apr 2012 17:49:12 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q36HnBKn019788; Fri, 6 Apr 2012 17:49:11 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <201204061749.q36HnBKn019788@svn.freebsd.org> From: Ken Smith Date: Fri, 6 Apr 2012 17:49:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233956 - releng/8.3/release/scripts X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Apr 2012 17:49:12 -0000 Author: kensmith Date: Fri Apr 6 17:49:11 2012 New Revision: 233956 URL: http://svn.freebsd.org/changeset/base/233956 Log: MFS r233658: Update with the package set that will ship with 8.3-RELEASE. Reviewed by: portmgr, re Approved by: re (bz) Modified: releng/8.3/release/scripts/package-split.py Directory Properties: releng/8.3/release/ (props changed) Modified: releng/8.3/release/scripts/package-split.py ============================================================================== --- releng/8.3/release/scripts/package-split.py Fri Apr 6 17:21:31 2012 (r233955) +++ releng/8.3/release/scripts/package-split.py Fri Apr 6 17:49:11 2012 (r233956) @@ -23,18 +23,28 @@ if 'PKG_VERBOSE' in os.environ: else: verbose = 0 +if 'PKG_MEMSTICK' in os.environ: + doing_memstick = 1 +else: + doing_memstick = 0 + if 'PKG_DVD' in os.environ: doing_dvd = 1 else: doing_dvd = 0 -# List of packages for disc1. +# List of packages. At this point only the English documentation fits +# on disc1. Add in the rest of the documentation for the memstick image. +# And add in enough packages to make a basic graphical workstation for the +# dvd image. def disc1_packages(): - pkgs = ['misc/freebsd-doc-bn', + pkgs = ['misc/freebsd-doc-en'] + + if doing_memstick or doing_dvd: + pkgs.extend(['misc/freebsd-doc-bn', 'misc/freebsd-doc-da', 'misc/freebsd-doc-de', 'misc/freebsd-doc-el', - 'misc/freebsd-doc-en', 'misc/freebsd-doc-es', 'misc/freebsd-doc-fr', 'misc/freebsd-doc-hu', @@ -48,22 +58,24 @@ def disc1_packages(): 'misc/freebsd-doc-sr', 'misc/freebsd-doc-tr', 'misc/freebsd-doc-zh_cn', - 'misc/freebsd-doc-zh_tw'] + 'misc/freebsd-doc-zh_tw']) if doing_dvd: pkgs.extend(['archivers/unzip', 'emulators/linux_base-f10', - 'lang/perl5.10', + 'lang/perl5.12', + 'misc/freebsd-doc-all', 'net/mpd5', 'net/rsync', - 'ports-mgmt/p5-FreeBSD-Portindex', 'ports-mgmt/portaudit', 'ports-mgmt/portmaster', - 'ports-mgmt/portupgrade', 'shells/bash', 'shells/zsh', 'security/sudo', 'sysutils/screen', + 'www/firefox', + 'www/links', + 'x11-drivers/xf86-video-vmware', 'x11/gnome2', 'x11/kde4', 'x11/xorg'])