From owner-svn-src-all@FreeBSD.ORG  Wed Mar 10 19:18:19 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 822E1106567C;
	Wed, 10 Mar 2010 19:18:19 +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 57B478FC22;
	Wed, 10 Mar 2010 19:18:19 +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 o2AJIJAj037679;
	Wed, 10 Mar 2010 19:18:19 GMT
	(envelope-from kensmith@svn.freebsd.org)
Received: (from kensmith@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2AJIJg8037677;
	Wed, 10 Mar 2010 19:18:19 GMT
	(envelope-from kensmith@svn.freebsd.org)
Message-Id: <201003101918.o2AJIJg8037677@svn.freebsd.org>
From: Ken Smith <kensmith@FreeBSD.org>
Date: Wed, 10 Mar 2010 19:18:19 +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: r204968 - releng/7.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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Mar 2010 19:18:19 -0000

Author: kensmith
Date: Wed Mar 10 19:18:19 2010
New Revision: 204968
URL: http://svn.freebsd.org/changeset/base/204968

Log:
  Merge r204967: Package set for 7.3-RELEASE.
  
  Reviewed by:	portmgr@, re@
  Approved by:	re (implicit)

Modified:
  releng/7.3/release/scripts/package-split.py
Directory Properties:
  releng/7.3/release/   (props changed)
  releng/7.3/release/doc/   (props changed)
  releng/7.3/release/doc/en_US.ISO8859-1/hardware/   (props changed)

Modified: releng/7.3/release/scripts/package-split.py
==============================================================================
--- releng/7.3/release/scripts/package-split.py	Wed Mar 10 19:00:33 2010	(r204967)
+++ releng/7.3/release/scripts/package-split.py	Wed Mar 10 19:18:19 2010	(r204968)
@@ -26,7 +26,7 @@ else:
 # List of packages for disc1.  This just includes packages sysinstall can
 # install as a distribution
 def disc1_packages():
-    pkgs = ['lang/perl5.8']
+    pkgs = ['lang/perl5.10']
     pkgs.extend(['x11/xorg',
 		 'x11-drivers/xorg-drivers',
 		 'x11-fonts/xorg-fonts',
@@ -47,13 +47,8 @@ def disc2_packages():
 		'x11/kde-lite']
     else:
 	pkgs = ['x11/gnome2',
-		'x11/kdebase4',
 		'x11/kdelibs4',
-		'games/kdegames4',
-		'graphics/kdegraphics4',
-		'misc/kdeutils4',
-		'multimedia/kdemultimedia4',
-		'net/kdenetwork4']
+		'games/kdegames4']
     return pkgs
 
 def disc3_packages():
@@ -84,21 +79,21 @@ def disc3_packages():
             'misc/compat6x',
             'net/cvsup-without-gui',
             'net/rsync',
+            'net/mpd5',
             'net/samba3',
             'news/slrn',
             'news/tin',
+            'ports-mgmt/portmaster',
             'ports-mgmt/portupgrade',
             'print/a2ps-letter',
-            'print/apsfilter',
             'print/ghostscript7-nox11',
             'print/gv',
             'print/psutils-letter',
-            'print/teTeX',
             'shells/bash',
             'shells/pdksh',
             'shells/zsh',
             'security/sudo',
-            'textproc/docproj-jadetex',
+            'sysutils/screen',
             'www/apache13',
             'www/apache13-modssl',
             'www/apache22',