svn commit: r204968 - releng/7.3/release/scripts

[Ken Smith]

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',