Fix RUMPFSLIBS etc. As collateral, rename nullfs/umapfs to match

the vfsname, i.e. to "null" and "umap".

sys/rump/fs/Makefile.rumpfs

@@ -1,15 +1,20 @@
-#	$NetBSD: Makefile.rumpfs,v 1.25 2010/07/26 15:55:41 pooka Exp $
+#	$NetBSD: Makefile.rumpfs,v 1.26 2010/12/05 16:11:16 pooka Exp $
 #
 
-RUMPFSLIST=	cd9660 efs ext2fs fdesc ffs hfs kernfs lfs mfs msdos	\
-		nfs nilfs ntfs nullfs ptyfs smbfs syspuffs sysvbfs	\
-		tmpfs udf umapfs union
+RUMPFSCOMP=	cd9660 efs ext2fs fdesc ffs hfs kernfs lfs mfs msdos	\
+		nfs nilfs ntfs null ptyfs smbfs syspuffs sysvbfs	\
+		tmpfs udf umap union
 
-RUMPFSLIST+=	fifovfs layervfs
+RUMPFSCOMP+=	nfsserver
 
-RUMPFSLIST+=	nfsserver
+RUMPVFSCOMP+=	fifo layer
 
-.for var in ${RUMPFSLIST}
+.for var in ${RUMPFSCOMP}
 RUMPFSLIBS+=lib${var}
 RUMPFSLDADD+=-lrumpfs_${var}
 .endfor
+
+.for var in ${RUMPVFSCOMP}
+RUMPFSLIBS+=lib${var}vfs
+RUMPFSLDADD+=-lrumpvfs_${var}fs
+.endfor

sys/rump/fs/lib/libnull/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2010/04/10 21:32:59 pooka Exp $
+#	$NetBSD: Makefile,v 1.1 2010/12/05 16:11:16 pooka Exp $
 #
 
 .PATH:  ${.CURDIR}/../../../../miscfs/nullfs

sys/rump/fs/lib/libnull/shlib_version

@@ -0,0 +1,4 @@
+#	$NetBSD: shlib_version,v 1.1 2010/12/05 16:11:16 pooka Exp $
+#
+major=0
+minor=0

sys/rump/fs/lib/libnullfs/shlib_version

@@ -1,4 +0,0 @@
-#	$NetBSD: shlib_version,v 1.1 2010/03/30 00:59:07 pooka Exp $
-#
-major=0
-minor=0

sys/rump/fs/lib/libumap/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2010/04/11 05:45:57 pooka Exp $
+#	$NetBSD: Makefile,v 1.1 2010/12/05 16:11:17 pooka Exp $
 #
 
 .PATH:  ${.CURDIR}/../../../../miscfs/umapfs

sys/rump/fs/lib/libumap/shlib_version

@@ -0,0 +1,4 @@
+#	$NetBSD: shlib_version,v 1.1 2010/12/05 16:11:17 pooka Exp $
+#
+major=0
+minor=0

sys/rump/fs/lib/libumapfs/shlib_version

@@ -1,4 +0,0 @@
-#	$NetBSD: shlib_version,v 1.1 2010/03/30 00:59:07 pooka Exp $
-#
-major=0
-minor=0