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

4 files changed, 26 insertions, 76 deletions

diff --git a/filesystems/fs-utils/DESCR b/filesystems/fs-utils/DESCR
index 811580a5afb..c6eee32e980 100644
--- a/filesystems/fs-utils/DESCR
+++ b/filesystems/fs-utils/DESCR
@@ -3,7 +3,7 @@ mount it.
 
 Classic commands included (prefixed with fsu_):
 
-* cat, diff, du, find, ls
+* cat, diff, du, find, ls, stat
 * chflags, chmod, chown, mv, rm, rmdir
 * cp, ln, mkdir, mkfifo, mknod, touch
 
@@ -12,5 +12,3 @@ New commands:
 * fsu_ecp (cp-like which allows the user to get/put files from/to the image)
 * fsu_exec (executes a local command like text editor on a file from the image)
 * fsu_write (writes its input in a file on the image)
-* fsu_console (a command console tool that uses previous commands and adds
-  directory browsing)
diff --git a/filesystems/fs-utils/Makefile b/filesystems/fs-utils/Makefile
index 135b5b574ce..32d4355ebb1 100644
--- a/filesystems/fs-utils/Makefile
+++ b/filesystems/fs-utils/Makefile
@@ -1,48 +1,28 @@
-# $NetBSD: Makefile,v 1.12 2012/10/03 16:08:30 asau Exp $
+# $NetBSD: Makefile,v 1.13 2013/05/01 17:16:06 stacktic Exp $
 #
 
-DISTNAME=		fs-utils_20091116
-PKGNAME=		${DISTNAME:S/_/-/}
-PKGREVISION=		1
+GIT_COMMIT=		a6bfcf
+DISTNAME=		${GIT_COMMIT}
+PKGNAME=		fs-utils-20130430
+
 CATEGORIES=		filesystems
-MASTER_SITES=		ftp://ftp.NetBSD.org/pub/NetBSD/misc/stacktic/
+MASTER_SITES=		-http://nodeload.github.com/stacktic/fs-utils/tar.gz/${GIT_COMMIT}
 
 MAINTAINER=		stacktic@NetBSD.org
-HOMEPAGE=		http://www.NetBSD.org/~stacktic/fs-utils.html
+HOMEPAGE=		https://github.com/stacktic/fs-utils
 COMMENT=		Tools to access/modify a file system image through RUMP
+LICENSE=		2-clause-bsd
+DEPENDS+=		rump-2013[0-9]*:../../misc/rump
 
-ONLY_FOR_PLATFORM=	NetBSD-[5-9]*-* FreeBSD-*-* Linux-*-*
+ONLY_FOR_PLATFORM=	Linux-*-* SunOS-*-* NetBSD-*-*
 
-USE_BSD_MAKEFILE=	yes
-WRKSRC=			${WRKDIR}/fs-utils
 INSTALLATION_DIRS=	bin lib include ${PKGMANDIR}/man1 ${PKGMANDIR}/man3
-MAKE_FLAGS+=		MKPROFILE=yes
-
-SUBST_CLASSES+=		path
-SUBST_STAGE.path=	pre-configure
-SUBST_MESSAGE.path=	Adjusting path.
-SUBST_FILES.path=	Makefile.gen
-SUBST_SED.path=		-e "s|/usr/pkg|${PREFIX}|g"
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/lib/libfsu_utils/fsu_fts.h \
-	    ${DESTDIR}${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/lib/libfsu_utils/fsu_utils.h \
-	    ${DESTDIR}${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/lib/libfsu_utils/fts2fsufts.h \
-	    ${DESTDIR}${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/lib/libfsu_mount/fsu_mount.h \
-	    ${DESTDIR}${PREFIX}/include
-
-OSNAME!=		uname -s
-.if ${OSNAME} != "NetBSD"
-MAKEFLAGS+=			NOGCCERROR=1
-USE_FEATURES=			nbcompat
-NBCOMPAT_CONFIGURE_ARGS+=	CFLAGS='-D_FILE_OFFSET_BITS=64 -fPIC'
-NBCOMPAT_CONFIGURE_ARGS+=	CPPFLAGS='-DPIC'
-NBCOMPAT_CONFIGURE_ARGS+=	--enable-bsd-getopt
 
-.include "../../misc/rump/buildlink3.mk"
-.endif # !NetBSD
+USE_TOOLS+=		gmake
+
+WRKSRC=			${WRKDIR}/fs-utils-${GIT_COMMIT}
 
+GNU_CONFIGURE=
+
+.include "../../misc/rump/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/filesystems/fs-utils/PLIST b/filesystems/fs-utils/PLIST
index da9692131af..f1cc190e6da 100644
--- a/filesystems/fs-utils/PLIST
+++ b/filesystems/fs-utils/PLIST
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.4 2009/11/02 18:58:10 stacktic Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/05/01 17:16:06 stacktic Exp $
 bin/fsu_cat
 bin/fsu_chflags
 bin/fsu_chmod
 bin/fsu_chown
-bin/fsu_console
 bin/fsu_cp
 bin/fsu_diff
 bin/fsu_du
 bin/fsu_ecp
+bin/fsu_emv
 bin/fsu_exec
 bin/fsu_find
 bin/fsu_get
@@ -20,26 +20,13 @@ bin/fsu_mv
 bin/fsu_put
 bin/fsu_rm
 bin/fsu_rmdir
+bin/fsu_stat
 bin/fsu_touch
 bin/fsu_write
-include/fsu_fts.h
-include/fsu_mount.h
-include/fsu_utils.h
-include/fts2fsufts.h
-lib/libfsu_mount.a
-lib/libfsu_mount.so
-lib/libfsu_mount.so.0
-lib/libfsu_mount.so.0.0
-lib/libfsu_mount_p.a
-lib/libfsu_mount_pic.a
-lib/libfsu_utils.a
-lib/libfsu_utils.so
-lib/libfsu_utils.so.0
-lib/libfsu_utils.so.0.0
-lib/libfsu_utils_p.a
-lib/libfsu_utils_pic.a
+lib/libfsu.la
 man/man1/fsu_cat.1
 man/man1/fsu_chflags.1
+man/man1/fsu_chgrp.1
 man/man1/fsu_chmod.1
 man/man1/fsu_chown.1
 man/man1/fsu_cp.1
@@ -53,9 +40,7 @@ man/man1/fsu_mv.1
 man/man1/fsu_rm.1
 man/man1/fsu_rmdir.1
 man/man1/fsu_touch.1
-man/man3/fsu_clearerr.3
 man/man3/fsu_fclose.3
-man/man3/fsu_feof.3
 man/man3/fsu_ferror.3
 man/man3/fsu_fflush.3
 man/man3/fsu_fgetc.3
@@ -63,16 +48,6 @@ man/man3/fsu_fopen.3
 man/man3/fsu_fputc.3
 man/man3/fsu_fread.3
 man/man3/fsu_fseek.3
-man/man3/fsu_fseeko.3
-man/man3/fsu_ftell.3
-man/man3/fsu_ftello.3
 man/man3/fsu_fts.3
-man/man3/fsu_fts_children.3
-man/man3/fsu_fts_close.3
-man/man3/fsu_fts_open.3
-man/man3/fsu_fts_read.3
-man/man3/fsu_fts_set.3
-man/man3/fsu_fwrite.3
 man/man3/fsu_mount.3
-man/man3/fsu_rewind.3
 man/man3/fsu_utils.3
diff --git a/filesystems/fs-utils/distinfo b/filesystems/fs-utils/distinfo
index 7bd146a00c2..93d635920cc 100644
--- a/filesystems/fs-utils/distinfo
+++ b/filesystems/fs-utils/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.9 2011/12/21 08:53:43 dholland Exp $
+$NetBSD: distinfo,v 1.10 2013/05/01 17:16:06 stacktic Exp $
 
-SHA1 (fs-utils_20091116.tar.gz) = cb49494a66a5d6bf69f2d80d79482b3f7607da29
-RMD160 (fs-utils_20091116.tar.gz) = 8381dfc13d8470560342c96167e033c255233ab2
-Size (fs-utils_20091116.tar.gz) = 153103 bytes
-SHA1 (patch-aa) = 654fc2827e1c41bd28cc31535a91fff799424017
-SHA1 (patch-ab) = e0654d25a6e0f8456f0568c9b20de16cfe1b77c1
-SHA1 (patch-lib_Makefile_inc) = e004fd2eaa287dd683e95718b3d3cb714c63f003
+SHA1 (a6bfcf.tar.gz) = b85cff41d49ff055e428c3b1c6432af195a9c95a
+RMD160 (a6bfcf.tar.gz) = d5169e9a18a868a0215c410985f5b1da40338899
+Size (a6bfcf.tar.gz) = 492847 bytes