Stefan Fiedler:

misc/pkgsel/minimal.in

@@ -25,28 +25,28 @@
 pkgfilter sed '
 
 # Disable packages
-/ a2ps /		{ s/^X /O /p; d; };
-/ alsa /		{ s/^X /O /p; d; };
-/ alsa-driver /		{ s/^X /O /p; d; };
-/ bdb40 /		{ s/^X /O /p; d; };
-/ biff+comsat /		{ s/^X /O /p; d; };
-/ bsd-finger /		{ s/^X /O /p; d; };
-/ bind /		{ s/^X /O /p; d; };
-/ gpm /			{ s/^X /O /p; d; };
-/ howtos /		{ s/^X /O /p; d; };
-/ ifhp /		{ s/^X /O /p; d; };
-/ ircii /		{ s/^X /O /p; d; };
-/ irda-utils /		{ s/^X /O /p; d; };
-/ joe /			{ s/^X /O /p; d; };
-/ lprng /		{ s/^X /O /p; d; };
-/ mutt /		{ s/^X /O /p; d; };
-/ net-snmp /		{ s/^X /O /p; d; };
-/ pine /		{ s/^X /O /p; d; };
-/ procmail /		{ s/^X /O /p; d; };
-/ rfc /			{ s/^X /O /p; d; };
-/ rpm /			{ s/^X /O /p; d; };
-/ sendmail /		{ s/^X /O /p; d; };
-/ wu-ftpd /		{ s/^X /O /p; d; };
+/ a2ps /		{ s/^X /O /; p; d; };
+/ alsa /		{ s/^X /O /; p; d; };
+/ alsa-driver /		{ s/^X /O /; p; d; };
+/ bdb40 /		{ s/^X /O /; p; d; };
+/ biff+comsat /		{ s/^X /O /; p; d; };
+/ bsd-finger /		{ s/^X /O /; p; d; };
+/ bind /		{ s/^X /O /; p; d; };
+/ gpm /			{ s/^X /O /; p; d; };
+/ howtos /		{ s/^X /O /; p; d; };
+/ ifhp /		{ s/^X /O /; p; d; };
+/ ircii /		{ s/^X /O /; p; d; };
+/ irda-utils /		{ s/^X /O /; p; d; };
+/ joe /			{ s/^X /O /; p; d; };
+/ lprng /		{ s/^X /O /; p; d; };
+/ mutt /		{ s/^X /O /; p; d; };
+/ net-snmp /		{ s/^X /O /; p; d; };
+/ pine /		{ s/^X /O /; p; d; };
+/ procmail /		{ s/^X /O /; p; d; };
+/ rfc /			{ s/^X /O /; p; d; };
+/ rpm /			{ s/^X /O /; p; d; };
+/ sendmail /		{ s/^X /O /; p; d; };
+/ wu-ftpd /		{ s/^X /O /; p; d; };
 
 # Select repositories
 / base /		{ p; d; };

target/bootdisk/config.in

@@ -52,14 +52,14 @@ pkgfilter sed '
 / linux24benh/  { p; d; };	/ syslinux /	{ p; d; };
 
 # Disable packages which are not in base or not build in stages 0-4
-/ base / !  { s/^X /O /p; d; };		/^. -----/ { s/^X /O /p; d; };
+/ base / !  { s/^X /O /; p; d; };		/^. -----/ { s/^X /O /; p; d; };
 
 # Disable even more packages we do not need
-/ gcc2 /	{ s/^X /O /p; d; };	/ joe /		{ s/^X /O /p; d; };
-/ gdbm /	{ s/^X /O /p; d; };	/ pam /         { s/^X /O /p; d; };
-/ pdksh /	{ s/^X /O /p; d; };	/ libelf /	{ s/^X /O /p; d; };
-/ prelink /	{ s/^X /O /p; d; };	/ ccache /	{ s/^X /O /p; d; };
-/ cracklib /	{ s/^X /O /p; d; };	/ hotplug /	{ s/^X /O /p; d; };'
+/ gcc2 /	{ s/^X /O /; p; d; };	/ joe /		{ s/^X /O /; p; d; };
+/ gdbm /	{ s/^X /O /; p; d; };	/ pam /         { s/^X /O /; p; d; };
+/ pdksh /	{ s/^X /O /; p; d; };	/ libelf /	{ s/^X /O /; p; d; };
+/ prelink /	{ s/^X /O /; p; d; };	/ ccache /	{ s/^X /O /; p; d; };
+/ cracklib /	{ s/^X /O /; p; d; };	/ hotplug /	{ s/^X /O /; p; d; };'
 
 ROCKCFGSET_CREATE_TARBZ2=1
 ROCKCFGSET_CREATE_GEM=0

target/desktop/config.in

@@ -23,12 +23,12 @@
 pkgfilter sed '
 
 # Disable packages
-/ sendmail /	{ s/^X /O /p; d; };
-/ workbone /	{ s/^X /O /p; d; };
-/ ifhp /	{ s/^X /O /p; d; };
-/ xv /		{ s/^X /O /p; d; };
-/ wu-ftp /	{ s/^X /O /p; d; };
-/ gcc2 /	{ s/^X /O /p; d; };
+/ sendmail /	{ s/^X /O /; p; d; };
+/ workbone /	{ s/^X /O /; p; d; };
+/ ifhp /	{ s/^X /O /; p; d; };
+/ xv /		{ s/^X /O /; p; d; };
+/ wu-ftp /	{ s/^X /O /; p; d; };
+/ gcc2 /	{ s/^X /O /; p; d; };
 
 # Select some packages (and repositories) explicitely
 / base /	{ p; d; };
@@ -107,9 +107,9 @@ pkgfilter sed '
 / nedit /       { p; d; };
 
 # misc repository
-/ centericq /	{ s/^X /O /p; d; }
-/ openbox /	{ s/^X /O /p; d; }
-/ zsh /		{ s/^X /O /p; d; }
+/ centericq /	{ s/^X /O /; p; d; }
+/ openbox /	{ s/^X /O /; p; d; }
+/ zsh /		{ s/^X /O /; p; d; }
 / misc /	{ p; d; };
 
 # michiel repository

target/epiam/config.in

@@ -23,15 +23,15 @@
 pkgfilter sed '
 
 # Disable packages
-/ sendmail /	{ s/^X /O /p; d; };
-/ workbone /	{ s/^X /O /p; d; };
-/ ifhp /	{ s/^X /O /p; d; };
-# / xv /		{ s/^X /O /p; d; };
-/ wu-ftp /	{ s/^X /O /p; d; };
-/ gcc2 /	{ s/^X /O /p; d; };
-/ linux26* /	{ s/^X /O /p; d; };
-/ module-init-tools /	{ s/^X /O /p; d; };
-/ bootsplash /	{ s/^X /O /p; d; };
+/ sendmail /	{ s/^X /O /; p; d; };
+/ workbone /	{ s/^X /O /; p; d; };
+/ ifhp /	{ s/^X /O /; p; d; };
+# / xv /		{ s/^X /O /; p; d; };
+/ wu-ftp /	{ s/^X /O /; p; d; };
+/ gcc2 /	{ s/^X /O /; p; d; };
+/ linux26* /	{ s/^X /O /; p; d; };
+/ module-init-tools /	{ s/^X /O /; p; d; };
+/ bootsplash /	{ s/^X /O /; p; d; };
 
 # Select some packages (and repositories) explicitely
 / base /	{ p; d; };
@@ -110,9 +110,9 @@ pkgfilter sed '
 / nedit /       { p; d; };
 
 # misc repository
-/ centericq /	{ s/^X /O /p; d; }
-/ openbox /	{ s/^X /O /p; d; }
-/ zsh /		{ s/^X /O /p; d; }
+/ centericq /	{ s/^X /O /; p; d; }
+/ openbox /	{ s/^X /O /; p; d; }
+/ zsh /		{ s/^X /O /; p; d; }
 / misc /	{ p; d; };
 
 # michiel repository

target/server/config.in

@@ -23,35 +23,35 @@
 pkgfilter sed '
 
 # disable packages not needed, or errors
-/ workbone /		{ s/^X /O /p; d; };
-/ ifhp /		{ s/^X /O /p; d; };
-/ xv /			{ s/^X /O /p; d; };
-/ wu-ftp /		{ s/^X /O /p; d; };
-/ coda /		{ s/^X /O /p; d; };
-/\/x11 /		{ s/^X /O /p; d; };
-/\/gnome /		{ s/^X /O /p; d; };
-/\/kde /		{ s/^X /O /p; d; };
-/ mldonkey /		{ s/^X /O /p; d; };
-/ gaim /		{ s/^X /O /p; d; };
-/ xcdroast /		{ s/^X /O /p; d; };
-/ gnapster /		{ s/^X /O /p; d; };
-/ gtoaster /		{ s/^X /O /p; d; };
-/ xchat /		{ s/^X /O /p; d; };
-/ irssi /		{ s/^X /O /p; d; };
-/ qtparted /		{ s/^X /O /p; d; };
-/ rdesktop /		{ s/^X /O /p; d; };
-/ tsclient /		{ s/^X /O /p; d; };
-/ libsdl_net /		{ s/^X /O /p; d; };
-/ xfsamba /		{ s/^X /O /p; d; };
-/ vnc /			{ s/^X /O /p; d; };
-/ unison /		{ s/^X /O /p; d; };
-/ razor /		{ s/^X /O /p; d; };
-/ k3b /			{ s/^X /O /p; d; };
-/ ettercap /		{ s/^X /O /p; d; };
-/ ethereal /		{ s/^X /O /p; d; };
-/ efsd /		{ s/^X /O /p; d; };
-/ licq /		{ s/^X /O /p; d; };	# based on qt
-/ mgt /			{ s/^X /O /p; d; };	# based on gnome
+/ workbone /		{ s/^X /O /; p; d; };
+/ ifhp /		{ s/^X /O /; p; d; };
+/ xv /			{ s/^X /O /; p; d; };
+/ wu-ftp /		{ s/^X /O /; p; d; };
+/ coda /		{ s/^X /O /; p; d; };
+/\/x11 /		{ s/^X /O /; p; d; };
+/\/gnome /		{ s/^X /O /; p; d; };
+/\/kde /		{ s/^X /O /; p; d; };
+/ mldonkey /		{ s/^X /O /; p; d; };
+/ gaim /		{ s/^X /O /; p; d; };
+/ xcdroast /		{ s/^X /O /; p; d; };
+/ gnapster /		{ s/^X /O /; p; d; };
+/ gtoaster /		{ s/^X /O /; p; d; };
+/ xchat /		{ s/^X /O /; p; d; };
+/ irssi /		{ s/^X /O /; p; d; };
+/ qtparted /		{ s/^X /O /; p; d; };
+/ rdesktop /		{ s/^X /O /; p; d; };
+/ tsclient /		{ s/^X /O /; p; d; };
+/ libsdl_net /		{ s/^X /O /; p; d; };
+/ xfsamba /		{ s/^X /O /; p; d; };
+/ vnc /			{ s/^X /O /; p; d; };
+/ unison /		{ s/^X /O /; p; d; };
+/ razor /		{ s/^X /O /; p; d; };
+/ k3b /			{ s/^X /O /; p; d; };
+/ ettercap /		{ s/^X /O /; p; d; };
+/ ethereal /		{ s/^X /O /; p; d; };
+/ efsd /		{ s/^X /O /; p; d; };
+/ licq /		{ s/^X /O /; p; d; };	# based on qt
+/ mgt /			{ s/^X /O /; p; d; };	# based on gnome
 
 
 # Select some packages (and repositories) explicitely