Updated misc/rump to version 20091103

- Should fix building on Linux 64bits (reported by Alexander Nasonov)
- Fixed the build of dependencies

4 files changed, 15 insertions, 26 deletions

diff --git a/misc/rump/Makefile b/misc/rump/Makefile
index 3cbe5a5dc3c..d2e664b6691 100644
--- a/misc/rump/Makefile
+++ b/misc/rump/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2009/11/02 18:54:28 stacktic Exp $
+# $NetBSD: Makefile,v 1.9 2009/11/05 08:36:00 stacktic Exp $
 #
 
-DISTNAME=		rump_20091102
+DISTNAME=		rump_20091103
 PKGNAME=		${DISTNAME:S/_/-/}
 
 CATEGORIES=		misc
@@ -13,31 +13,16 @@ COMMENT=		Virtualized NetBSD kernel components in userspace
 
 ONLY_FOR_PLATFORM=	Linux-*-* FreeBSD-*-*
 
-INSTALLATION_DIRS=	lib include/rump
+INSTALLATION_DIRS=	lib include/rump ${PKGMANDIR}/man3
 
-CHECK_PORTABILITY=	no
 PKG_DESTDIR_SUPPORT=	user-destdir
 USE_BSD_MAKEFILE=	yes
 
 WRKSRC=			${WRKDIR}/rump
 
-MAKEFLAGS+=		MKMAN=no
-
-MAKEFLAGS+=		TOOLDIR=${WRKSRC}/tooldir
 MAKEFLAGS+=		MACHINE_ARCH=${MACHINE_ARCH}
 MAKEFLAGS+=		BSDSRCDIR=${WRKSRC}
 
-MAKEFLAGS+=		INSTALL=${WRKSRC}/tools/binstall/xinstall
-MAKEFLAGS+=		TSORT="${WRKSRC}/tools/tsort/tsort -q"
-MAKEFLAGS+=		LORDER=${WRKSRC}/tools/lorder/lorder
-
-SUBST_CLASSES+=		inc_path
-SUBST_STAGE.inc_path=	pre-configure
-SUBST_MESSAGE.inc_path=	Adjusting include path.
-SUBST_FILES.inc_path=	lib/libukfs/Makefile
-SUBST_FILES.inc_path+=	sys/rump/include/rump/Makefile
-SUBST_SED.inc_path=	-e "s|/usr/include|${PREFIX}/include|g"
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Linux"
@@ -50,8 +35,9 @@ MAKEFLAGS+=		_GCC_CRTEND=${CRT_PATH:C/begin/end/}
 MAKEFLAGS+=		_GCC_CRTENDS=${CRT_PATH:C/begin/endS/}
 .endif
 
-RUMP_INCS=		rump.h rump_compat.h rump_namei.h rump_syscalls.h 
+RUMP_INCS=		rump.h rump_compat.h rump_namei.h rump_syscalls.h
 RUMP_INCS+=		rumpdefs.h rumpuser.h rumpvnode_if.h
+RUMP_INCS+=		rumpkern_if_pub.h rumpvfs_if_pub.h
 
 post-install:
 .for i in ${RUMP_INCS}
diff --git a/misc/rump/PLIST b/misc/rump/PLIST
index 28fad7e4caa..85ab8180116 100644
--- a/misc/rump/PLIST
+++ b/misc/rump/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/21 14:40:07 stacktic Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/11/05 08:36:00 stacktic Exp $
 include/rump/rump.h
 include/rump/rump_compat.h
 include/rump/rump_namei.h
 include/rump/rump_syscalls.h
 include/rump/rumpdefs.h
+include/rump/rumpkern_if_pub.h
 include/rump/rumpuser.h
+include/rump/rumpvfs_if_pub.h
 include/rump/rumpvnode_if.h
 include/rump/ukfs.h
 lib/librump.a
@@ -127,3 +129,4 @@ lib/libukfs.so.1
 lib/libukfs.so.1.0
 lib/libukfs_p.a
 lib/libukfs_pic.a
+man/man3/ukfs.3
diff --git a/misc/rump/buildlink3.mk b/misc/rump/buildlink3.mk
index 0bda5490ccd..759a013dd06 100644
--- a/misc/rump/buildlink3.mk
+++ b/misc/rump/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2009/10/30 18:25:23 stacktic Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2009/11/05 08:36:00 stacktic Exp $
 
 BUILDLINK_TREE+=	rump
 
 .if !defined(RUMP_BUILDLINK3_MK)
 RUMP_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.rump+=	rump>=20091030
+BUILDLINK_API_DEPENDS.rump+=	rump>=20091103
 BUILDLINK_PKGSRCDIR.rump?=	../../misc/rump
 .endif	# RUMP_BUILDLINK3_MK
 
diff --git a/misc/rump/distinfo b/misc/rump/distinfo
index f012c9c1d40..a0ab3da1689 100644
--- a/misc/rump/distinfo
+++ b/misc/rump/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2009/11/02 18:54:28 stacktic Exp $
+$NetBSD: distinfo,v 1.5 2009/11/05 08:36:00 stacktic Exp $
 
-SHA1 (rump_20091102.tar.gz) = 89eb4137e8ab98edada06110fe6b69b34e09a42e
-RMD160 (rump_20091102.tar.gz) = 8512c2ed27af656e35b4548e41998cdcc1c05f3a
-Size (rump_20091102.tar.gz) = 8753716 bytes
+SHA1 (rump_20091103.tar.gz) = 56a93f1033551804b47a374ad10a1cd0b2c1d404
+RMD160 (rump_20091103.tar.gz) = aae5a48f57154175bf8daa07637aa9a08099cb5e
+Size (rump_20091103.tar.gz) = 8753913 bytes