Index: /main/waeup.aaue/trunk/buildout.cfg
===================================================================
--- /main/waeup.aaue/trunk/buildout.cfg	(revision 8895)
+++ /main/waeup.aaue/trunk/buildout.cfg	(revision 8896)
@@ -1,4 +1,11 @@
 [buildout]
-develop = . waeup.kofa kofacustom.nigeria
+# See http://pypi.python.org/pypi/mr.developer for details
+extensions = mr.developer
+auto-checkout = waeup.kofa kofacustom.nigeria
+# We cannot use 'src' (the default) as the checked out projects won't
+# work properly with paster (paster looks up any upper directory
+# egg-info dirs and then complains about not-available packages).
+sources-dir = sources
+develop = .
 parts =
     eggbasket
@@ -31,4 +38,8 @@
 # unless you specify an eggs-directory option here.
 
+[sources]
+waeup.kofa = svn https://svn.waeup.org/repos/main/waeup.kofa/trunk
+kofacustom.nigeria = svn https://svn.waeup.org/repos/main/kofacustom.nigeria/trunk
+
 [kofa_params]
 ## Basic parameters for deployment.
@@ -36,9 +47,9 @@
 host = 0.0.0.0
 # default is 8080
-base_port = 7021
-zeo1_port = 7021
-zeo2_port = 7022
-zeo3_port = 7023
-server_port = 7020
+base_port = 7011
+zeo1_port = 7011
+zeo2_port = 7012
+zeo3_port = 7013
+server_port = 7010
 # default 7. Number of pre-opened ZODB threads/client
 pool_size = 7
@@ -60,4 +71,5 @@
        repoze.profile
        ZODB3
+interpreter = python-console
 
 [kofactl]
Index: /main/waeup.aaue/trunk/setup.py
===================================================================
--- /main/waeup.aaue/trunk/setup.py	(revision 8895)
+++ /main/waeup.aaue/trunk/setup.py	(revision 8896)
@@ -9,5 +9,5 @@
     'grokui.admin',
     'grokcore.startup',
-    'waeup.kofa', # not really neccessary, as kofacustom.ng includes it
+    'waeup.kofa',
     'kofacustom.nigeria',
     ],
Index: /main/waeup.aaue/trunk/src/waeup/aaue/configure.zcml
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/configure.zcml	(revision 8895)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/configure.zcml	(revision 8896)
@@ -1,7 +1,11 @@
-<configure xmlns="http://namespaces.zope.org/zope">
+<configure xmlns="http://namespaces.zope.org/zope"
+           xmlns:grok="http://namespaces.zope.org/grok">
+  <include package="waeup.aaue" file="locales.zcml" />
 
-  <include package="waeup.aaue" file="locales.zcml" />
-  <include package="grok" />
-  <includeOverrides package="waeup.aaue" file="overrides.zcml" />
+  <!-- kofacustom.nigeria configures everything we basically need.
+  -->
+  <include package="kofacustom.nigeria" />
+
+  <grok:grok package="." />
 
 </configure>
Index: /main/waeup.aaue/trunk/src/waeup/aaue/ftesting.zcml
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/ftesting.zcml	(revision 8895)
+++ /main/waeup.aaue/trunk/src/waeup/aaue/ftesting.zcml	(revision 8896)
@@ -6,7 +6,6 @@
    >
 
-  <include package="grok" />
-  <includeOverrides package="waeup.aaue" />
-  <includeOverrides package="waeup.aaue" file="mail.zcml"/>
+  <include package="waeup.aaue" />
+  <include package="waeup.aaue" file="mail.zcml"/>
 
   <!-- Where should the datacenter reside by default? -->
Index: in/waeup.aaue/trunk/src/waeup/aaue/overrides.zcml
===================================================================
--- /main/waeup.aaue/trunk/src/waeup/aaue/overrides.zcml	(revision 8895)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<configure xmlns="http://namespaces.zope.org/zope"
-           xmlns:grok="http://namespaces.zope.org/grok">
-  <includeDependencies package="." />
-  <grok:grok package="." />
-
-  <!-- Register edit widget for PhoneNumbers -->
-  <adapter
-      for="waeup.kofa.schema.interfaces.IPhoneNumber
-           zope.publisher.interfaces.browser.IBrowserRequest"
-      provides="zope.formlib.interfaces.ISimpleInputWidget"
-      factory="waeup.aaue.widgets.phonewidget.CustomPhoneWidget"
-      permission="zope.Public"
-      />
-
-</configure>
