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.42 -r1.43
--- openacs-4/packages/new-portal/new-portal.info	29 Mar 2018 23:07:34 -0000	1.42
+++ openacs-4/packages/new-portal/new-portal.info	9 Jul 2018 16:36:43 -0000	1.43
@@ -8,15 +8,15 @@
     <singleton-p>t</singleton-p>
     <auto-mount>portal</auto-mount>
 
-    <version name="2.10.0d0" url="http://openacs.org/repository/download/apm/new-portal-2.10.0d0.apm">
+    <version name="2.10.0d1" url="http://openacs.org/repository/download/apm/new-portal-2.10.0d1.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Portals.</summary>
         <release-date>2017-08-06</release-date>
         <vendor url="http://dotlrn.org">DotLRN Consortium</vendor>
         <maturity>2</maturity>
         <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.10.0d0"/>
+        <provides url="new-portal" version="2.10.0d1"/>
         <requires url="acs-kernel" version="5.9.1"/>
 
         <callbacks>
Index: openacs-4/packages/new-portal/sql/oracle/objects-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/oracle/objects-create.sql,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/new-portal/sql/oracle/objects-create.sql	15 May 2007 20:14:47 -0000	1.8
+++ openacs-4/packages/new-portal/sql/oracle/objects-create.sql	9 Jul 2018 16:36:44 -0000	1.9
@@ -57,14 +57,6 @@
         datatype       => 'string' 
     ); 
 
-    attr_id := acs_attribute.create_attribute ( 
-        object_type    => 'portal_datasource', 
-        attribute_name => 'CONTENT', 
-        pretty_name    => 'Content', 
-        pretty_plural  => 'Contents', 
-        datatype       => 'string' 
-    ); 
-
 end; 
 / 
 show errors;
@@ -105,14 +97,6 @@
         datatype       => 'string' 
     ); 
 
-    attr_id := acs_attribute.create_attribute ( 
-        object_type    => 'portal_layout', 
-        attribute_name => 'TYPE', 
-        pretty_name    => 'Type', 
-        pretty_plural  => 'Types', 
-        datatype       => 'string' 
-    ); 
-
     attr_id := acs_attribute.create_attribute (
         object_type    => 'portal_layout',
         attribute_name => 'FILENAME',
@@ -169,14 +153,6 @@
         datatype       => 'string' 
     ); 
 
-    attr_id := acs_attribute.create_attribute ( 
-        object_type    => 'portal_element_theme', 
-        attribute_name => 'TYPE', 
-        pretty_name    => 'Type', 
-        pretty_plural  => 'Types', 
-        datatype       => 'string' 
-    ); 
-
     attr_id := acs_attribute.create_attribute (
         object_type    => 'portal_element_theme',
         attribute_name => 'FILENAME',
Index: openacs-4/packages/new-portal/sql/postgresql/objects-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/postgresql/objects-create.sql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/new-portal/sql/postgresql/objects-create.sql	15 May 2007 20:14:47 -0000	1.4
+++ openacs-4/packages/new-portal/sql/postgresql/objects-create.sql	9 Jul 2018 16:36:44 -0000	1.5
@@ -67,22 +67,6 @@
     'f'
 );
 
-select acs_attribute__create_attribute (
-    'portal_datasource',
-    'CONTENT',
-    'string',
-    'Content',
-    'Contents',
-    null,
-    null,
-    null,
-    1,
-    1,
-    null,
-    'type_specific',
-    'f'
-);
-
 -- portal_layouts
 select  acs_object_type__create_type (
     'portal_layout',
@@ -132,22 +116,6 @@
 
 select acs_attribute__create_attribute (
     'portal_layout',
-    'TYPE',
-    'string',
-    'Type',
-    'Types',
-    null,
-    null,
-    null,
-    1,
-    1,
-    null,
-    'type_specific',
-    'f'
-);
-
-select acs_attribute__create_attribute (
-    'portal_layout',
     'FILENAME',
     'string',
     'Filename',
@@ -227,22 +195,6 @@
 
 select acs_attribute__create_attribute (
     'portal_element_theme',
-    'TYPE',
-    'string',
-    'Type',
-    'Types',
-    null,
-    null,
-    null,
-    1,
-    1,
-    null,
-    'type_specific',
-    'f'
-);
-
-select acs_attribute__create_attribute (
-    'portal_element_theme',
     'FILENAME',
     'string',
     'Filename',
Index: openacs-4/packages/new-portal/tcl/apm-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/apm-callback-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/new-portal/tcl/apm-callback-procs.tcl	7 Aug 2017 23:48:12 -0000	1.3
+++ openacs-4/packages/new-portal/tcl/apm-callback-procs.tcl	9 Jul 2018 16:36:44 -0000	1.4
@@ -27,6 +27,26 @@
                 db_dml update_type {}
 
             }
+            2.10.0d0 2.10.0d1 {
+                set deleted_attributes [list]
+                lappend deleted_attributes [db_string get_attribute {
+                    select attribute_id from acs_attributes
+                    where object_type = 'portal_datasource'
+                    and lower(attribute_name) = 'content'} -default ""]
+                lappend deleted_attributes [db_string get_attribute {
+                    select attribute_id from acs_attributes
+                    where object_type = 'portal_element_theme'
+                    and lower(attribute_name) = 'type'} -default ""]
+                lappend deleted_attributes [db_string get_attribute {
+                    select attribute_id from acs_attributes
+                    where object_type = 'portal_layout'
+                    and lower(attribute_name) = 'type'} -default ""]
+                foreach attribute_id $deleted_attributes {                
+                    if {$attribute_id ne ""} {
+                        attribute::delete $attribute_id
+                    }
+                }
+            }
     }
 }