9 files changed, 84 insertions, 0 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index b199f92f7546..b1e5624497fe 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -35,6 +35,7 @@
     SUBDIR += flexbackup
     SUBDIR += fontedit
     SUBDIR += fortunelock
+    SUBDIR += fsck_ext2fs
     SUBDIR += gcombust
     SUBDIR += gkrellm
     SUBDIR += glload
diff --git a/sysutils/fsck_ext2fs/Makefile b/sysutils/fsck_ext2fs/Makefile
new file mode 100644
index 000000000000..86ea8a49b5e9
--- /dev/null
+++ b/sysutils/fsck_ext2fs/Makefile
@@ -0,0 +1,25 @@
+# New ports collection makefile for:	fsck_ext2fs
+# Date Created:				16 Jul 2000
+# Whom:					Roman Shterenzon <roman@xpert.com>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	fsck_ext2fs
+PORTVERSION=	2.8
+CATEGORIES=     sysutils
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	alex
+
+MAINTAINER=	roman@xpert.com
+
+MAN8=		fsck_ext2fs.8
+
+do-build:
+	@cd ${WRKSRC}/fsck_ext2fs && ${SETENV} ${MAKE_ENV} ${MAKE}
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs/fsck_ext2fs ${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/fsck_ext2fs/fsck_ext2fs.8 ${PREFIX}/man/man8
+
+.include <bsd.port.mk>
diff --git a/sysutils/fsck_ext2fs/distinfo b/sysutils/fsck_ext2fs/distinfo
new file mode 100644
index 000000000000..5652548a2575
--- /dev/null
+++ b/sysutils/fsck_ext2fs/distinfo
@@ -0,0 +1 @@
+MD5 (fsck_ext2fs-2.8.tar.gz) = 2f636589cfbaafd98db90db798eb032b
diff --git a/sysutils/fsck_ext2fs/files/patch-aa b/sysutils/fsck_ext2fs/files/patch-aa
new file mode 100644
index 000000000000..d32ee55408e6
--- /dev/null
+++ b/sysutils/fsck_ext2fs/files/patch-aa
@@ -0,0 +1,19 @@
+--- fsck_ext2fs/main.c.orig	Thu Apr 27 02:26:06 2000
++++ fsck_ext2fs/main.c	Sat Jul 15 11:05:32 2000
+@@ -56,6 +56,7 @@
+ #include <sys/param.h>
+ #include <sys/time.h>
+ #include <sys/mount.h>
++#include <ufs/ufs/ufsmount.h>
+ #include <ufs/ext2fs/ext2fs_dinode.h>
+ #include <ufs/ext2fs/ext2fs.h>
+ #include <fstab.h>
+@@ -69,6 +70,8 @@
+ #include "fsck.h"
+ #include "extern.h"
+ #include "fsutil.h"
++
++#define MOUNT_EXT2FS "/sbin/mount_ext2fs"
+ 
+ int	returntosingle;
+ 
diff --git a/sysutils/fsck_ext2fs/files/patch-ab b/sysutils/fsck_ext2fs/files/patch-ab
new file mode 100644
index 000000000000..a19fa295f4cb
--- /dev/null
+++ b/sysutils/fsck_ext2fs/files/patch-ab
@@ -0,0 +1,10 @@
+--- fsck_ext2fs/setup.c.orig	Thu Apr 27 02:26:06 2000
++++ fsck_ext2fs/setup.c	Sat Jul 15 11:06:00 2000
+@@ -69,6 +69,7 @@
+ #include "fsutil.h"
+ 
+ #define POWEROF2(num)	(((num) & ((num) - 1)) == 0)
++#define FS_EXT2FS	17	/* ext2fs */
+ 
+ void badsb __P((int, char *));
+ int calcsb __P((char *, int, struct m_ext2fs *));
diff --git a/sysutils/fsck_ext2fs/files/patch-ac b/sysutils/fsck_ext2fs/files/patch-ac
new file mode 100644
index 000000000000..56a3afd9c45b
--- /dev/null
+++ b/sysutils/fsck_ext2fs/files/patch-ac
@@ -0,0 +1,16 @@
+--- fsck_ext2fs/Makefile.orig	Sun Sep 21 13:36:34 1997
++++ fsck_ext2fs/Makefile	Tue Dec  5 00:49:35 2000
+@@ -1,11 +1,10 @@
+ #	$OpenBSD: Makefile,v 1.6 1997/09/21 11:36:34 deraadt Exp $
+ 
+ PROG=	fsck_ext2fs
+-MAN=    fsck_ext2fs.8
++MAN8=
+ SRCS=	dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
+ 	pass5.c fsutil.c setup.c utilities.c# ext2fs_subr.c
+ .PATH:	${.CURDIR}/../../sys/ufs/ext2fs ${.CURDIR}/../fsck
+-#CFLAGS= -g -I${.CURDIR}/../fsck
+-CFLAGS+= -I${.CURDIR}/../fsck
++CFLAGS+= -I../include -I${.CURDIR}/../fsck
+ 
+ .include <bsd.prog.mk>
diff --git a/sysutils/fsck_ext2fs/pkg-comment b/sysutils/fsck_ext2fs/pkg-comment
new file mode 100644
index 000000000000..9059279e8f2d
--- /dev/null
+++ b/sysutils/fsck_ext2fs/pkg-comment
@@ -0,0 +1 @@
+Ext2fs filesystem consistency check and interactive repair
diff --git a/sysutils/fsck_ext2fs/pkg-descr b/sysutils/fsck_ext2fs/pkg-descr
new file mode 100644
index 000000000000..474548f02ccc
--- /dev/null
+++ b/sysutils/fsck_ext2fs/pkg-descr
@@ -0,0 +1,10 @@
+Second Extended File System consistency check and interactive repair
+
+Performs interactive filesystem consistency checks and repair for each of
+the filesystems specified on the command line.
+
+Ported from OpenBSD 2.8
+
+WWW: http://www.openbsd.org/
+
+- Roman Shterenzon <roman@xpert.com>
diff --git a/sysutils/fsck_ext2fs/pkg-plist b/sysutils/fsck_ext2fs/pkg-plist
new file mode 100644
index 000000000000..97f009b30e57
--- /dev/null
+++ b/sysutils/fsck_ext2fs/pkg-plist
@@ -0,0 +1 @@
+sbin/fsck_ext2fs