[Midnightbsd-cvs] src: package-split.py: Work in progress.

[laffer1 at midnightbsd.org]

Log Message:
-----------
Work in progress.  Modify the package-split to use 3 cds.  

Add kde-lite (if svn is fixed, full kde can be used), wine, portupgrade, bash3, ...

Remove bash2

Tags:
----
RELENG_0_2

Modified Files:
--------------
    src/release/scripts:
        package-split.py (r1.7 -> r1.7.4.1)

-------------- next part --------------
Index: package-split.py
===================================================================
RCS file: /home/cvs/src/release/scripts/package-split.py,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -L release/scripts/package-split.py -L release/scripts/package-split.py -u -r1.7 -r1.7.4.1
--- release/scripts/package-split.py
+++ release/scripts/package-split.py
@@ -28,11 +28,13 @@
 # List of packages for disc1.  This just includes packages sysinstall can
 # install as a distribution
 def disc1_packages():
-    # 5.x only
     pkgs = ['lang/perl5.8']
     pkgs.extend(['x11/xorg',
-                 'x11/xorg-manpages',
-                 'devel/imake-6'])
+                 'x11-drivers/xorg-drivers',
+                 'x11-fonts/xorg-fonts',
+                 'x11-servers/xorg-nestserver',
+                 'x11-servers/xorg-vfbserver',
+                 'devel/imake'])
     if arch == 'i386':
         pkgs.append('emulators/linux_base-fc4')
     return pkgs
@@ -42,44 +44,50 @@
 # For architectures that use a separate livefs, this is actually disc3.
 def disc2_packages():
             # X Desktops
-    if arch == 'ia64':
-	pkgs = ['x11/kde-lite']
-    else:
-	pkgs = ['x11/kde3']
-    pkgs.extend(['x11-wm/windowmaker',
+            # add gnome2 lite and gnustep later
+    pkgs = ['x11/kde-lite']
+    return pkgs
+
+def disc3_packages():
+    pkgs = ['x11-wm/afterstep',
+            'x11-wm/windowmaker',
             # "Nice to have"
             'archivers/unzip',
             'astro/xearth',                 
             'devel/gmake',
             'editors/emacs',
             'editors/vim',
-            'editors/vim-lite',
             'editors/xemacs',
             'emulators/mtools',
             'graphics/png',
             'graphics/xv',
             'irc/xchat',
+            'lang/php5',
             'mail/fetchmail',
             'mail/mutt',
-            'mail/pine4',
+            'mail/alpine',
             'mail/popd',
+            'misc/compat5x',
             'net/rsync',
             'net/samba3',
             'news/slrn',
             'news/tin',
+            'ports-mgmt/portupgrade',
             'print/a2ps-letter',
             'print/apsfilter',
             'print/gv',
             'print/psutils-letter',
 	    'print/ghostscript-gpl-nox11',
-            'shells/bash2',
+            'print/teTeX',
+            'shells/bash',
             'shells/zsh',
-            'ports-mgmt/portupgrade',
+            'www/apache22',
             'www/links',
             'www/lynx',
-            'x11/rxvt'])
+            'x11/rxvt']
     if arch == 'i386':
-        pkgs.extend(['comms/ltmdm',
+        pkgs.extend(['emulators/wine',
+                     'misc/compat4x',
                      'www/opera'])
     return pkgs
 
@@ -87,7 +95,8 @@
 def desired_packages():
     disc1 = disc1_packages()
     disc2 = disc2_packages()
-    return [disc1, disc2]
+    disc3 = disc3_packages()
+    return [disc1, disc2, disc3]
 
 # Suck the entire INDEX file into a two different dictionaries.  The first
 # dictionary maps port names (origins) to package names.  The second