Index: openacs-4/packages/new-portal/new-portal.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/new-portal.info,v
diff -u -r1.24 -r1.25
--- openacs-4/packages/new-portal/new-portal.info	20 Apr 2004 21:13:48 -0000	1.24
+++ openacs-4/packages/new-portal/new-portal.info	24 Jul 2004 15:24:34 -0000	1.25
@@ -8,14 +8,14 @@
     <singleton-p>t</singleton-p>
     <auto-mount>portal</auto-mount>
 
-    <version name="2.0.3" url="http://openacs.org/repository/download/apm/new-portal-2.0.3.apm">
+    <version name="2.1.0a2" url="http://openacs.org/repository/download/apm/new-portal-2.1.0a2.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Portals.</summary>
         <release-date>2004-03-10</release-date>
         <vendor url="http://openacs.org">OpenACS</vendor>
         <description format="text/plain">New Portal Package aka NPP. Portals are used to aggregate content from different sources within a single page.  Props to Ian Baker for &quot;Portal&quot;.</description>
 
-        <provides url="new-portal" version="2.0.3"/>
+        <provides url="new-portal" version="2.1.0a2"/>
         <requires url="acs-kernel" version="5.0.0b4"/>
 
         <callbacks>
Index: openacs-4/packages/new-portal/sql/postgresql/api-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/postgresql/api-create.sql,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/new-portal/sql/postgresql/api-create.sql	29 Jun 2004 10:18:37 -0000	1.12
+++ openacs-4/packages/new-portal/sql/postgresql/api-create.sql	24 Jul 2004 15:24:34 -0000	1.13
@@ -370,11 +370,13 @@
 
 select define_function_args('portal_element_theme__delete','theme_id');
 
-create function portal_element_theme__delete (integer)
+create or replace function portal_element_theme__delete (integer)
 returns integer as '
+declare
     p_theme_id                      alias for $1;
 begin
-    perform acs_object__delete(p_theme_id);
+    PERFORM acs_object__delete(p_theme_id);
+
     return (0);
 end;' language 'plpgsql';
 
@@ -444,8 +446,9 @@
 
 select define_function_args('portal_layout__delete','layout_id');
 
-create function portal_layout__delete(integer)
+create or replace function portal_layout__delete(integer)
 returns integer as '
+declare
     p_layout_id                     alias for $1;
 begin
     perform acs_object__delete(layout_id);
Index: openacs-4/packages/new-portal/sql/postgresql/upgrade/upgrade-2.1.0a1-2.1.0a2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/postgresql/upgrade/upgrade-2.1.0a1-2.1.0a2.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/new-portal/sql/postgresql/upgrade/upgrade-2.1.0a1-2.1.0a2.sql	24 Jul 2004 15:24:35 -0000	1.1
@@ -0,0 +1,20 @@
+-- missing declare statements
+
+create or replace function portal_element_theme__delete (integer)
+returns integer as '
+declare
+    p_theme_id                      alias for $1;
+begin
+    PERFORM acs_object__delete(p_theme_id);
+
+    return (0);
+end;' language 'plpgsql';
+
+create or replace function portal_layout__delete(integer)
+returns integer as '
+declare
+    p_layout_id                     alias for $1;
+begin
+    perform acs_object__delete(layout_id);
+    return 0;
+end;' language 'plpgsql';