From owner-svn-src-all@FreeBSD.ORG Mon Jan 31 17:03:40 2011 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 218C51065675; Mon, 31 Jan 2011 17:03:40 +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 108148FC1F; Mon, 31 Jan 2011 17:03:40 +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 p0VH3dEW032608; Mon, 31 Jan 2011 17:03:39 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0VH3dwt032606; Mon, 31 Jan 2011 17:03:39 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <201101311703.p0VH3dwt032606@svn.freebsd.org> From: Ken Smith Date: Mon, 31 Jan 2011 17:03:39 +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: r218135 - releng/7.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: Mon, 31 Jan 2011 17:03:40 -0000 Author: kensmith Date: Mon Jan 31 17:03:39 2011 New Revision: 218135 URL: http://svn.freebsd.org/changeset/base/218135 Log: MFC r218134: Update to reflect the package layout for 7.4-RELEASE. Approved by: re (implicit) Modified: releng/7.4/release/scripts/package-split.py Directory Properties: releng/7.4/release/ (props changed) releng/7.4/release/doc/ (props changed) releng/7.4/release/doc/en_US.ISO8859-1/hardware/ (props changed) releng/7.4/release/picobsd/tinyware/login/ (props changed) Modified: releng/7.4/release/scripts/package-split.py ============================================================================== --- releng/7.4/release/scripts/package-split.py Mon Jan 31 16:58:33 2011 (r218134) +++ releng/7.4/release/scripts/package-split.py Mon Jan 31 17:03:39 2011 (r218135) @@ -27,7 +27,8 @@ else: # install as a distribution def disc1_packages(): pkgs = ['lang/perl5.10'] - pkgs.extend(['x11/xorg', + if arch == 'amd64' or arch == 'i386': + pkgs.extend(['x11/xorg', 'x11-drivers/xorg-drivers', 'x11-fonts/xorg-fonts', 'x11-servers/xorg-nestserver', @@ -47,48 +48,36 @@ def disc2_packages(): 'x11/kde-lite'] else: pkgs = ['x11/gnome2', - 'x11/kdelibs4', - 'games/kdegames4'] + 'archivers/unzip', + '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/popd', + 'mail/xfmail', + 'mail/postfix', + 'misc/compat5x', + 'net/samba35'] return pkgs def disc3_packages(): pkgs = ['x11/kde4', - '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/popd', - 'mail/xfmail', - 'mail/postfix', - 'misc/compat5x', 'misc/compat6x', 'net/cvsup-without-gui', 'net/rsync', 'net/mpd5', - 'net/samba3', - 'news/slrn', - 'news/tin', + 'ports-mgmt/portaudit', 'ports-mgmt/portmaster', 'ports-mgmt/portupgrade', - 'print/a2ps-letter', - 'print/ghostscript7-nox11', - 'print/gv', - 'print/psutils-letter', 'shells/bash', 'shells/pdksh', 'shells/zsh', @@ -99,9 +88,7 @@ def disc3_packages(): 'www/apache22', 'www/links', 'www/lynx', - 'x11/rxvt', - # Formerly on disc3 - 'ports-mgmt/portaudit'] + 'x11/rxvt'] if arch == 'amd64' or arch == 'i386': pkgs.extend(['www/opera']) if arch == 'i386':