Index: pkg/module.defs
===================================================================
--- pkg/module.defs	(revision 2973)
+++ pkg/module.defs	(working copy)
@@ -3,7 +3,8 @@
 PKG.in/  = $(SRC/)pkg/
 PKG.out/ = $(BUILD/)pkg/

-PKG.src.tar.bz2 = $(PKG.out/)$(HB.name)-$(HB.version).tar.bz2
+PKG.basename    = $(HB.name)-$(HB.version)
+PKG.src.tar.bz2 = $(PKG.out/)$(PKG.basename).tar.bz2

 STAGE.out/     = $(BUILD/)stage/
 STAGE.out.src/ = $(STAGE.out/)src/
Index: pkg/module.rules
===================================================================
--- pkg/module.rules	(revision 2973)
+++ pkg/module.rules	(working copy)
@@ -12,13 +12,13 @@

 $(PKG.src.tar.bz2): | $(dir $(PKG.src.tar.bz2))
 $(PKG.src.tar.bz2): | $(STAGE.out.src/)
-	$(TAR.exe) cjf $@ -C $(STAGE.out.src/) $(HB.name)-$(HB.version)
+	$(TAR.exe) cjf $@ -C $(STAGE.out.src/) $(PKG.basename)

 $(STAGE.out.src/):
-	svn export -r$(HB.repo.rev) $(HB.repo.url) $@/$(HB.name)-$(HB.version)
+	svn export -r$(HB.repo.rev) $(HB.repo.url) $@/$(PKG.basename)
 	sed 's/\(self.rev.*=.*\)0/\1$(HB.repo.rev)/' \
-	    $@/$(HB.name)-$(HB.version)/make/configure.py > $@/$(HB.name)-$(HB.version)/make/configure.py.tmp
-	$(MV.exe) $@/$(HB.name)-$(HB.version)/make/configure.py.tmp $@/$(HB.name)-$(HB.version)/make/configure.py
+	    $@/$(PKG.basename)/make/configure.py > $@/$(PKG.basename)/make/configure.py.tmp
+	$(MV.exe) $@/$(PKG.basename)/make/configure.py.tmp $@/$(PKG.basename)/make/configure.py

 ###############################################################################

Index: make/configure.py
===================================================================
--- make/configure.py	(revision 2973)
+++ make/configure.py	(working copy)
@@ -660,7 +660,7 @@

         self.vmajor = 0
         self.vminor = 9
-        self.vpoint = 4
+        self.vpoint = 5

     def _action( self ):
         ## add architecture to URL only for Mac