aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Smith <kensmith@FreeBSD.org>2012-04-06 17:49:11 +0000
committerKen Smith <kensmith@FreeBSD.org>2012-04-06 17:49:11 +0000
commit1207cdbf609b2ba9f506e374a0c4555bcb61c9b1 (patch)
tree21a530230c85f19673f2c899a51afb155d36f936
parent58edae4b7eca2508f41218ee58db38a0e353ba78 (diff)
downloadsrc-1207cdbf609b2ba9f506e374a0c4555bcb61c9b1.tar.gz
src-1207cdbf609b2ba9f506e374a0c4555bcb61c9b1.zip
MFS r233658:
Update with the package set that will ship with 8.3-RELEASE. Reviewed by: portmgr, re Approved by: re (bz)
Notes
Notes: svn path=/releng/8.3/; revision=233956
-rw-r--r--release/scripts/package-split.py26
1 files changed, 19 insertions, 7 deletions
diff --git a/release/scripts/package-split.py b/release/scripts/package-split.py
index c5437a75d74d..707cf8c0a779 100644
--- a/release/scripts/package-split.py
+++ b/release/scripts/package-split.py
@@ -23,18 +23,28 @@ if 'PKG_VERBOSE' in os.environ:
else:
verbose = 0
+if 'PKG_MEMSTICK' in os.environ:
+ doing_memstick = 1
+else:
+ doing_memstick = 0
+
if 'PKG_DVD' in os.environ:
doing_dvd = 1
else:
doing_dvd = 0
-# List of packages for disc1.
+# List of packages. At this point only the English documentation fits
+# on disc1. Add in the rest of the documentation for the memstick image.
+# And add in enough packages to make a basic graphical workstation for the
+# dvd image.
def disc1_packages():
- pkgs = ['misc/freebsd-doc-bn',
+ pkgs = ['misc/freebsd-doc-en']
+
+ if doing_memstick or doing_dvd:
+ pkgs.extend(['misc/freebsd-doc-bn',
'misc/freebsd-doc-da',
'misc/freebsd-doc-de',
'misc/freebsd-doc-el',
- 'misc/freebsd-doc-en',
'misc/freebsd-doc-es',
'misc/freebsd-doc-fr',
'misc/freebsd-doc-hu',
@@ -48,22 +58,24 @@ def disc1_packages():
'misc/freebsd-doc-sr',
'misc/freebsd-doc-tr',
'misc/freebsd-doc-zh_cn',
- 'misc/freebsd-doc-zh_tw']
+ 'misc/freebsd-doc-zh_tw'])
if doing_dvd:
pkgs.extend(['archivers/unzip',
'emulators/linux_base-f10',
- 'lang/perl5.10',
+ 'lang/perl5.12',
+ 'misc/freebsd-doc-all',
'net/mpd5',
'net/rsync',
- 'ports-mgmt/p5-FreeBSD-Portindex',
'ports-mgmt/portaudit',
'ports-mgmt/portmaster',
- 'ports-mgmt/portupgrade',
'shells/bash',
'shells/zsh',
'security/sudo',
'sysutils/screen',
+ 'www/firefox',
+ 'www/links',
+ 'x11-drivers/xf86-video-vmware',
'x11/gnome2',
'x11/kde4',
'x11/xorg'])