7 files changed, 132 insertions, 0 deletions

diff --git a/sysutils/e2fsprogs/files/patch-MCONFIG.in b/sysutils/e2fsprogs/files/patch-MCONFIG.in
new file mode 100644
index 000000000000..21bdc912776c
--- /dev/null
+++ b/sysutils/e2fsprogs/files/patch-MCONFIG.in
@@ -0,0 +1,25 @@
+
+$FreeBSD$
+
+--- MCONFIG.in.orig	Sat Jun 23 07:25:59 2001
++++ MCONFIG.in	Tue Jul  3 18:29:41 2001
+@@ -57,15 +57,15 @@
+ # Library definitions
+ #
+ LIB = $(top_builddir)/lib
+-LIBSS = $(LIB)/libss@LIB_EXT@
+-LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@
++LIBSS = /usr/lib/libss.so
++LIBCOM_ERR = /usr/lib/libcom_err.so
+ LIBE2P = $(LIB)/libe2p@LIB_EXT@
+ LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@
+ LIBUUID = $(LIB)/libuuid@LIB_EXT@ @SOCKET_LIB@ 
+ DEPLIBUUID = $(LIB)/libuuid@LIB_EXT@
+ 
+-STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@
+-STATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@
++STATIC_LIBSS = /usr/lib/libss.a
++STATIC_LIBCOM_ERR = /usr/lib/libcom_err.a
+ STATIC_LIBE2P = $(LIB)/libe2p@STATIC_LIB_EXT@
+ STATIC_LIBEXT2FS = $(LIB)/libext2fs@STATIC_LIB_EXT@
+ STATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@ @SOCKET_LIB@ 
diff --git a/sysutils/e2fsprogs/files/patch-Makefile.in b/sysutils/e2fsprogs/files/patch-Makefile.in
new file mode 100644
index 000000000000..51c7fdbe0037
--- /dev/null
+++ b/sysutils/e2fsprogs/files/patch-Makefile.in
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig	Sat Jun 23 07:25:59 2001
++++ Makefile.in	Tue Jul  3 18:51:42 2001
+@@ -10,9 +10,9 @@
+ @RESIZER_CMT@RESIZE_DIR= resize
+ @DEBUGFS_CMT@DEBUGFS_DIR= debugfs
+ 
+-LIB_SUBDIRS=lib/et lib/ss lib/e2p lib/ext2fs lib/uuid # lib/finddev
+-PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR) tests/progs 
+-SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS) tests
++LIB_SUBDIRS=lib/e2p lib/ext2fs lib/uuid # lib/finddev
++PROG_SUBDIRS=e2fsck $(DEBUGFS_DIR) misc $(RESIZE_DIR)
++SUBDIRS=util $(LIB_SUBDIRS) $(PROG_SUBDIRS)
+ 
+ SUBS= lib/ext2fs/ext2_types.h
+ 
diff --git a/sysutils/e2fsprogs/files/patch-debugfs::Makefile.in b/sysutils/e2fsprogs/files/patch-debugfs::Makefile.in
new file mode 100644
index 000000000000..ba4235916a3b
--- /dev/null
+++ b/sysutils/e2fsprogs/files/patch-debugfs::Makefile.in
@@ -0,0 +1,26 @@
+
+$FreeBSD$
+
+--- debugfs/Makefile.in.orig	Sat Jun 23 07:25:59 2001
++++ debugfs/Makefile.in	Tue Jul  3 18:49:18 2001
+@@ -14,7 +14,7 @@
+ PROGS=		debugfs
+ MANPAGES=	debugfs.8
+ 
+-MK_CMDS=	_SS_DIR_OVERRIDE=../lib/ss ../lib/ss/mk_cmds
++MK_CMDS=	mk_cmds
+ 
+ DEBUG_OBJS= debug_cmds.o debugfs.o util.o ncheck.o icheck.o ls.o \
+ 	lsdel.o dump.o setsuper.o logdump.o
+@@ -75,9 +75,9 @@
+ # the Makefile.in file
+ #
+ debug_cmds.o: debug_cmds.c $(top_srcdir)/lib/ss/ss.h \
+- $(top_builddir)/lib/ss/ss_err.h
++
+ debugfs.o: $(srcdir)/debugfs.c $(top_srcdir)/lib/et/com_err.h \
+- $(top_srcdir)/lib/ss/ss.h $(top_builddir)/lib/ss/ss_err.h \
++ $(top_srcdir)/lib/ss/ss.h \
+  $(srcdir)/debugfs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
+  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
+  $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
diff --git a/sysutils/e2fsprogs/files/patch-e2fsck::journal.c b/sysutils/e2fsprogs/files/patch-e2fsck::journal.c
new file mode 100644
index 000000000000..9a9487822579
--- /dev/null
+++ b/sysutils/e2fsprogs/files/patch-e2fsck::journal.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- e2fsck/journal.c	2001/07/03 14:35:01	1.1
++++ e2fsck/journal.c	2001/07/03 14:35:13
+@@ -13,6 +13,8 @@
+  */
+ 
+ #ifdef HAVE_SYS_MOUNT_H
++#include <sys/param.h>
++#include <sys/types.h>
+ #include <sys/mount.h>
+ #define MNT_FL (MS_MGC_VAL | MS_RDONLY)
+ #endif
diff --git a/sysutils/e2fsprogs/files/patch-lib::Makefile.elf-lib b/sysutils/e2fsprogs/files/patch-lib::Makefile.elf-lib
new file mode 100644
index 000000000000..bb0a6f80de4d
--- /dev/null
+++ b/sysutils/e2fsprogs/files/patch-lib::Makefile.elf-lib
@@ -0,0 +1,22 @@
+
+$FreeBSD$
+
+--- lib/Makefile.elf-lib.orig	Sat Jun 23 07:25:59 2001
++++ lib/Makefile.elf-lib	Tue Jul  3 18:57:04 2001
+@@ -39,13 +39,12 @@
+ installdirs:: installdirs-elf-lib
+ 
+ install-shlibs install:: $(ELF_LIB) installdirs-elf-lib
+-	$(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
++	$(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
++	$(INSTALL_DATA) $(ELF_IMAGE).a $(DESTDIR)$(ELF_INSTALL_DIR)/
+ 	$(STRIP) --strip-debug \
+-		$(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
+-	$(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
++		$(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
+ 	$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
+ 		$(DESTDIR)$(libdir)/$(ELF_IMAGE).so
+-	-$(LDCONFIG)
+ 
+ uninstall-shlibs uninstall::
+ 	$(RM) -f $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) \
diff --git a/sysutils/e2fsprogs/files/patch-lib::ext2fs::Makefile.in b/sysutils/e2fsprogs/files/patch-lib::ext2fs::Makefile.in
new file mode 100644
index 000000000000..ac516f420cea
--- /dev/null
+++ b/sysutils/e2fsprogs/files/patch-lib::ext2fs::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- lib/ext2fs/Makefile.in	2001/07/03 15:30:54	1.1
++++ lib/ext2fs/Makefile.in	2001/07/03 15:31:07
+@@ -156,7 +156,7 @@
+ @ELF_CMT@	$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
+ @BSDLIB_CMT@	$(CC) $(ALL_CFLAGS) -fpic -o pic/$*.o -c $<
+ 
+-COMPILE_ET=../et/compile_et
++COMPILE_ET=compile_et
+ 
+ DISTFILES= Makefile *.c *.h image
+ 
diff --git a/sysutils/e2fsprogs/files/patch-lib::ext2fs::flushb.c b/sysutils/e2fsprogs/files/patch-lib::ext2fs::flushb.c
new file mode 100644
index 000000000000..b7ef006a8a36
--- /dev/null
+++ b/sysutils/e2fsprogs/files/patch-lib::ext2fs::flushb.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- lib/ext2fs/flushb.c	2001/07/03 14:28:59	1.1
++++ lib/ext2fs/flushb.c	2001/07/03 14:30:57
+@@ -21,6 +21,7 @@
+ #include <sys/ioctl.h>
+ #endif
+ #if HAVE_SYS_MOUNT_H
++#include <sys/param.h>
+ #include <sys/mount.h>		/* This may define BLKFLSBUF */
+ #endif
+