--- upm-0.85/standard.def.jj	2002-12-27 15:39:29.000000000 +0000
+++ upm-0.85/standard.def	2002-12-27 15:39:37.000000000 +0000
@@ -42,8 +42,8 @@
 
 # UserIDs for access to metadata and building
 # uPM will build as root if these are commented out.
-upmuser=upm
-builduser=build
+upmuser=portage
+builduser=portage
 
 [mirror]
 # List of mirrors to be used using S @<mirrorname>/path P @<mirrorname>/path
--- upm-0.85/upm.c.jj	2002-12-27 16:16:37.000000000 +0000
+++ upm-0.85/upm.c	2002-12-27 16:17:00.000000000 +0000
@@ -4509,7 +4509,7 @@
         if (!mdep_install(m)) { error("%s: Failed to build necessary components",p->name);goto buildfail; }
       }
     }
-    if (base==NULL && p->base==FALSE) { error("%s: Cannot build without a base package.",p->name);goto buildfail; }
+    if (base==NULL && p->base==FALSE) { error("%s: Cannot build without a base package.",p->name);/*goto buildfail;*/ }
   }
 
   /* set key environment variables describing locations and names */