svn commit: r184201 - stable/6/release/scripts

[Ken Smith]

Author: kensmith
Date: Thu Oct 23 13:23:14 2008
New Revision: 184201
URL: http://svn.freebsd.org/changeset/base/184201

Log:
  Adjust package set for 6.4-REL.
  
  Approved by:	re (kib)

Modified:
  stable/6/release/scripts/package-split.py

Modified: stable/6/release/scripts/package-split.py
==============================================================================
--- stable/6/release/scripts/package-split.py	Thu Oct 23 10:38:04 2008	(r184200)
+++ stable/6/release/scripts/package-split.py	Thu Oct 23 13:23:14 2008	(r184201)
@@ -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',