Attachment #39728 for bug #62563

View | Details | Raw Unified | Return to bug 62563
Collapse All | Expand All




#

PORTNAME=	e2fsprogs
PORTVERSION=	1.35.w20040131
PORTREVISION=	0
CATEGORIES=	sysutils
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}
DISTNAME=	${PORTNAME}-1.35-WIP-0131

MAINTAINER=	matthias.andree@gmx.de
COMMENT=	Utilities and library to manipulate an ext2 or ext3 filesystem

.if !defined(DISABLE_NLS)
USE_GETTEXT=	yes
.endif

WRKSRC=	${WRKDIR}/${PORTNAME}-1.35

PATCH_STRIP=	-p1
USE_REINPLACE=	yes
USE_GMAKE=	yes
INSTALLS_SHLIB=	yes
NO_FILTER_SHLIBS=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--enable-elf-shlibs --disable-fsck "--with-ldopts=-L${LOCALBASE}/lib"
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
.if defined(DISABLE_NLS)
CONFIGURE_ARGS+=	--disable-nls
PLIST_SUB=	NLS="@comment "
.else
MAKE_ARGS+=	STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a ../lib/libblkid.a  ../lib/libuuid.a ${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a"
PLIST_SUB=	NLS=""
.endif

MAN1=	chattr.1 lsattr.1 uuidgen.1
MAN8=	badblocks.8 debugfs.8 dumpe2fs.8 e2fsck.8 e2image.8 e2label.8 \
	mke2fs.8 mklost+found.8 resize2fs.8 tune2fs.8 \
	fsck.ext2.8 fsck.ext3.8 mkfs.ext2.8 mkfs.ext3.8 \
	findfs.8 blkid.8 logsave.8

pre-everything::
	@${ECHO_CMD} "-------------------------------------------------------------"
.if defined(DISABLE_NLS)
	@${ECHO_CMD} "National language support disabled, -DDISABLE_NLS in effect. "
.else
	@${ECHO_CMD} "Use -DDISABLE_NLS to build without national language support."
.endif
	@${ECHO_CMD} "-------------------------------------------------------------"

post-patch:
	${REINPLACE_CMD} -e 's|-DRESOURCE_TRACK||' ${WRKSRC}/e2fsck/Makefile.in
	${GUNZIP_CMD} ${WRKSRC}/tests/m_*/expect*.gz
	${REINPLACE_CMD} -e 's|OS type: Linux|OS type: (unknown os)|' \
	-e 's|Filesystem OS type:       Linux|Filesystem OS type:       unknown|' \
	-e 's|group root|group wheel|' \
	-e '/Exit status is 0/ N;s/Exit status is 0\n/Exit status is 0/' \
	${WRKSRC}/tests/m_*/expect.1

post-extract:
	${CHMOD} u+w ${WRKSRC}/po/*.po ${WRKSRC}/po/*.pot

post-build:
	cd ${WRKSRC}/tests && ${GMAKE} check
	${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} ${LIBS} -o ${WRKSRC}/fsck_ext2fs ${FILESDIR}/fsck_ext2fs.c

post-install:
	${RM} ${PREFIX}/sbin/filefrag
	${RM} ${PREFIX}/man/man8/filefrag.8
	${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs ${PREFIX}/sbin/
	${INSTALL_PROGRAM} ${WRKSRC}/e2fsck/e2fsck.shared ${PREFIX}/sbin/e2fsck
	${INSTALL_PROGRAM} ${WRKSRC}/e2fsck/e2fsck.static ${PREFIX}/sbin/e2fsck.static
	${LN} 2>/dev/null ${PREFIX}/sbin/e2fsck.static /sbin/e2fsck || ${CP} -n -p ${PREFIX}/sbin/e2fsck.static /sbin/e2fsck
	${LN} 2>/dev/null ${PREFIX}/sbin/fsck_ext2fs /sbin/ || ${CP} -n -p ${PREFIX}/sbin/fsck_ext2fs /sbin/
	${MKDIR} ${PREFIX}/include/ext2fs
	${INSTALL_DATA} ${WRKSRC}/lib/ext2fs/*.h ${PREFIX}/include/ext2fs/
	${MKDIR} ${PREFIX}/include/uuid
	${INSTALL_DATA} ${WRKSRC}/lib/uuid/*.h ${PREFIX}/include/uuid/
.for i in e2p ext2fs uuid
	${INSTALL_DATA} ${WRKSRC}/lib/${i}/lib${i}.a ${PREFIX}/lib/
.endfor

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)/root/e2fsprogs/distinfo (-2 / +2 lines)
1	MD5 (e2fsprogs-1.32.tar.gz) = a7ced9d6edaba3a000ccc5200e09b90d	1	MD5 (e2fsprogs-1.35-WIP-0131.tar.gz) = eccc46cd55d8295d686cf5ac6bbc3784
2	SIZE (e2fsprogs-1.32.tar.gz) = 2894603	2	SIZE (e2fsprogs-1.35-WIP-0131.tar.gz) = 3123309




/*
 * fsck_ext2fs - wrapper for e2fsck on FreeBSD
 * Copyright (C) 2004 Matthias Andree
 * redistributable in accordance with the
 * GNU General Public License v2
 *
 * format: gindent -kr
 */

#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>

int
main(int argc, char **argv)
{
	int ch, i = 1, force = 0;
	long block = 0;
	enum { normal, preen, yes, no } mode = normal;
	char *cmd[256];

	cmd[0] = "/sbin/e2fsck";
	while ((ch = getopt(argc, argv, "BFpfnyb:")) != -1) {
		switch (ch) {
		case 'p':
			mode = preen;
			break;
		case 'f':
			force = 1;
			break;
		case 'n':
			mode = no;
			break;
		case 'y':
			mode = yes;
			break;
		case 'b':
			block = atol(optarg);
			break;
		case 'B':
		case 'F':
		default:
			exit(EXIT_FAILURE);
		}
	}

	if (force)
		cmd[i++] = "-f";

	switch (mode) {
	case normal:
		break;
	case yes:
		cmd[i++] = "-y";
		break;
	case no:
		cmd[i++] = "-n";
		break;
	case preen:
		cmd[i++] = "-p";
		break;
	}

	if (block) {
		static char b[30];

		sprintf(b, "-b %ld", block);
		cmd[i++] = b;
	}

	while (optind < argc)
		cmd[i++] = argv[optind++];

	cmd[i++] = 0;

	(void)execv(cmd[0], cmd);
	exit(EXIT_FAILURE);
}




$FreeBSD: ports/sysutils/e2fsprogs/files/patch-MCONFIG.in,v 1.3 2003/08/31 10:42:37 obrien Exp $

--- MCONFIG.in.orig	Thu Oct 31 00:49:21 2002
+++ MCONFIG.in	Wed Aug 27 20:00:17 2003
@@ -64 +64 @@
-LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@
+LIBCOM_ERR = /usr/lib/libcom_err.so
@@ -70,2 +70,2 @@
-STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@
-STATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@
+STATIC_LIBSS = STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@
+STATIC_LIBCOM_ERR = /usr/lib/libcom_err.a

Lines 1-7 Link Here

(-)/root/e2fsprogs/files/patch-Makefile.in (-7 lines)
1	$FreeBSD: ports/sysutils/e2fsprogs/files/patch-Makefile.in,v 1.2 2003/08/31 10:42:37 obrien Exp $
2
3	--- Makefile.in.orig Wed Jul 23 06:08:04 2003
4	+++ Makefile.in Wed Aug 27 10:52:04 2003
5	@@ -14 +14 @@
6	-LIB_SUBDIRS=lib/et lib/ss lib/e2p lib/ext2fs lib/uuid lib/blkid intl
7	+LIB_SUBDIRS= lib/e2p lib/ext2fs lib/uuid lib/blkid intl





$FreeBSD: ports/sysutils/e2fsprogs/files/patch-debugfs::Makefile.in,v 1.2 2002/08/04 07:27:59 clive Exp $

--- debugfs/Makefile.in.orig	Sat Jun 23 07:25:59 2001
+++ debugfs/Makefile.in	Tue Jul  3 18:49:18 2001
@@ -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 \





$FreeBSD: ports/sysutils/e2fsprogs/files/patch-e2fsck::journal.c,v 1.1 2001/07/03 18:13:14 sobomax Exp $

--- 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




# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/02/03 03:22:19+01:00 matthias.andree@gmx.de 
#   e2fsck.c:
#     Add missing ctx->flags &= ~E2F_FLAG_SETJMP_OK; when
#     returning after setjmp returned true (i. e. from longjmp).
# 
# e2fsck/e2fsck.c
#   2004/02/03 03:16:40+01:00 matthias.andree@gmx.de +3 -1
#   Add missing ctx->flags &= ~E2F_FLAG_SETJMP_OK; when
#   returning after setjmp returned true (i. e. from longjmp).
# 
diff -Nru a/e2fsck/e2fsck.c b/e2fsck/e2fsck.c
--- a/e2fsck/e2fsck.c	Tue Feb  3 03:23:50 2004
+++ b/e2fsck/e2fsck.c	Tue Feb  3 03:23:50 2004
@@ -180,8 +180,10 @@
 	pass_t	e2fsck_pass;
 
 #ifdef HAVE_SETJMP_H
-	if (setjmp(ctx->abort_loc))
+	if (setjmp(ctx->abort_loc)) {
+		ctx->flags &= ~E2F_FLAG_SETJMP_OK;
 		return (ctx->flags & E2F_FLAG_RUN_RETURN);
+	}
 	ctx->flags |= E2F_FLAG_SETJMP_OK;
 #endif
 		

Lines 1-10 Link Here

(-)/root/e2fsprogs/files/patch-intl%Makefile.in (-10 lines)
1	$FreeBSD: ports/sysutils/e2fsprogs/files/patch-intl%Makefile.in,v 1.1 2003/08/31 10:42:37 obrien Exp $
2
3	--- intl/Makefile.in.orig Sun Feb 24 13:03:59 2002
4	+++ intl/Makefile.in Sun Aug 31 02:58:10 2003
5	@@ -142,4 +142,5 @@
6	# Define this as empty until I found a useful application.
7	installcheck:
8	+install-shlibs:
9
10	uninstall:





$FreeBSD: ports/sysutils/e2fsprogs/files/patch-lib::Makefile.elf-lib,v 1.1 2001/07/03 18:13:14 sobomax Exp $

--- 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) \

Lines 1-5 Link Here

(-)/root/e2fsprogs/files/patch-lib::ext2fs::Makefile.in (-5 lines)
1	--- lib/ext2fs/Makefile.in.orig Wed Jul 23 06:53:05 2003
2	+++ lib/ext2fs/Makefile.in Thu Aug 28 09:58:57 2003
3	@@ -173 +173 @@
4	-COMPILE_ET=../et/compile_et --build-tree
5	+COMPILE_ET=compile_et





$FreeBSD: ports/sysutils/e2fsprogs/files/patch-lib::ext2fs::flushb.c,v 1.1 2001/07/03 18:13:14 sobomax Exp $

--- 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
 

Lines 1-7 Link Here

(-)/root/e2fsprogs/files/patch-pass1.c (-7 lines)
1	$FreeBSD: ports/sysutils/e2fsprogs/files/patch-pass1.c,v 1.1 2003/08/31 10:42:37 obrien Exp $
2
3	--- e2fsck/pass1.c.orig Wed Aug 27 19:59:14 2003
4	+++ e2fsck/pass1.c Wed Aug 27 19:59:19 2003
5	@@ -165 +165 @@
6	-static int strnlen(const char * s, int count)
7	+int strnlen(const char * s, int count)

Lines 1-3 Link Here

(-)/root/e2fsprogs/pkg-descr (-1 / +1 lines)
1	Set of utilities and library to manipulate an ext2 filesystem.	1	Set of utilities and library to manipulate an ext2 or ext3 filesystem.
2		2
3	WWW: http://e2fsprogs.sourceforge.net/	3	WWW: http://e2fsprogs.sourceforge.net/

Lines 20-50 Link Here

(-)/root/e2fsprogs/pkg-plist (-1 / +28 lines)
20	include/ext2fs/kernel-list.h	20	include/ext2fs/kernel-list.h
21	include/uuid/uuid.h	21	include/uuid/uuid.h
22	include/uuid/uuidP.h	22	include/uuid/uuidP.h
		23	include/uuid/uuid_types.h
23	info/libext2fs.info.gz	24	info/libext2fs.info.gz
		25	lib/libblkid.so.1.0
		26	lib/libblkid.so.1
		27	lib/libblkid.so
		28	lib/libcom_err.so.2.1
		29	lib/libcom_err.so.2
		30	lib/libcom_err.so
24	lib/libe2p.a	31	lib/libe2p.a
25	lib/libe2p.so	32	lib/libe2p.so
26	lib/libe2p.so.2	33	lib/libe2p.so.2
		34	lib/libe2p.so.2.3
27	lib/libext2fs.a	35	lib/libext2fs.a
28	lib/libext2fs.so	36	lib/libext2fs.so
29	lib/libext2fs.so.2	37	lib/libext2fs.so.2
		38	lib/libext2fs.so.2.4
30	lib/libuuid.a	39	lib/libuuid.a
31	lib/libuuid.so	40	lib/libuuid.so
32	lib/libuuid.so.1	41	lib/libuuid.so.1
		42	lib/libuuid.so.1.2
		43	lib/libss.so.2.0
		44	lib/libss.so.2
		45	lib/libss.so
33	sbin/badblocks	46	sbin/badblocks
		47	sbin/blkid
34	sbin/debugfs	48	sbin/debugfs
35	sbin/dumpe2fs	49	sbin/dumpe2fs
36	sbin/e2fsck	50	sbin/e2fsck
		51	sbin/e2fsck.static
37	sbin/e2image	52	sbin/e2image
38	sbin/e2label	53	sbin/e2label
39	sbin/findfs	54	sbin/findfs
40	sbin/fsck
41	sbin/fsck.ext2	55	sbin/fsck.ext2
42	sbin/fsck.ext3	56	sbin/fsck.ext3
		57	sbin/fsck_ext2fs
		58	sbin/logsave
43	sbin/mke2fs	59	sbin/mke2fs
44	sbin/mkfs.ext2	60	sbin/mkfs.ext2
45	sbin/mkfs.ext3	61	sbin/mkfs.ext3
46	sbin/mklost+found	62	sbin/mklost+found
47	sbin/resize2fs	63	sbin/resize2fs
48	sbin/tune2fs	64	sbin/tune2fs
		65	%%NLS%%share/locale/cs/LC_MESSAGES/e2fsprogs.mo
		66	%%NLS%%share/locale/de/LC_MESSAGES/e2fsprogs.mo
		67	%%NLS%%share/locale/es/LC_MESSAGES/e2fsprogs.mo
		68	%%NLS%%share/locale/it/LC_MESSAGES/e2fsprogs.mo
		69	%%NLS%%share/locale/pl/LC_MESSAGES/e2fsprogs.mo
		70	%%NLS%%share/locale/sv/LC_MESSAGES/e2fsprogs.mo
		71	%%NLS%%share/locale/tr/LC_MESSAGES/e2fsprogs.mo
		72	%%NLS%%@unexec for i in cs de es it pl sv tr ; do rmdir -p %D/share/locale/$i/LC_MESSAGES 2>/dev/null \|\| true ; done
49	@dirrm include/uuid	73	@dirrm include/uuid
50	@dirrm include/ext2fs	74	@dirrm include/ext2fs
		75	@exec ln %D/sbin/fsck_ext2fs /sbin/ 2>/dev/null \|\| cp -n -p %D/sbin/fsck_ext2fs /sbin/
		76	@exec ln %D/sbin/e2fsck.static /sbin/e2fsck 2>/dev/null \|\| cp -n -p %D/sbin/e2fsck.static /sbin/e2fsck
		77	@unexec rm -f /sbin/fsck_ext2fs /sbin/e2fsck

Return to bug 62563

Lines 6-46 Link Here

(-)/root/e2fsprogs/Makefile (-21 / +63 lines)
6	#	6	#
7		7
8	PORTNAME= e2fsprogs	8	PORTNAME= e2fsprogs
9	PORTVERSION= 1.32	9	PORTVERSION= 1.35.w20040131
10	PORTREVISION= 1	10	PORTREVISION= 0
11	CATEGORIES= sysutils	11	CATEGORIES= sysutils
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
		14	DISTNAME= ${PORTNAME}-1.35-WIP-0131
14		15
15	MAINTAINER= ports@FreeBSD.org	16	MAINTAINER= matthias.andree@gmx.de
16	COMMENT= A set of utilities and library to manipulate an ext2 filesystem	17	COMMENT= Utilities and library to manipulate an ext2 or ext3 filesystem
17		18
		19	.if !defined(DISABLE_NLS)
		20	USE_GETTEXT= yes
		21	.endif
		22
		23	WRKSRC= ${WRKDIR}/${PORTNAME}-1.35
		24
		25	PATCH_STRIP= -p1
18	USE_REINPLACE= yes	26	USE_REINPLACE= yes
19	USE_GMAKE= yes	27	USE_GMAKE= yes
20	INSTALLS_SHLIB= yes	28	INSTALLS_SHLIB= yes
		29	NO_FILTER_SHLIBS= yes
21	GNU_CONFIGURE= yes	30	GNU_CONFIGURE= yes
22	CONFIGURE_ARGS= --enable-elf-shlibs	31	CONFIGURE_ARGS= --enable-elf-shlibs --disable-fsck "--with-ldopts=-L${LOCALBASE}/lib"
23	CONFIGURE_ENV= CPPFLAGS="-Derrcode_t=long"	32	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include"
		33	.if defined(DISABLE_NLS)
		34	CONFIGURE_ARGS+= --disable-nls
		35	PLIST_SUB= NLS="@comment "
		36	.else
		37	MAKE_ARGS+= STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a ../lib/libblkid.a ../lib/libuuid.a ${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a"
		38	PLIST_SUB= NLS=""
		39	.endif
24		40
25	MAN1= chattr.1 lsattr.1 uuidgen.1	41	MAN1= chattr.1 lsattr.1 uuidgen.1
26	MAN8= badblocks.8 debugfs.8 dumpe2fs.8 e2fsck.8 e2image.8 e2label.8 fsck.8 \	42	MAN8= badblocks.8 debugfs.8 dumpe2fs.8 e2fsck.8 e2image.8 e2label.8 \
27	findfs.8 mke2fs.8 mklost+found.8 resize2fs.8 tune2fs.8 \	43	mke2fs.8 mklost+found.8 resize2fs.8 tune2fs.8 \
28	fsck.ext2.8 fsck.ext3.8 mkfs.ext2.8 mkfs.ext3.8	44	fsck.ext2.8 fsck.ext3.8 mkfs.ext2.8 mkfs.ext3.8 \
		45	findfs.8 blkid.8 logsave.8
		46
		47	pre-everything::
		48	@${ECHO_CMD} "-------------------------------------------------------------"
		49	.if defined(DISABLE_NLS)
		50	@${ECHO_CMD} "National language support disabled, -DDISABLE_NLS in effect. "
		51	.else
		52	@${ECHO_CMD} "Use -DDISABLE_NLS to build without national language support."
		53	.endif
		54	@${ECHO_CMD} "-------------------------------------------------------------"
29		55
30	post-patch:	56	post-patch:
31	@${FIND} ${WRKSRC} -name "*.[ch]" \| ${XARGS} ${CHMOD} 644	57	${REINPLACE_CMD} -e 's\|-DRESOURCE_TRACK\|\|' ${WRKSRC}/e2fsck/Makefile.in
32	@${FIND} ${WRKSRC} -name "*.[ch]" \| ${XARGS} ${REINPLACE_CMD} -e \	58	${GUNZIP_CMD} ${WRKSRC}/tests/m_/expect.gz
33	's\|LIST_HEAD\|LIN_LST_HEAD\|g ; \	59	${REINPLACE_CMD} -e 's\|OS type: Linux\|OS type: (unknown os)\|' \
34	s\|et/com_err.h\|com_err.h\|g ; s\|<malloc.h>\|<stdlib.h>\|'	60	-e 's\|Filesystem OS type: Linux\|Filesystem OS type: unknown\|' \
35		61	-e 's\|group root\|group wheel\|' \
36	pre-build:	62	-e '/Exit status is 0/ N;s/Exit status is 0\n/Exit status is 0/' \
37	@cd ${WRKSRC}/lib/et && ${GMAKE}	63	${WRKSRC}/tests/m_*/expect.1
38	@cd ${WRKSRC}/lib/ss && ${GMAKE}	64
		65	post-extract:
		66	${CHMOD} u+w ${WRKSRC}/po/.po ${WRKSRC}/po/.pot
		67
		68	post-build:
		69	cd ${WRKSRC}/tests && ${GMAKE} check
		70	${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} ${LIBS} -o ${WRKSRC}/fsck_ext2fs ${FILESDIR}/fsck_ext2fs.c
39		71
40	post-install:	72	post-install:
41	@${MKDIR} ${PREFIX}/include/ext2fs	73	${RM} ${PREFIX}/sbin/filefrag
42	@${INSTALL_DATA} ${WRKSRC}/lib/ext2fs/*.h ${PREFIX}/include/ext2fs	74	${RM} ${PREFIX}/man/man8/filefrag.8
43	@${MKDIR} ${PREFIX}/include/uuid	75	${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs ${PREFIX}/sbin/
44	@${INSTALL_DATA} ${WRKSRC}/lib/uuid/*.h ${PREFIX}/include/uuid	76	${INSTALL_PROGRAM} ${WRKSRC}/e2fsck/e2fsck.shared ${PREFIX}/sbin/e2fsck
		77	${INSTALL_PROGRAM} ${WRKSRC}/e2fsck/e2fsck.static ${PREFIX}/sbin/e2fsck.static
		78	${LN} 2>/dev/null ${PREFIX}/sbin/e2fsck.static /sbin/e2fsck \|\| ${CP} -n -p ${PREFIX}/sbin/e2fsck.static /sbin/e2fsck
		79	${LN} 2>/dev/null ${PREFIX}/sbin/fsck_ext2fs /sbin/ \|\| ${CP} -n -p ${PREFIX}/sbin/fsck_ext2fs /sbin/
		80	${MKDIR} ${PREFIX}/include/ext2fs
		81	${INSTALL_DATA} ${WRKSRC}/lib/ext2fs/*.h ${PREFIX}/include/ext2fs/
		82	${MKDIR} ${PREFIX}/include/uuid
		83	${INSTALL_DATA} ${WRKSRC}/lib/uuid/*.h ${PREFIX}/include/uuid/
		84	.for i in e2p ext2fs uuid
		85	${INSTALL_DATA} ${WRKSRC}/lib/${i}/lib${i}.a ${PREFIX}/lib/
		86	.endfor
45		87
46	.include <bsd.port.mk>	88	.include <bsd.port.mk>

Line 0 Link Here

(-)/root/e2fsprogs/files/fsck_ext2fs.c (+79 lines)
		1	/*
		2	* fsck_ext2fs - wrapper for e2fsck on FreeBSD
		3	* Copyright (C) 2004 Matthias Andree
		4	* redistributable in accordance with the
		5	* GNU General Public License v2
		6	*
		7	* format: gindent -kr
		8	*/
		9
		10	#include <unistd.h>
		11	#include <stdlib.h>
		12	#include <stdio.h>
		13	#include <string.h>
		14
		15	int
		16	main(int argc, char **argv)
		17	{
		18	int ch, i = 1, force = 0;
		19	long block = 0;
		20	enum { normal, preen, yes, no } mode = normal;
		21	char *cmd[256];
		22
		23	cmd[0] = "/sbin/e2fsck";
		24	while ((ch = getopt(argc, argv, "BFpfnyb:")) != -1) {
		25	switch (ch) {
		26	case 'p':
		27	mode = preen;
		28	break;
		29	case 'f':
		30	force = 1;
		31	break;
		32	case 'n':
		33	mode = no;
		34	break;
		35	case 'y':
		36	mode = yes;
		37	break;
		38	case 'b':
		39	block = atol(optarg);
		40	break;
		41	case 'B':
		42	case 'F':
		43	default:
		44	exit(EXIT_FAILURE);
		45	}
		46	}
		47
		48	if (force)
		49	cmd[i++] = "-f";
		50
		51	switch (mode) {
		52	case normal:
		53	break;
		54	case yes:
		55	cmd[i++] = "-y";
		56	break;
		57	case no:
		58	cmd[i++] = "-n";
		59	break;
		60	case preen:
		61	cmd[i++] = "-p";
		62	break;
		63	}
		64
65	if (block) {
66	static char b[30];
67
68	sprintf(b, "-b %ld", block);
69	cmd[i++] = b;
70	}
71
72	while (optind < argc)
73	cmd[i++] = argv[optind++];
74
75	cmd[i++] = 0;
76
77	(void)execv(cmd[0], cmd);
78	exit(EXIT_FAILURE);
79	}

Lines 1-12 Link Here

(-)/root/e2fsprogs/files/patch-MCONFIG.in (-12 lines)
1	$FreeBSD: ports/sysutils/e2fsprogs/files/patch-MCONFIG.in,v 1.3 2003/08/31 10:42:37 obrien Exp $
2
3	--- MCONFIG.in.orig Thu Oct 31 00:49:21 2002
4	+++ MCONFIG.in Wed Aug 27 20:00:17 2003
5	@@ -64 +64 @@
6	-LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@
7	+LIBCOM_ERR = /usr/lib/libcom_err.so
8	@@ -70,2 +70,2 @@
9	-STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@
10	-STATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@
11	+STATIC_LIBSS = STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@
12	+STATIC_LIBCOM_ERR = /usr/lib/libcom_err.a

Lines 1-17 Link Here

(-)/root/e2fsprogs/files/patch-debugfs::Makefile.in (-17 lines)
1
2	$FreeBSD: ports/sysutils/e2fsprogs/files/patch-debugfs::Makefile.in,v 1.2 2002/08/04 07:27:59 clive Exp $
3
4	--- debugfs/Makefile.in.orig Sat Jun 23 07:25:59 2001
5	+++ debugfs/Makefile.in Tue Jul 3 18:49:18 2001
6	@@ -75,9 +75,9 @@
7	# the Makefile.in file
8	#
9	debug_cmds.o: debug_cmds.c $(top_srcdir)/lib/ss/ss.h \
10	- $(top_builddir)/lib/ss/ss_err.h
11	+
12	debugfs.o: $(srcdir)/debugfs.c $(top_srcdir)/lib/et/com_err.h \
13	- $(top_srcdir)/lib/ss/ss.h $(top_builddir)/lib/ss/ss_err.h \
14	+ $(top_srcdir)/lib/ss/ss.h \
15	$(srcdir)/debugfs.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
16	$(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
17	$(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \

Lines 1-14 Link Here

(-)/root/e2fsprogs/files/patch-e2fsck::journal.c (-14 lines)
1
2	$FreeBSD: ports/sysutils/e2fsprogs/files/patch-e2fsck::journal.c,v 1.1 2001/07/03 18:13:14 sobomax Exp $
3
4	--- e2fsck/journal.c 2001/07/03 14:35:01 1.1
5	+++ e2fsck/journal.c 2001/07/03 14:35:13
6	@@ -13,6 +13,8 @@
7	*/
8
9	#ifdef HAVE_SYS_MOUNT_H
10	+#include <sys/param.h>
11	+#include <sys/types.h>
12	#include <sys/mount.h>
13	#define MNT_FL (MS_MGC_VAL \| MS_RDONLY)
14	#endif

Line 0 Link Here

(-)/root/e2fsprogs/files/patch-ext2fs_e2fsck.c (+28 lines)
	1	# This is a BitKeeper generated diff -Nru style patch.
	2	#
	3	# ChangeSet
	4	# 2004/02/03 03:22:19+01:00 matthias.andree@gmx.de
	5	# e2fsck.c:
	6	# Add missing ctx->flags &= ~E2F_FLAG_SETJMP_OK; when
	7	# returning after setjmp returned true (i. e. from longjmp).
	8	#
	9	# e2fsck/e2fsck.c
	10	# 2004/02/03 03:16:40+01:00 matthias.andree@gmx.de +3 -1
	11	# Add missing ctx->flags &= ~E2F_FLAG_SETJMP_OK; when
	12	# returning after setjmp returned true (i. e. from longjmp).
	13	#
	14	diff -Nru a/e2fsck/e2fsck.c b/e2fsck/e2fsck.c
	15	--- a/e2fsck/e2fsck.c Tue Feb 3 03:23:50 2004
	16	+++ b/e2fsck/e2fsck.c Tue Feb 3 03:23:50 2004
	17	@@ -180,8 +180,10 @@
	18	pass_t e2fsck_pass;
	19
	20	#ifdef HAVE_SETJMP_H
	21	- if (setjmp(ctx->abort_loc))
	22	+ if (setjmp(ctx->abort_loc)) {
	23	+ ctx->flags &= ~E2F_FLAG_SETJMP_OK;
	24	return (ctx->flags & E2F_FLAG_RUN_RETURN);
	25	+ }
	26	ctx->flags \|= E2F_FLAG_SETJMP_OK;
	27	#endif
	28

Lines 1-22 Link Here

(-)/root/e2fsprogs/files/patch-lib::Makefile.elf-lib (-22 lines)
1
2	$FreeBSD: ports/sysutils/e2fsprogs/files/patch-lib::Makefile.elf-lib,v 1.1 2001/07/03 18:13:14 sobomax Exp $
3
4	--- lib/Makefile.elf-lib.orig Sat Jun 23 07:25:59 2001
5	+++ lib/Makefile.elf-lib Tue Jul 3 18:57:04 2001
6	@@ -39,13 +39,12 @@
7	installdirs:: installdirs-elf-lib
8
9	install-shlibs install:: $(ELF_LIB) installdirs-elf-lib
10	- $(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
11	+ $(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
12	+ $(INSTALL_DATA) $(ELF_IMAGE).a $(DESTDIR)$(ELF_INSTALL_DIR)/
13	$(STRIP) --strip-debug \
14	- $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
15	- $(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
16	+ $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
17	$(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
18	$(DESTDIR)$(libdir)/$(ELF_IMAGE).so
19	- -$(LDCONFIG)
20
21	uninstall-shlibs uninstall::
22	$(RM) -f $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) \

Lines 1-13 Link Here

(-)/root/e2fsprogs/files/patch-lib::ext2fs::flushb.c (-13 lines)
1
2	$FreeBSD: ports/sysutils/e2fsprogs/files/patch-lib::ext2fs::flushb.c,v 1.1 2001/07/03 18:13:14 sobomax Exp $
3
4	--- lib/ext2fs/flushb.c 2001/07/03 14:28:59 1.1
5	+++ lib/ext2fs/flushb.c 2001/07/03 14:30:57
6	@@ -21,6 +21,7 @@
7	#include <sys/ioctl.h>
8	#endif
9	#if HAVE_SYS_MOUNT_H
10	+#include <sys/param.h>
11	#include <sys/mount.h> /* This may define BLKFLSBUF */
12	#endif
13