--- trunk/Makefile.PL	2008/11/05 08:20:37	267
+++ trunk/Makefile.PL	2009/01/03 22:26:44	912
@@ -14,12 +14,6 @@
 requires	'Fey::ORM';
 requires	'Fey::Loader';
 
-requires	'Continuity';
-#requires	'Continuity::REPL';
-requires	'Coro::Generator';
-
-requires	'Mojo';
-
 requires	'Time::HiRes';
 requires	'Storable';
 requires	'Data::Page';
@@ -28,23 +22,86 @@
 requires	'File::Slurp';
 requires	'MooseX::Log::Log4perl';
 requires	'HTML::TreeBuilder';	# Frey::HTML
-requires	'Data::Feed';
 requires	'Hash::Merge';
+requires	'Clone';
+requires	'File::Tee';
+requires	'DateTimeX::Easy'; # Frey::SVN
+requires	'Imager'; # Frey::Web::CombineImages
 
 features(
+	'Continuity server (see FIXME)' => [
+		-default => 0,
+		'Continuity',
+		#'Continuity::REPL',
+		'Coro::Generator',
+	],
+	'Mojo server' => [
+		-default => 1,
+		'Mojo' => 0.9,
+	],
+	'HTTP::Engine server (see FIXME)' => [
+		-default => 0,
+		'HTTP::Engine' => '0.0.17',
+		'HTTPx::Dispatcher',
+	],
 	'Development (optional)' => [
 		-default => 1,
-		'Module::Reload',
+#		'Module::Reload',
 #		'Carp::REPL',	# XXX breaks error reporting
 		'Test::HTML::Lint',
 		'Test::WWW::Mechanize',
 		'Pod::Simple::HTML',
+		'Pod::Find',
+		'PPI',
+		'PPI::HTML',
+	],
+	'Profile (optional even for development)' => [
+		-default => 0,
+		'Devel::NYTProf',
 	],
-	'Data::DelIcioUs' => [
+	'Frey::JSON' => [
+		'JSON' => 2.0,
+	],
+	'Frey::Session' => [
+		'DBM::Deep',
+	],
+	'Frey::DelIcioUs (import data)' => [
 		-default => 1,
 		'LWP::UserAgent',
 		'XML::Simple',
 	],
+	'Frey::Feed (RSS/Atom feed support)' => [
+		-default => 1,
+		'Data::Feed',
+	],
+	'Frey::Translate' => [
+		-default => 0,
+		'REST::Google::Translate',
+	],
+	'Frey::SQL (issue SQL queries on sponge results)' => [
+		-default => 1,
+		'DBD::AnyData',
+		'MooseX::Types::Structured',
+	],
+	'Frey::Test::Runner HTML reporting' => [
+		-default => 0,
+		#'Test::Harness' => 3.14, # XXX this doesn't seem to work
+		'TAP::Formatter::HTML' => 0.06,
+	],
+	'Frey::OpenSearch' => [
+		-default => 1,
+		'MIME::Base64',
+	],
+	'Frey::File::FLV and Frey::Web::FLVPlayer (flash video support)' => [
+		-default => 1,
+		'FLV::Info',
+		'Video::Subtitle::SRT',
+	],
+	'Frey::Cairo (telop support)' => [
+		-default => 1,
+		'Cairo',
+		'Font::FreeType',
+	],
 	'CouchDB' => [
 		-default => 0,
 		'CouchDB::Client',