Update misc/rump and filesystems/fs-utils to 20130430 to use github versions

which are available respectively at
https://github.com/anttikantee/buildrump.sh and
https://github.com/stacktic/fs-utils

2 files changed, 22 insertions, 63 deletions

diff --git a/misc/rump/DESCR b/misc/rump/DESCR
index 7573cd75d41..307efeb0148 100644
--- a/misc/rump/DESCR
+++ b/misc/rump/DESCR
@@ -1,5 +1,8 @@
-This package provides file system driver support for the
-filesystems/fs-utils package using vintage 2009 NetBSD.
-
-Newer versions are available by checking out the entire NetBSD source
-and using buildrump.sh (https://github.com/anttikantee/buildrump.sh)
+Rump (Runnable Userspace Meta Program) is a mechanism for running kernel code
+as part of a user program's address space. As opposed to executing system calls
+for requesting kernel services, rump programs do a library call into the kernel
+code for equivalent functionality. Kernel code is simply recompiled as a
+userspace shared library from the kernel sources instead of being rewritten,
+so services imitate the same services being provided by the kernel. Select
+architectures such as i386 and amd64 also support directly linking binary
+kernel modules against rump programs.
diff --git a/misc/rump/Makefile b/misc/rump/Makefile
index 8b63318243b..2e55bf7a200 100644
--- a/misc/rump/Makefile
+++ b/misc/rump/Makefile
@@ -1,73 +1,29 @@
-# $NetBSD: Makefile,v 1.16 2012/10/08 09:57:37 asau Exp $
+# $NetBSD: Makefile,v 1.17 2013/05/01 17:16:06 stacktic Exp $
 #
 
-DISTNAME=		rump_20091108
-PKGNAME=		${DISTNAME:S/_/-/}
-PKGREVISION=		3
+GIT_COMMIT=		067df5
+DISTNAME=		${GIT_COMMIT}
+PKGNAME=		rump-20130430
 
 CATEGORIES=		misc
-MASTER_SITES=		ftp://ftp.NetBSD.org/pub/NetBSD/misc/stacktic/
+MASTER_SITES=		-http://nodeload.github.com/anttikantee/buildrump.sh/tar.gz/${GIT_COMMIT}
 
 MAINTAINER=		stacktic@NetBSD.org
-HOMEPAGE=		http://www.NetBSD.org/docs/rump/
+HOMEPAGE=		http://github.com/anttikantee/buildrump.sh
 COMMENT=		Virtualized NetBSD kernel components in userspace
+LICENSE=		2-clause-bsd
+USE_TOOLS+=		pax
 
-ONLY_FOR_PLATFORM=	Linux-*-* FreeBSD-*-*
+ONLY_FOR_PLATFORM=	Linux-*-* SunOS-*-* NetBSD-*-*
 
 INSTALLATION_DIRS=	lib include/rump ${PKGMANDIR}/man3
 
-USE_BSD_MAKEFILE=	yes
+WRKSRC=			${WRKDIR}/buildrump.sh-${GIT_COMMIT}
 
-WRKSRC=			${WRKDIR}/rump
+do-build:
+	cd ${WRKSRC} && ./buildrump.sh -r checkout tools build install
 
-MAKEFLAGS+=		MACHINE_ARCH=${MACHINE_ARCH}
-MAKEFLAGS+=		BSDSRCDIR=${WRKSRC}
-MAKEFLAGS+=		NOGCCERROR=1
+do-install:
+	cd ${WRKSRC}/rump && ${PAX} -wr lib include share ${DESTDIR}${PREFIX}/
 
-SUBST_CLASSES+=		alloc
-SUBST_STAGE.alloc=	pre-configure
-SUBST_MESSAGE.alloc=	Using malloc.
-SUBST_FILES.alloc=	sys/rump/librump/rumpkern/Makefile.rumpkern
-SUBST_SED.alloc=	-e "s|CPPFLAGS.*USE_REAL_ALLOCATORS.*|\# &|"
-SUBST_SED.alloc+=	-e "s|SRCS.*subr_pool.*|\# &|"
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Linux"
-
-SUBST_CLASSES+=		crt
-SUBST_STAGE.crt=	pre-configure
-SUBST_MESSAGE.crt=	Fix crt path.
-SUBST_FILES.crt=	share/mk/bsd.lib.mk share/mk/bsd.prog.mk
-SUBST_SED.crt=		-e "s|lib/crt|lib$$\{LIBABISUFFIX\}/crt|"
-MAKEFLAGS+=		LIBABISUFFIX=${LIBABISUFFIX}
-
-SUBST_CLASSES+=		dl
-SUBST_STAGE.dl=		pre-configure
-SUBST_MESSAGE.dl=	Fix dlopen.
-SUBST_FILES.dl=		lib/libukfs/ukfs.c
-SUBST_SED.dl=		-e "s|RTLD_GLOBAL|&\|RTLD_LAZY|"
-
-MAKEFLAGS+=		MACHINE=${MACHINE_ARCH:C/x86_64/amd64/}
-
-CRT_PATH!=		gcc --print-file-name=crtbegin.o
-MAKEFLAGS+=		_GCC_CRTBEGIN=${CRT_PATH}
-MAKEFLAGS+=		_GCC_CRTBEGINS=${CRT_PATH:C/begin/beginS/}
-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+=		rumpdefs.h rumpuser.h rumpvnode_if.h
-RUMP_INCS+=		rumpkern_if_pub.h rumpnet_if_pub.h rumpvfs_if_pub.h
-
-post-install:
-.for i in ${RUMP_INCS}
-	${INSTALL_DATA} ${WRKSRC}/sys/rump/include/rump/${i} \
-		${DESTDIR}${PREFIX}/include/rump
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/lib/libukfs/ukfs.h \
-		${DESTDIR}${PREFIX}/include/rump
-
-.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"