From owner-svn-src-all@FreeBSD.ORG  Mon Dec  1 17:29:42 2008
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 446611065670;
	Mon,  1 Dec 2008 17:29:42 +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 2EB4E8FC08;
	Mon,  1 Dec 2008 17:29:42 +0000 (UTC)
	(envelope-from kensmith@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mB1HTfe2032003;
	Mon, 1 Dec 2008 17:29:41 GMT (envelope-from kensmith@svn.freebsd.org)
Received: (from kensmith@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mB1HTfr7032002;
	Mon, 1 Dec 2008 17:29:41 GMT (envelope-from kensmith@svn.freebsd.org)
Message-Id: <200812011729.mB1HTfr7032002@svn.freebsd.org>
From: Ken Smith <kensmith@FreeBSD.org>
Date: Mon, 1 Dec 2008 17:29:41 +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: r185524 - releng/7.1/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: Mon, 01 Dec 2008 17:29:42 -0000

Author: kensmith
Date: Mon Dec  1 17:29:41 2008
New Revision: 185524
URL: http://svn.freebsd.org/changeset/base/185524

Log:
  Make adjustments to the package set for 7.1-RELEASE.
  
  Approved by:	re (kib)

Modified:
  releng/7.1/release/scripts/package-split.py

Modified: releng/7.1/release/scripts/package-split.py
==============================================================================
--- releng/7.1/release/scripts/package-split.py	Mon Dec  1 17:26:28 2008	(r185523)
+++ releng/7.1/release/scripts/package-split.py	Mon Dec  1 17:29:41 2008	(r185524)
@@ -47,11 +47,18 @@ def disc2_packages():
 		'x11/kde-lite']
     else:
 	pkgs = ['x11/gnome2',
-		'x11/kde3']
+		'x11/kdebase3',
+		'x11/kdelibs3',
+		'games/kdegames3',
+		'graphics/kdegraphics3',
+		'misc/kdeutils3',
+		'multimedia/kdemultimedia3',
+		'net/kdenetwork3']
     return pkgs
 
 def disc3_packages():
-    pkgs = ['x11-wm/afterstep',
+    pkgs = ['x11/kde3',
+	    'x11-wm/afterstep',
             'x11-wm/windowmaker',
             'x11-wm/fvwm2',
             # "Nice to have"
@@ -66,10 +73,10 @@ def disc3_packages():
             'graphics/xv',
             'irc/xchat',
             'lang/php5',
+            'mail/alpine',
             'mail/exim',
             'mail/fetchmail',
             'mail/mutt',
-            'mail/pine4',
             'mail/popd',
             'mail/xfmail',
             'mail/postfix',
@@ -83,7 +90,7 @@ def disc3_packages():
             'ports-mgmt/portupgrade',
             'print/a2ps-letter',
             'print/apsfilter',
-            'print/ghostscript-gnu-nox11',
+            'print/ghostscript7-nox11',
             'print/gv',
             'print/psutils-letter',
             'print/teTeX',
@@ -100,9 +107,10 @@ def disc3_packages():
             'x11/rxvt',
             # Formerly on disc3
             'ports-mgmt/portaudit']
+    if arch == 'amd64' or arch == 'i386':
+        pkgs.extend(['www/opera'])
     if arch == 'i386':
-        pkgs.extend(['www/opera',
-            'misc/compat4x'])
+	pkgs.extend(['misc/compat4x'])
     return pkgs
 
 # The list of desired packages