--- setup.py	2010-11-15 15:30:28.000000000 -0600
+++ setup.py.macports	2010-11-18 19:06:49.155292524 -0600
@@ -11,47 +11,22 @@
 setup(cmdclass=cmdclass,
       name="Bcfg2",
       version="1.1.1",
-      description="Bcfg2 Server",
+      description="Bcfg2 Client",
       author="Narayan Desai",
       author_email="desai@mcs.anl.gov",
-      packages=["Bcfg2",
-                "Bcfg2.Client",
+      packages=["Bcfg2.Client",
                 "Bcfg2.Client.Tools",
-                'Bcfg2.Server',
-                "Bcfg2.Server.Admin",
-                "Bcfg2.Server.Hostbase",
-                "Bcfg2.Server.Hostbase.hostbase",
-                "Bcfg2.Server.Plugins",
-                "Bcfg2.Server.Reports",
-                "Bcfg2.Server.Reports.reports",
-                "Bcfg2.Server.Reports.reports.templatetags",
-                "Bcfg2.Server.Snapshots",
                 ],
+      py_modules = ["Bcfg2.Options",
+                    "Bcfg2.Proxy",
+                    "Bcfg2.Logger",
+                    ],
       package_dir = {'Bcfg2':'src/lib'},
-      package_data = {'Bcfg2.Server.Reports.reports':['fixtures/*.xml']},
-      scripts = glob('src/sbin/*'),
-      data_files = [('share/bcfg2/schemas',
-                     glob('schemas/*.xsd')),
-                    ('share/bcfg2/xsl-transforms',
-                     glob('reports/xsl-transforms/*.xsl')),
-                    ('share/bcfg2/xsl-transforms/xsl-transform-includes',
-                     glob('reports/xsl-transforms/xsl-transform-includes/*.xsl')),
-                    ('share/man/man1', glob("man/bcfg2.1")),
+      package_data = {'Bcfg2.Server.Reports.reports':['fixtures/*.xml',
+                'templates/*.html', 'templates/*/*.html',
+                'templates/*/*.inc' ] },
+      scripts = glob('src/sbin/bcfg2'),
+      data_files = [('share/man/man1', glob("man/bcfg2.1")),
                     ('share/man/man5', glob("man/*.5")),
-                    ('share/man/man8', glob("man/*.8")),
-                    ('share/bcfg2/Reports/templates',
-                     glob('src/lib/Server/Reports/reports/templates/*.html')),
-                    ('share/bcfg2/Reports/templates/displays',
-                     glob('src/lib/Server/Reports/reports/templates/displays/*')),
-                    ('share/bcfg2/Reports/templates/clients',
-                     glob('src/lib/Server/Reports/reports/templates/clients/*')),
-                    ('share/bcfg2/Reports/templates/config_items',
-                     glob('src/lib/Server/Reports/reports/templates/config_items/*')),
-                    ('share/bcfg2/Hostbase/templates',
-                     glob('src/lib/Server/Hostbase/hostbase/webtemplates/*.*')),
-                    ('share/bcfg2/Hostbase/templates/hostbase',
-                     glob('src/lib/Server/Hostbase/hostbase/webtemplates/hostbase/*')),
-                    ('share/bcfg2/Hostbase/repo',
-                     glob('src/lib/Server/Hostbase/templates/*')),
                     ]
       )