fake:

misc/pkgsel/benchmark.in

@@ -21,104 +21,18 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 #
 # TITLE: A base selection for benchmarking purposes
+#
 
-pkgfilter sed '
-
-# Add strictly required packages
-
-/ 00-dirtree /                  { p; d; };
-/ bind /                        { p; d; };
-/ devfsd /                      { p; d; };
-/ dhcp /                        { p; d; };
-/ dialog /                      { p; d; };
-/ autoconf /                    { p; d; };
-/ automake=automake18 /         { p; d; };
-/ bash=bash2 /                  { p; d; };
-/ binutils /                    { p; d; };
-/ bison /                       { p; d; };
-/ bzip2 /                       { p; d; };
-/ cracklib/                     { p; d; };
-/ cron /                        { p; d; };
-/ curl /                        { p; d; };
-/ diffutils /                   { p; d; };
-/ e2fsprogs /                   { p; d; };
-/ ed /                          { p; d; };
-/ expat /			{ p; d; };
-/ file /                        { p; d; };
-/ coreutils /                   { p; d; };
-/ findutils /                   { p; d; };
-/ flex /                        { p; d; };
-/ gawk /                        { p; d; };
-/ gcc /                         { p; d; };
-/ gettext /                     { p; d; };
-/ glibc /                       { p; d; };
-/ grep /                        { p; d; };
-/ groff /                       { p; d; };
-/ gzip /                        { p; d; };
-/ iproute2 /                    { p; d; };
-/ kbd /                         { p; d; };
-/ less /                        { p; d; };
-/ libtool /                     { p; d; };
-/ libjpeg /                     { p; d; };
-/ libpng /                      { p; d; };
-/ libtiff /                     { p; d; };
-/ libungif /                    { p; d; };
-/ linux /                       { p; d; };
-/ m4 /                          { p; d; };
-/ make /                        { p; d; };
-/ man /                         { p; d; };
-/ mine /                        { p; d; };
-/ mktemp /                      { p; d; };
-/ modutils /                    { p; d; };
-/ ncompress /                   { p; d; };
-/ ncurses /                     { p; d; };
-/ netkit-base /                 { p; d; };
-/ net-tools/                    { p; d; };
-/ nfs-utils /                   { p; d; };
-/ netkit-telnet/                { p; d; };
-/ openssh /                     { p; d; };
-/ openssl /                     { p; d; };
-/ pam /                         { p; d; };
-/ patch /                       { p; d; };
-/ perl5 /                       { p; d; };
-/ procinfo /                    { p; d; };
-/ procps /                      { p; d; };
-/ psmisc /                      { p; d; };
-/ pciutils/                     { p; d; };
-/ screen /                      { p; d; };
-/ sed /                         { p; d; };
-/ shadow /                      { p; d; };
-/ sysfiles /                    { p; d; };
-/ sysklogd /                    { p; d; };
-/ sysvinit /                    { p; d; };
-/ tar /                         { p; d; };
-/ texinfo /                     { p; d; };
-/ time /                        { p; d; };
-/ unzip /                       { p; d; };
-/ util-linux /                  { p; d; };
-/ vim /                         { p; d; };
-/ vlock /                       { p; d; };
-/ wget /                        { p; d; };
-/ xfree86 /                     { p; d; };
-/ zip /                         { p; d; };
-/ zlib /                        { p; d; };
-/ zsh/                          { p; d; };
+START_PKGSEL
 
-# Some architecture-specifc-packages with missing deps
-/ macosd /                      { s/^X /O / ; p; d; };
+#include "basic.set"
+#include "common.set"
+#include "xorg.set"
 
 # other stray junk
-/ intel-rng /			{ s/^X /O / ; p; d; };
-/ microcode_ctl /		{ s/^X /O / ; p; d; };
-/ apmd /			{ s/^X /O / ; p; d; };
-
-# Add architecture-specific-packages
-/ alpha /                       { p; d; };
-/ mips /                        { p; d; };
-/ powerpc /                     { p; d; };
-/ sparc /                       { p; d; };
-/ x86 /                         { p; d; };
+REMOVE(intel-rng)
+REMOVE(microcode_ctl)
 
-# Disabling the rest of packages
-/.*/        { s/^X /O / ; p; d; };'
+DISABLE_REST
 
+END_PKGSEL

misc/pkgsel/macros

@@ -0,0 +1,9 @@
+
+#define START_PKGSEL pkgfilter sed '
+
+#define ADD(F) / F / 	{ p; d; };
+#define REMOVE(F) / F /	{ s/^X /O / ; p; d; };
+
+#define DISABLE_REST s/^X /O /;
+
+#define END_PKGSEL '

misc/pkgsel/minimal+xfree.in

@@ -1,126 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/misc/pkgsel/minimal+xfree.in
-# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-#
-# TITLE: Minimalistic package selection + XFree86
-
-pkgfilter sed '
-
-# Add strictly required packages
-
-/ 00-dirtree /                  { p; d; };
-/ aterm /                       { p; d; };
-/ bind /                        { p; d; };
-/ devfsd /                      { p; d; };
-/ dhcp /                        { p; d; };
-/ dialog /                      { p; d; };
-/ autoconf /                    { p; d; };
-/ automake=automake18 /         { p; d; };
-/ bash=bash2 /                  { p; d; };
-/ binutils /                    { p; d; };
-/ bison /                       { p; d; };
-/ bzip2 /                       { p; d; };
-/ cracklib/                     { p; d; };
-/ cron /                        { p; d; };
-/ curl /                        { p; d; };
-/ diffutils /                   { p; d; };
-/ e2fsprogs /                   { p; d; };
-/ ed /                          { p; d; };
-/ expat /			{ p; d; };
-/ file /                        { p; d; };
-/ coreutils /                   { p; d; };
-/ findutils /                   { p; d; };
-/ flex /                        { p; d; };
-/ gawk /                        { p; d; };
-/ gcc /                         { p; d; };
-/ gettext /                     { p; d; };
-/ glibc /                       { p; d; };
-/ grep /                        { p; d; };
-/ groff /                       { p; d; };
-/ gzip /                        { p; d; };
-/ iproute2 /                    { p; d; };
-/ kbd /                         { p; d; };
-/ less /                        { p; d; };
-/ libtool /                     { p; d; };
-/ libjpeg /                     { p; d; };
-/ libpng /                      { p; d; };
-/ libtiff /                     { p; d; };
-/ libungif /                    { p; d; };
-/ linux /                       { p; d; };
-/ m4 /                          { p; d; };
-/ make /                        { p; d; };
-/ man /                         { p; d; };
-/ man-pages /                   { p; d; };
-/ mine /                        { p; d; };
-/ mktemp /                      { p; d; };
-/ module-init-tools /           { p; d; };
-/ modutils /                    { p; d; };
-/ ncompress /                   { p; d; };
-/ ncurses /                     { p; d; };
-/ netkit-base /                 { p; d; };
-/ net-tools/                    { p; d; };
-/ nfs-utils /                   { p; d; };
-/ netkit-telnet/                { p; d; };
-/ openssh /                     { p; d; };
-/ openssl /                     { p; d; };
-/ pam /                         { p; d; };
-/ patch /                       { p; d; };
-/ perl5 /                       { p; d; };
-/ procinfo /                    { p; d; };
-/ procps /                      { p; d; };
-/ psmisc /                      { p; d; };
-/ pciutils/                     { p; d; };
-/ screen /                      { p; d; };
-/ pkgconfig /			{ p; d; };
-/ sed /                         { p; d; };
-/ shadow /                      { p; d; };
-/ sysfiles /                    { p; d; };
-/ sysklogd /                    { p; d; };
-/ sysvinit /                    { p; d; };
-/ tar /                         { p; d; };
-/ texinfo /                     { p; d; };
-/ time /                        { p; d; };
-/ unzip /                       { p; d; };
-/ util-linux /                  { p; d; };
-/ vim /                         { p; d; };
-/ vlock /                       { p; d; };
-/ wget /                        { p; d; };
-/ xfree86 /                     { p; d; };
-/ zip /                         { p; d; };
-/ zlib /                        { p; d; };
-/ zsh/                          { p; d; };
-
-/ rock-doc /                    { p; d; };
-/ rock-src/                     { p; d; };
-
-# Some architecture-specifc-packages with missing deps
-/ macosd /                      { s/^X /O / ; p; d; };
-
-# Add architecture-specific-packages
-/ alpha /                       { p; d; };
-/ mips /                        { p; d; };
-/ powerpc /                     { p; d; };
-/ sparc /                       { p; d; };
-/ x86 /                         { p; d; };
-
-# Disabling the rest of packages
-/.*/        { s/^X /O / ; p; d; };'
-

misc/pkgsel/minimal+xorg.in

@@ -0,0 +1,33 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/misc/pkgsel/minimal+xorg.in
+# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+# 
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+#
+# TITLE: Minimalistic package selection + X.org
+
+START_PKGSEL
+
+#include "basic.set"
+#include "common.set"
+#include "xorg.set"
+
+DISABLE_REST
+
+END_PKGSEL

misc/pkgsel/minimal-desktop.in

@@ -22,191 +22,13 @@
 #
 # TITLE: Minimalistic KDE Desktop
 
-pkgfilter sed '
+START_PKGSEL
 
-# Add strictly required packages
+#include "basic.set"
+#include "common.set"
+#include "xorg.set"
+#include "kde-desktop.set"
 
-/ 00-dirtree /			{ p; d; };
-/ bind /			{ p; d; };
-/ devfsd /			{ p; d; };
-/ dhcp /			{ p; d; };
-/ dialog /			{ p; d; };
-/ autoconf /			{ p; d; };
-/ automake=automake19 /		{ p; d; };
-/ bash=bash2 /			{ p; d; };
-/ binutils /			{ p; d; };
-/ bison /			{ p; d; };
-/ bzip2 /			{ p; d; };
-/ cracklib/			{ p; d; };
-/ cron /			{ p; d; };
-/ curl /			{ p; d; };
-/ diffutils /			{ p; d; };
-/ e2fsprogs /			{ p; d; };
-/ reiserfsprogs /		{ p; d; };
-/ raidtools /			{ p; d; };
-/ ed /				{ p; d; };
-/ bc / 				{ p; d; };
-/ expat /			{ p; d; };
-/ file /			{ p; d; };
-/ coreutils /			{ p; d; };
-/ findutils /			{ p; d; };
-/ flex /			{ p; d; };
-/ fbset /			{ p; d; };
-/ gawk /			{ p; d; };
-/ gcc /				{ p; d; };
-/ gdbm /			{ p; d; };
-/ gettext /			{ p; d; };
-/ glibc /			{ p; d; };
-/ grep /			{ p; d; };
-/ groff /			{ p; d; };
-/ gzip /			{ p; d; };
-/ hfsutils /			{ p; d; };
-/ iproute2 /			{ p; d; };
-/ iptables /			{ p; d; };
-/ wireless-tools /		{ p; d; };
-/ kbd /				{ p; d; };
-/ lcms /			{ p; d; };
-/ less /			{ p; d; };
-/ libtool /			{ p; d; };
-/ libjpeg /			{ p; d; };
-/ libpng /			{ p; d; };
-/ libtiff /			{ p; d; };
-/ libungif /			{ p; d; };
-/ linux.*-src /			{ s/^X /O / ; p; d; };
-/ linux.* /			{ p; d; };
-/ linux.*-header /		{ p; d; };
-/ m4 /				{ p; d; };
-/ make /			{ p; d; };
-/ man /				{ p; d; };
-/ man-pages /			{ p; d; };
-/ mine /			{ p; d; };
-/ mktemp /			{ p; d; };
-/ modutils /			{ p; d; };
-/ module-init-tools /		{ p; d; };
-/ ncompress /			{ p; d; };
-/ ncurses /			{ p; d; };
-/ netkit-base /			{ p; d; };
-/ net-tools/			{ p; d; };
-/ nfs-utils /			{ p; d; };
-/ netkit-telnet/		{ p; d; };
-/ openssh /			{ p; d; };
-/ openssl /			{ p; d; };
-/ pam /				{ p; d; };
-/ patch /			{ p; d; };
-/ perl5 /			{ p; d; };
-/ procinfo /			{ p; d; };
-/ procps /			{ p; d; };
-/ psmisc /			{ p; d; };
-/ pciutils/			{ p; d; };
-/ python /			{ p; d; };
-/ screen /			{ p; d; };
-/ pkgconfig /			{ p; d; };
-/ sed /				{ p; d; };
-/ shadow /			{ p; d; };
-/ sysfiles /			{ p; d; };
-/ sysklogd /			{ p; d; };
-/ sysvinit /			{ p; d; };
-/ tar /				{ p; d; };
-/ texinfo /			{ p; d; };
-/ time /			{ p; d; };
-/ unzip /			{ p; d; };
-/ util-linux /			{ p; d; };
-/ vim /				{ p; d; };
-/ vlock /			{ p; d; };
-/ wget /			{ p; d; };
-/ xorg /			{ p; d; };
-/ zip /				{ p; d; };
-/ zlib /			{ p; d; };
-/ zsh/				{ p; d; };
-
-/ cpan=cpan-xml-parser /	{ p; d; };
-/ ghostscript /			{ p; d; };
-/ ghostscript-fonts /		{ p; d; };
-/ kdevelop /			{ s/^X /O / ; p; d; };
-/ kdesdk /			{ s/^X /O / ; p; d; };
-/ kdewebdev /			{ s/^X /O / ; p; d; };
-/ kdeedu /			{ s/^X /O / ; p; d; };
-/ kdebindings /			{ s/^X /O / ; p; d; };
-/ kde-i18n-fr /			{ s/^X /O / ; p; d; };
-/ kde-i18n-es /			{ s/^X /O / ; p; d; };
-/ kde-i18n-it /			{ s/^X /O / ; p; d; };
-/ qt /				{ p; d; };
-/ kde /				{ p; d; };
-/ firefox /			{ p; d; };
-/ bitstream-vera-fonts /	{ p; d; };
-/ freetype /			{ p; d; };
-/ apache /			{ p; d; };
-/ samba /			{ p; d; };
-/ cups /			{ p; d; };
-/ atk /				{ p; d; };
-/ glib /			{ p; d; };
-/ pango /			{ p; d; };
-/ gtk+ /			{ p; d; };
-/ glib12 /			{ p; d; };
-/ gtk+12 /			{ p; d; };
-/ gimp /			{ p; d; };
-/ ogg-vorbis /			{ p; d; };
-/ xmms /			{ p; d; };
-/ xine /			{ p; d; };
-/ mplayer /			{ p; d; };
-/ mplayer-fonts /		{ p; d; };
-/ wv2 /				{ p; d; };
-/ libmng /			{ p; d; };
-/ libgphoto /			{ p; d; };
-/ sane-backends /		{ p; d; };
-/ libusb /			{ p; d; };
-/ bdb /				{ p; d; };
-/ neon /			{ p; d; };
-/ subversion /			{ p; d; };
-/ gimp-print42 /		{ p; d; };
-/ lesstif /			{ p; d; };
-/ libgsf /			{ p; d; };
-/ libidl /			{ p; d; };
-/ libxml2 /			{ p; d; };
-/ libxslt /			{ p; d; };
-/ pcre /			{ p; d; };
-/ xpdf /			{ p; d; };
-/ libart_lgpl23 /		{ p; d; };
-/ popt /			{ p; d; };
-/ alsa /			{ p; d; };
-/ alsa-driver /			{ p; d; };
-/ cvs /				{ p; d; };
-/ lame /			{ p; d; };
-/ audiofile /			{ p; d; };
-/ cdrtools /			{ p; d; };
-/ cdrdao /			{ p; d; };
-/ cdparanoia /			{ p; d; };
-/ tvtime /			{ p; d; };
-/ xvid /			{ p; d; };
-/ jfsutils /			{ p; d; };
-/ xfsprogs /			{ p; d; };
-/ taglib /			{ p; d; };
-/ freefonts /			{ p; d; };
-/ rsync /			{ p; d; };
-/ gnupg /			{ p; d; };
-/ squid /			{ p; d; };
-/ gdb /				{ p; d; };
-/ sudo /			{ p; d; };
-/ xdialog /			{ p; d; };
-/ readline /			{ p; d; };
-/ strace /			{ p; d; };
-/ bonnie++ /			{ p; d; };
-/ ppp /				{ p; d; };
-
-/ tuxcursor /			{ p; d; };
-/ cheapskatefonts /		{ p; d; };
-
-# Some architecture-specifc-packages with missing deps
-/ macosd /			{ s/^X /O / ; p; d; };
-/ apmd /			{ s/^X /O / ; p; d; };
-
-# Add architecture-specific-packages
-/ alpha /			{ p; d; };
-/ mips /			{ p; d; };
-/ powerpc /			{ p; d; };
-/ sparc /			{ p; d; };
-/ x86 /				{ p; d; };
-
-# Disabling the rest of packages
-/.*/				{ s/^X /O / ; p; d; };'
+DISABLE_REST
 
+END_PKGSEL

misc/pkgsel/minimal-gnome-desktop.in

@@ -1,228 +1,12 @@
 # TITLE: Minimalistic GNOME Desktop
 
-pkgfilter sed '
-/ 00-dirtree /			{ p; d; };
-/ acpid /			{ p; d; };
-/ devfsd /			{ p; d; };
-/ dhcp /			{ p; d; };
-/ dialog /			{ p; d; };
-/ autoconf /			{ p; d; };
-/ automake=automake19 /		{ p; d; };
-/ bash=bash2 /			{ p; d; };
-/ bdb=bdb42 /			{ p; d; };
-/ binutils /			{ p; d; };
-/ bison /			{ p; d; };
-/ bzip2 /			{ p; d; };
-/ cracklib/			{ p; d; };
-/ cron /			{ p; d; };
-/ curl /			{ p; d; };
-/ diffutils /			{ p; d; };
-/ e2fsprogs /			{ p; d; };
-/ reiserfsprogs /		{ p; d; };
-/ raidtools /			{ p; d; };
-/ ed /				{ p; d; };
-/ bc / 				{ p; d; };
-/ expat /			{ p; d; };
-/ file /			{ p; d; };
-/ coreutils /			{ p; d; };
-/ findutils /			{ p; d; };
-/ flex /			{ p; d; };
-/ fbset /			{ p; d; };
-/ gawk /			{ p; d; };
-/ gcc /				{ p; d; };
-/ gdbm /			{ p; d; };
-/ gettext /			{ p; d; };
-/ glibc /			{ p; d; };
-/ glib /			{ p; d; };
-/ glib12 /			{ p; d; };
-/ grep /			{ p; d; };
-/ groff /			{ p; d; };
-/ gtk+ /			{ p; d; };
-/ gzip /			{ p; d; };
-/ hfsutils /			{ p; d; };
-/ iproute2 /			{ p; d; };
-/ iptables /			{ p; d; };
-/ wireless-tools /		{ p; d; };
-/ kbd /				{ p; d; };
-/ less /			{ p; d; };
-/ libtool /			{ p; d; };
-/ libjpeg /			{ p; d; };
-/ libpng /			{ p; d; };
-/ libtiff /			{ p; d; };
-/ libungif /			{ p; d; };
-/ linux.*-src /			{ s/^X /O / ; p; d; };
-/ linux.* /			{ p; d; };
-/ linux.*-header /		{ p; d; };
-/ lzo /				{ p; d; };
-/ m4 /				{ p; d; };
-/ make /			{ p; d; };
-/ man /				{ p; d; };
-/ man-pages /			{ p; d; };
-/ mine /			{ p; d; };
-/ mktemp /			{ p; d; };
-/ modutils /			{ p; d; };
-/ module-init-tools /		{ p; d; };
-/ ncompress /			{ p; d; };
-/ ncurses /			{ p; d; };
-/ netkit-base /			{ p; d; };
-/ net-tools/			{ p; d; };
-/ nfs-utils /			{ p; d; };
-/ netkit-telnet/		{ p; d; };
-/ openssh /			{ p; d; };
-/ openssl /			{ p; d; };
-/ pam /				{ p; d; };
-/ patch /			{ p; d; };
-/ pcmcia-cs /			{ p; d; };
-/ perl5 /			{ p; d; };
-/ popt /			{ p; d; };
-/ procinfo /			{ p; d; };
-/ procps /			{ p; d; };
-/ psmisc /			{ p; d; };
-/ pth /				{ p; d; };
-/ pciutils/			{ p; d; };
-/ python /			{ p; d; };
-/ readline /			{ p; d; };
-/ screen /			{ p; d; };
-/ pkgconfig /			{ p; d; };
-/ sed /				{ p; d; };
-/ shadow /			{ p; d; };
-/ sysfiles /			{ p; d; };
-/ sysklogd /			{ p; d; };
-/ sysvinit /			{ p; d; };
-/ tar /				{ p; d; };
-/ texinfo /			{ p; d; };
-/ time /			{ p; d; };
-/ unzip /			{ p; d; };
-/ util-linux /			{ p; d; };
-/ vim /				{ p; d; };
-/ vlock /			{ p; d; };
-/ wget /			{ p; d; };
-/ xorg /			{ p; d; };
-/ zip /				{ p; d; };
-/ zlib /			{ p; d; };
+START_PKGSEL
 
-/ abiword /			{ p; d; };
-/ alsa /			{ p; d; };
-/ apache /			{ p; d; };
-/ atk /				{ p; d; };
-/ at-spi /			{ p; d; };
-/ audiofile /			{ p; d; };
-/ bug-buddy /			{ p; d; };
-/ control-center /		{ p; d; };
-/ cpan=cpan-xml-parser /	{ p; d; };
-/ docbookx /			{ p; d; };
-/ desktop-file-utils /		{ p; d; };
-/ eel /				{ p; d; };
-/ eog /				{ p; d; };
-/ epiphany /			{ p; d; };
-/ esound /			{ p; d; };
-/ evolution /			{ p; d; };
-/ evolution-data-server /	{ p; d; };
-/ evolution-webcal /		{ p; d; };
-/ freetype /			{ p; d; };
-/ file-roller /			{ p; d; };
-/ fribidi /			{ p; d; };
-/ gal /				{ p; d; };
-/ gail /			{ p; d; };
-/ gcalctool /			{ p; d; };
-/ gconf /			{ p; d; };
-/ gconf-editor /		{ p; d; };
-/ gdm /				{ p; d; };
-/ gedit /			{ p; d; };
-/ gftp /			{ p; d; };
-/ gimp /			{ p; d; };
-/ gimp-print42 /		{ p; d; };
-/ gnome-applets /		{ p; d; };
-/ gnome-desktop /		{ p; d; };
-/ gnome-games /			{ p; d; };
-/ gnome-icon-theme /		{ p; d; };
-/ gnome-keyring /		{ p; d; };
-/ gnome-mag /			{ p; d; };
-/ gnome-media /			{ p; d; };
-/ gnome-mime-data /		{ p; d; };
-/ gnome-netstatus /		{ p; d; };
-/ gnome-nettool /		{ p; d; };
-/ gnome-panel /			{ p; d; };
-/ gnome-session /		{ p; d; };
-/ gnome-speech /		{ p; d; };
-/ gnome-system-monitor /	{ p; d; };
-/ gnome-system-tools /		{ p; d; };
-/ gnome-terminal /		{ p; d; };
-/ gnome-themes /		{ p; d; };
-/ gnome-utils /			{ p; d; };
-/ gnome-vfs /			{ p; d; };
-/ gnumeric /			{ p; d; };
-/ gnupg /			{ p; d; };
-/ gnupg2 /			{ p; d; };
-/ gnutls /			{ p; d; };
-/ gpdf /			{ p; d; };
-/ gstreamer /			{ p; d; };
-/ gst-plugins /			{ p; d; };
-/ gthumb /			{ p; d; };
-/ gtk-engines /			{ p; d; };
-/ gtkhtml /			{ p; d; };
-/ gtksourceview /		{ p; d; };
-/ hicolor-icon-theme /		{ p; d; };
-/ intltool /			{ p; d; };
-/ libart_lgpl23 /		{ p; d; };
-/ libassuan /			{ p; d; };
-/ libbonobo /			{ p; d; };
-/ libbonoboui /			{ p; d; };
-/ libcroco /			{ p; d; };
-/ libglade /			{ p; d; };
-/ libgail-gnome /		{ p; d; };
-/ libgcrypt /			{ p; d; };
-/ libgnome /			{ p; d; };
-/ libgnomecanvas /		{ p; d; };
-/ libgnomeprint / 		{ p; d; };
-/ libgnomeprintui /		{ p; d; };
-/ libgnomeui /			{ p; d; };
-/ libgpg-error /		{ p; d; };
-/ libgsf /			{ p; d; };
-/ libgtkhtml /			{ p; d; };
-/ libgtop /			{ p; d; };
-/ libidl /			{ p; d; };
-/ libksba /			{ p; d; };
-/ librsvg /			{ p; d; };
-/ libsoup /			{ p; d; };
-/ libwnck /			{ p; d; };
-/ libxklavier / 		{ p; d; };
-/ libxml /			{ p; d; };
-/ libxml2 /			{ p; d; };
-/ libxslt /			{ p; d; };
-/ metacity /			{ p; d; };
-/ mozilla /			{ p; d; };
-/ nautilus /			{ p; d; };
-/ nautilus-cd-burner /		{ p; d; };
-/ nautilus-media /		{ p; d; };
-/ neon /			{ p; d; };
-/ openldap /			{ p; d; };
-/ orbit2 /			{ p; d; };
-/ pango /			{ p; d; };
-/ scrollkeeper /		{ p; d; };
-/ ssleay-perlmod /		{ p; d; };
-/ startup-notification /	{ p; d; };
-/ subversion /			{ p; d; };
-/ swig /			{ p; d; };
-/ vte /				{ p; d; };
-/ xscreensaver /		{ p; d; };
-/ yelp /			{ p; d; };
-/ zenity /			{ p; d; };
+#include "basic.set"
+#include "common.set"
+#include "xorg.set"
+#include "gnome-desktop.set"
 
-# Some architecture-specifc-packages with missing deps
-/ macosd /			{ s/^X /O / ; p; d; };
-/ apmd /			{ s/^X /O / ; p; d; };
-
-# Some architecture-specifc duplicates
-/ lilo /			{ s/^X /O / ; p; d; };
-
-# Add architecture-specific-packages
-/ alpha /			{ p; d; };
-/ mips /			{ p; d; };
-/ powerpc /			{ p; d; };
-/ sparc /			{ p; d; };
-/ x86 /				{ p; d; };
-
-# Disabling the rest of packages
-/.*/				{ s/^X /O / ; p; d; };'
+DISABLE_REST
 
+END_PKGSEL

misc/pkgsel/minimal-router.in

@@ -0,0 +1,40 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/misc/pkgsel/minimal-router.in
+# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+# 
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+#
+# TITLE: Minimalistic router package selection
+
+
+START_PKGSEL
+
+#include "basic.set"
+#include "common.set"
+
+ADD(ppp)
+ADD(pppoe)
+ADD(openvpn)
+ADD(nagios)
+ADD(bridge-utils)
+
+DISABLE_REST
+
+END_PKGSEL
+

misc/pkgsel/minimal.in

@@ -22,74 +22,10 @@
 #
 # TITLE: Minimalistic package selection
 
-pkgfilter sed '
+START_PKGSEL
 
-/ 00-dirtree /		{ p; d; }
+#include "basic.set"
 
-/ linux /		{ p; d; }
-/ glibc /		{ p; d; }
-
-/ gcc /			{ p; d; }
-/ binutils /		{ p; d; }
-
-/ make /		{ p; d; }
-/ gawk /		{ p; d; }
-/ flex /		{ p; d; }
-/ bison /		{ p; d; }
-/ perl5 /		{ p; d; }
-
-/ strace /		{ p; d; }
-/ libelf /		{ p; d; }
-/ ltrace /		{ p; d; }
-/ gdb /			{ p; d; }
-
-/ gzip /		{ p; d; }
-/ readline /		{ p; d; }
-/ ncurses /		{ p; d; }
-/ dialog /		{ p; d; }
-/ m4 /			{ p; d; }
-/ time /		{ p; d; }
-/ gettext /		{ p; d; }
-/ zlib /		{ p; d; }
-/ bash=bash2 /		{ p; d; }
-/ coreutils /		{ p; d; }
-/ findutils /		{ p; d; }
-/ diffutils /		{ p; d; }
-/ mktemp /		{ p; d; }
-/ patch /		{ p; d; }
-/ grep /		{ p; d; }
-/ sed /			{ p; d; }
-/ tar /			{ p; d; }
-/ bzip2 /		{ p; d; }
-/ texinfo /		{ p; d; }
-/ man /			{ p; d; }
-
-/ e2fsprogs /		{ p; d; }
-/ file /		{ p; d; }
-/ mine /		{ p; d; }
-/ util-linux /		{ p; d; }
-/ iproute2 /		{ p; d; }
-/ net-tools /		{ p; d; }
-/ module-init-tools /	{ p; d; }
-/ modutils /		{ p; d; }
-/ sysfiles /		{ p; d; }
-
-/ autoconf /		{ p; d; }
-/ automake=automake19 /	{ p; d; }
-/ cracklib /		{ p; d; }
-/ libtool /		{ p; d; }
-/ pam /			{ p; d; }
-/ shadow /		{ p; d; }
-/ sysvinit /		{ p; d; }
-
-/ grub /		{ p; d; }
-/ silo /		{ p; d; }
-/ yaboot /		{ p; d; }
-
-/ ed /			{ p; d; }
-/ vim /			{ p; d; }
-
-s/^X /O /;
-
-'
+DISABLE_REST
 
+END_PKGSEL

misc/pkgsel/sets/basic.set

@@ -0,0 +1,90 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/misc/pkgsel/minimal.in
+# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+# 
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+/ 00-dirtree /		{ p; d; }
+
+/ linux.*-src /		{ s/^X /O / ; p; d; }
+/ linux.* /		{ p; d; }
+/ linux.*-header /	{ p; d; }
+/ glibc /		{ p; d; }
+
+/ gcc /			{ p; d; }
+/ binutils /		{ p; d; }
+
+/ make /		{ p; d; }
+/ gawk /		{ p; d; }
+/ flex /		{ p; d; }
+/ bison /		{ p; d; }
+/ perl5 /		{ p; d; }
+
+/ strace /		{ p; d; }
+/ libelf /		{ p; d; }
+/ ltrace /		{ p; d; }
+/ gdb /			{ p; d; }
+
+/ gzip /		{ p; d; }
+/ readline /		{ p; d; }
+/ ncurses /		{ p; d; }
+/ dialog /		{ p; d; }
+/ m4 /			{ p; d; }
+/ time /		{ p; d; }
+/ gettext /		{ p; d; }
+/ zlib /		{ p; d; }
+/ bash=bash2 /		{ p; d; }
+/ coreutils /		{ p; d; }
+/ findutils /		{ p; d; }
+/ diffutils /		{ p; d; }
+/ mktemp /		{ p; d; }
+/ patch /		{ p; d; }
+/ grep /		{ p; d; }
+/ sed /			{ p; d; }
+/ tar /			{ p; d; }
+/ bzip2 /		{ p; d; }
+/ texinfo /		{ p; d; }
+/ man /			{ p; d; }
+
+/ e2fsprogs /		{ p; d; }
+/ file /		{ p; d; }
+/ mine /		{ p; d; }
+/ util-linux /		{ p; d; }
+/ iproute2 /		{ p; d; }
+/ net-tools /		{ p; d; }
+/ module-init-tools /	{ p; d; }
+/ modutils /		{ p; d; }
+/ sysfiles /		{ p; d; }
+
+/ autoconf /		{ p; d; }
+/ automake=automake19 /	{ p; d; }
+/ cracklib /		{ p; d; }
+/ libtool /		{ p; d; }
+/ pam /			{ p; d; }
+/ shadow /		{ p; d; }
+/ sysvinit /		{ p; d; }
+
+/ grub /		{ p; d; }
+/ lilo /			{ s/^X /O / ; p; d; };
+/ silo /		{ p; d; }
+/ yaboot /		{ p; d; }
+
+/ ed /			{ p; d; }
+/ vim /			{ p; d; }
+

misc/pkgsel/sets/common.set

@@ -0,0 +1,65 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/misc/pkgsel/minimal+xfree.in
+# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+# 
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+/ acpid /			{ p; d; };
+/ aterm /                       { p; d; };
+/ bdb=bdb42 /			{ p; d; };
+/ bind /                        { p; d; };
+/ bc /				{ p; d; };
+/ devfsd /                      { p; d; };
+/ dhcp /                        { p; d; };
+/ cron /                        { p; d; };
+/ curl /                        { p; d; };
+/ fbset /			{ p; d; };
+/ gdbm / 			{ p; d; };
+/ groff /                       { p; d; };
+/ hfsutils /			{ p; d; };
+/ iptables /			{ p; d; };
+/ kbd /                         { p; d; };
+/ less /                        { p; d; };
+/ lzo /				{ p; d; };
+/ man /                         { p; d; };
+/ man-pages /                   { p; d; };
+/ ncompress /                   { p; d; };
+/ netkit-base /                 { p; d; };
+/ nfs-utils /                   { p; d; };
+/ netkit-telnet/                { p; d; };
+/ openssh /                     { p; d; };
+/ openssl /                     { p; d; };
+/ pciutils/                     { p; d; };
+/ pcmcia-cs /                   { p; d; };
+/ popt /			{ p; d; };
+/ procinfo /                    { p; d; };
+/ procps /                      { p; d; };
+/ psmisc /                      { p; d; };
+/ pth /				{ p; d; };
+/ reiserfsprogs /		{ p; d; };
+/ raidtools /			{ p; d; };
+/ screen /                      { p; d; };
+/ pkgconfig /			{ p; d; };
+/ sysklogd /                    { p; d; };
+/ unzip /                       { p; d; };
+/ wget /                        { p; d; };
+/ wireless-tools / 		{ p; d; };
+/ zip /                         { p; d; };
+/ rock-doc /                    { p; d; };
+/ rock-src/                     { p; d; };

misc/pkgsel/sets/gnome-desktop.set

@@ -0,0 +1,110 @@
+/ glib /			{ p; d; };
+/ glib12 /			{ p; d; };
+/ gtk+ /			{ p; d; };
+/ python /			{ p; d; };
+/ abiword /			{ p; d; };
+/ alsa /			{ p; d; };
+/ apache /			{ p; d; };
+/ atk /				{ p; d; };
+/ at-spi /			{ p; d; };
+/ audiofile /			{ p; d; };
+/ bug-buddy /			{ p; d; };
+/ control-center /		{ p; d; };
+/ cpan=cpan-xml-parser /	{ p; d; };
+/ docbookx /			{ p; d; };
+/ desktop-file-utils /		{ p; d; };
+/ eel /				{ p; d; };
+/ eog /				{ p; d; };
+/ epiphany /			{ p; d; };
+/ esound /			{ p; d; };
+/ evolution /			{ p; d; };
+/ evolution-data-server /	{ p; d; };
+/ evolution-webcal /		{ p; d; };
+/ file-roller /			{ p; d; };
+/ fribidi /			{ p; d; };
+/ gal /				{ p; d; };
+/ gail /			{ p; d; };
+/ gcalctool /			{ p; d; };
+/ gconf /			{ p; d; };
+/ gconf-editor /		{ p; d; };
+/ gdm /				{ p; d; };
+/ gedit /			{ p; d; };
+/ gftp /			{ p; d; };
+/ gimp /			{ p; d; };
+/ gimp-print42 /		{ p; d; };
+/ gnome-applets /		{ p; d; };
+/ gnome-desktop /		{ p; d; };
+/ gnome-games /			{ p; d; };
+/ gnome-icon-theme /		{ p; d; };
+/ gnome-keyring /		{ p; d; };
+/ gnome-mag /			{ p; d; };
+/ gnome-media /			{ p; d; };
+/ gnome-mime-data /		{ p; d; };
+/ gnome-netstatus /		{ p; d; };
+/ gnome-nettool /		{ p; d; };
+/ gnome-panel /			{ p; d; };
+/ gnome-session /		{ p; d; };
+/ gnome-speech /		{ p; d; };
+/ gnome-system-monitor /	{ p; d; };
+/ gnome-system-tools /		{ p; d; };
+/ gnome-terminal /		{ p; d; };
+/ gnome-themes /		{ p; d; };
+/ gnome-utils /			{ p; d; };
+/ gnome-vfs /			{ p; d; };
+/ gnumeric /			{ p; d; };
+/ gnupg /			{ p; d; };
+/ gnupg2 /			{ p; d; };
+/ gnutls /			{ p; d; };
+/ gpdf /			{ p; d; };
+/ gstreamer /			{ p; d; };
+/ gst-plugins /			{ p; d; };
+/ gthumb /			{ p; d; };
+/ gtk-engines /			{ p; d; };
+/ gtkhtml /			{ p; d; };
+/ gtksourceview /		{ p; d; };
+/ hicolor-icon-theme /		{ p; d; };
+/ intltool /			{ p; d; };
+/ libart_lgpl23 /		{ p; d; };
+/ libassuan /			{ p; d; };
+/ libbonobo /			{ p; d; };
+/ libbonoboui /			{ p; d; };
+/ libcroco /			{ p; d; };
+/ libglade /			{ p; d; };
+/ libgail-gnome /		{ p; d; };
+/ libgcrypt /			{ p; d; };
+/ libgnome /			{ p; d; };
+/ libgnomecanvas /		{ p; d; };
+/ libgnomeprint / 		{ p; d; };
+/ libgnomeprintui /		{ p; d; };
+/ libgnomeui /			{ p; d; };
+/ libgpg-error /		{ p; d; };
+/ libgsf /			{ p; d; };
+/ libgtkhtml /			{ p; d; };
+/ libgtop /			{ p; d; };
+/ libidl /			{ p; d; };
+/ libksba /			{ p; d; };
+/ librsvg /			{ p; d; };
+/ libsoup /			{ p; d; };
+/ libwnck /			{ p; d; };
+/ libxklavier / 		{ p; d; };
+/ libxml /			{ p; d; };
+/ libxml2 /			{ p; d; };
+/ libxslt /			{ p; d; };
+/ metacity /			{ p; d; };
+/ mozilla /			{ p; d; };
+/ nautilus /			{ p; d; };
+/ nautilus-cd-burner /		{ p; d; };
+/ nautilus-media /		{ p; d; };
+/ neon /			{ p; d; };
+/ openldap /			{ p; d; };
+/ orbit2 /			{ p; d; };
+/ pango /			{ p; d; };
+/ scrollkeeper /		{ p; d; };
+/ ssleay-perlmod /		{ p; d; };
+/ startup-notification /	{ p; d; };
+/ subversion /			{ p; d; };
+/ swig /			{ p; d; };
+/ vte /				{ p; d; };
+/ xscreensaver /		{ p; d; };
+/ yelp /			{ p; d; };
+/ zenity /			{ p; d; };

misc/pkgsel/sets/kde-desktop.set

@@ -0,0 +1,99 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/misc/pkgsel/sets/desktop.set
+# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+# 
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+#
+
+/ python /			{ p; d; };
+/ cpan=cpan-xml-parser /	{ p; d; };
+/ ghostscript /			{ p; d; };
+/ ghostscript-fonts /		{ p; d; };
+/ kdevelop /			{ s/^X /O / ; p; d; };
+/ kdesdk /			{ s/^X /O / ; p; d; };
+/ kdewebdev /			{ s/^X /O / ; p; d; };
+/ kdeedu /			{ s/^X /O / ; p; d; };
+/ kdebindings /			{ s/^X /O / ; p; d; };
+/ kde-i18n-fr /			{ s/^X /O / ; p; d; };
+/ kde-i18n-es /			{ s/^X /O / ; p; d; };
+/ kde-i18n-it /			{ s/^X /O / ; p; d; };
+/ qt /				{ p; d; };
+/ kde /				{ p; d; };
+/ firefox /			{ p; d; };
+/ bitstream-vera-fonts /	{ p; d; };
+/ apache /			{ p; d; };
+/ samba /			{ p; d; };
+/ cups /			{ p; d; };
+/ atk /				{ p; d; };
+/ glib /			{ p; d; };
+/ pango /			{ p; d; };
+/ gtk+ /			{ p; d; };
+/ glib12 /			{ p; d; };
+/ gtk+12 /			{ p; d; };
+/ gimp /			{ p; d; };
+/ ogg-vorbis /			{ p; d; };
+/ xmms /			{ p; d; };
+/ xine /			{ p; d; };
+/ mplayer /			{ p; d; };
+/ mplayer-fonts /		{ p; d; };
+/ wv2 /				{ p; d; };
+/ libmng /			{ p; d; };
+/ libgphoto /			{ p; d; };
+/ sane-backends /		{ p; d; };
+/ libusb /			{ p; d; };
+/ bdb /				{ p; d; };
+/ neon /			{ p; d; };
+/ subversion /			{ p; d; };
+/ gimp-print42 /		{ p; d; };
+/ lesstif /			{ p; d; };
+/ libgsf /			{ p; d; };
+/ libidl /			{ p; d; };
+/ libxml2 /			{ p; d; };
+/ libxslt /			{ p; d; };
+/ pcre /			{ p; d; };
+/ xpdf /			{ p; d; };
+/ libart_lgpl23 /		{ p; d; };
+/ popt /			{ p; d; };
+/ alsa /			{ p; d; };
+/ alsa-driver /			{ p; d; };
+/ cvs /				{ p; d; };
+/ lame /			{ p; d; };
+/ audiofile /			{ p; d; };
+/ cdrtools /			{ p; d; };
+/ cdrdao /			{ p; d; };
+/ cdparanoia /			{ p; d; };
+/ tvtime /			{ p; d; };
+/ xvid /			{ p; d; };
+/ jfsutils /			{ p; d; };
+/ xfsprogs /			{ p; d; };
+/ taglib /			{ p; d; };
+/ freefonts /			{ p; d; };
+/ rsync /			{ p; d; };
+/ gnupg /			{ p; d; };
+/ squid /			{ p; d; };
+/ gdb /				{ p; d; };
+/ sudo /			{ p; d; };
+/ xdialog /			{ p; d; };
+/ readline /			{ p; d; };
+/ strace /			{ p; d; };
+/ bonnie++ /			{ p; d; };
+/ ppp /				{ p; d; };
+/ tuxcursor /			{ p; d; };
+/ cheapskatefonts /		{ p; d; };
+

misc/pkgsel/sets/xorg.set

@@ -0,0 +1,43 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/misc/pkgsel/sets/xorg.set
+# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+# 
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+/ expat /			{ p; d; };
+/ freetype /			{ p; d; };
+/ libjpeg /                     { p; d; };
+/ libpng /                      { p; d; };
+/ libtiff /                     { p; d; };
+/ libungif /                    { p; d; };
+/ vlock /                       { p; d; };
+/ xorg /			{ p; d; };
+/ zsh/                          { p; d; };
+
+
+# Some architecture-specifc-packages with missing deps
+/ macosd /                      { s/^X /O / ; p; d; };
+/ apmd /			{ s/^X /O / ; p; d; };
+
+# Add architecture-specific-packages
+/ alpha /                       { p; d; };
+/ mips /                        { p; d; };
+/ powerpc /                     { p; d; };
+/ sparc /                       { p; d; };
+/ x86 /                         { p; d; };

scripts/config.in

@@ -209,7 +209,8 @@ expert_begin
       choice ROCKCFG_PKGSEL_TPL none none 'No package preselection template' \
 		$( cd misc/pkgsel; grep -H "^# TITLE: " *.in | tr ' ' '_' | sed 's,\.in:#_TITLE:_, ,' )
       if [ -f misc/pkgsel/${ROCKCFG_PKGSEL_TPL}.in ]; then
-	. misc/pkgsel/${ROCKCFG_PKGSEL_TPL}.in
+	cpp -Imisc/pkgsel/sets -imacros misc/pkgsel/macros -P misc/pkgsel/${ROCKCFG_PKGSEL_TPL}.in 2>/dev/null > config/$config.$swpid/predefined-pkgsel.parsed
+	. config/$config.$swpid/predefined-pkgsel.parsed
       fi
       bool 'Custom package selection' ROCKCFG_PKGSEL 0
       if [ "$ROCKCFG_PKGSEL" = 1 ] ; then

target/livecd/config.in

@@ -61,7 +61,8 @@ ROCKCFGSET_PKG_LINUX_USE26MODTOOLS=1
 ROCKCFGSET_PKG_SUBVERSION_STATIC=0
 
 # hardwired for now...
-. misc/pkgsel/minimal-desktop.in
+cpp -Imisc/pkgsel/sets -imacros misc/pkgsel/macros -P misc/pkgsel/minimal-desktop.in 2>/dev/null > config/$config.$swpid/predefined-pkgsel.parsed
+. config/$config.$swpid/predefined-pkgsel.parsed
 
 pkgenable kiss
 pkgenable dietlibc