Index: openacs-4/contrib/packages/portal/sql/postgresql/layout-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/postgresql/layout-package-create.sql,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/packages/portal/sql/postgresql/layout-package-create.sql	6 Jun 2004 02:29:10 -0000	1.4
+++ openacs-4/contrib/packages/portal/sql/postgresql/layout-package-create.sql	9 Jun 2004 00:56:46 -0000	1.5
@@ -25,18 +25,18 @@
 
 select define_function_args('portal_layout__new', 'p_layout_id,p_name,p_description,p_filename,p_object_type;portal_layout,p_creation_date,p_creation_user,p_creation_ip,p_context_id');
 
-create or replace function portal_layout__new (integer,varchar,varchar,varchar,varchar,varchar,timestamptz,integer,varchar,integer)
+create or replace function portal_layout__new (integer,varchar,varchar,varchar,varchar,timestamptz,integer,varchar,integer)
 returns integer as '
 declare
     p_layout_id                     alias for $1;  -- default null
     p_name                          alias for $2;
     p_description                   alias for $3;  -- default null
     p_filename                      alias for $4;
-    p_object_type                   alias for $6;  -- default ''portal_layout''
-    p_creation_date                 alias for $7;  -- default current_timestamp
-    p_creation_user                 alias for $8;  -- default null
-    p_creation_ip                   alias for $9;  -- default null
-    p_context_id                    alias for $10; -- default null
+    p_object_type                   alias for $5;  -- default ''portal_layout''
+    p_creation_date                 alias for $6;  -- default current_timestamp
+    p_creation_user                 alias for $7;  -- default null
+    p_creation_ip                   alias for $8;  -- default null
+    p_context_id                    alias for $9; -- default null
     v_layout_id                     portal_layouts.layout_id%TYPE;
     v_object_type                   acs_objects.object_type%TYPE;
     v_creation_date                 acs_objects.creation_date%TYPE;
Index: openacs-4/contrib/packages/portal/sql/postgresql/portal-core-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/postgresql/portal-core-create.sql,v
diff -u -r1.11 -r1.12
--- openacs-4/contrib/packages/portal/sql/postgresql/portal-core-create.sql	6 Jun 2004 02:29:10 -0000	1.11
+++ openacs-4/contrib/packages/portal/sql/postgresql/portal-core-create.sql	9 Jun 2004 00:56:46 -0000	1.12
@@ -213,10 +213,6 @@
     directory without the ending ".adp" extension. Example: "layouts/simple2"
 ';
 
-comment on column portal_layouts.resource_dir is '
-    XXX remove me
-';
-
 create table portal_layout_regions (
     layout_id                       integer
                                     constraint p_layout_regions_layout_id_fk
Index: openacs-4/contrib/packages/portal/sql/postgresql/portal-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/sql/postgresql/portal-create.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/portal/sql/postgresql/portal-create.sql	15 Jan 2004 00:34:40 -0000	1.3
+++ openacs-4/contrib/packages/portal/sql/postgresql/portal-create.sql	9 Jun 2004 00:56:46 -0000	1.4
@@ -30,4 +30,3 @@
 \i theme-package-create.sql
 \i layout-package-create.sql
 \i datasource-package-create.sql
-\i defaults.sql