From owner-svn-src-all@FreeBSD.ORG Thu Oct 23 13:24:59 2008 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F3C55106567E; Thu, 23 Oct 2008 13:24:58 +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 E265D8FC13; Thu, 23 Oct 2008 13:24:58 +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 m9NDOwgc057781; Thu, 23 Oct 2008 13:24:58 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9NDOwiQ057780; Thu, 23 Oct 2008 13:24:58 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <200810231324.m9NDOwiQ057780@svn.freebsd.org> From: Ken Smith Date: Thu, 23 Oct 2008 13:24:58 +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: r184202 - releng/6.4/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: Thu, 23 Oct 2008 13:24:59 -0000 Author: kensmith Date: Thu Oct 23 13:24:58 2008 New Revision: 184202 URL: http://svn.freebsd.org/changeset/base/184202 Log: Adjust package set for 6.4-REL. Approved by: re (kib) Modified: releng/6.4/release/scripts/package-split.py Modified: releng/6.4/release/scripts/package-split.py ============================================================================== --- releng/6.4/release/scripts/package-split.py Thu Oct 23 13:23:14 2008 (r184201) +++ releng/6.4/release/scripts/package-split.py Thu Oct 23 13:24:58 2008 (r184202) @@ -26,13 +26,12 @@ else: # List of packages for disc1. This just includes packages sysinstall can # install as a distribution def disc1_packages(): - pkgs = ['lang/perl5.8'] - pkgs.extend(['x11/xorg', - 'x11-drivers/xorg-drivers', - 'x11-fonts/xorg-fonts', - 'x11-servers/xorg-nestserver', - 'x11-servers/xorg-vfbserver', - 'devel/imake']) + pkgs = ['archivers/unzip', + 'emulators/mtools', + 'lang/perl5.8', + 'misc/compat5x', + 'net/cvsup-without-gui', + 'net/rsync'] if arch == 'alpha': pkgs.append('emulators/osf1_base') elif arch == 'i386': @@ -49,42 +48,45 @@ def disc2_packages(): 'x11/kde-lite'] else: pkgs = ['x11/gnome2', - 'x11/kde3'] + 'x11/kdebase3', + 'x11/kdelibs3'] + pkgs.extend(['x11/xorg', + 'x11-drivers/xorg-drivers', + 'x11-fonts/xorg-fonts', + 'x11-servers/xorg-nestserver', + 'x11-servers/xorg-vfbserver', + 'devel/imake']) return pkgs def disc3_packages(): - pkgs = ['x11-wm/afterstep', + pkgs = ['x11/kde3', + 'x11-wm/afterstep', 'x11-wm/windowmaker', 'x11-wm/fvwm2', # "Nice to have" - 'archivers/unzip', 'astro/xearth', 'devel/gmake', 'editors/emacs', 'editors/vim-lite', 'editors/xemacs', - 'emulators/mtools', 'graphics/png', 'graphics/xv', 'irc/xchat', 'lang/php5', + 'mail/alpine', 'mail/exim', 'mail/fetchmail', 'mail/mutt', - 'mail/pine4', 'mail/popd', 'mail/xfmail', 'mail/postfix', - 'misc/compat5x', - 'net/cvsup-without-gui', - 'net/rsync', 'net/samba3', 'news/slrn', 'news/tin', 'ports-mgmt/portupgrade', 'print/a2ps-letter', 'print/apsfilter', - 'print/ghostscript-gnu-nox11', + 'print/ghostscript7-nox11', 'print/gv', 'print/psutils-letter', 'print/teTeX',