cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to e2fsprogs-1.41.4 (supporting ext2/ext3/ext4 fs) :

Browse Source 
- Remove MAINTAINERS as they agree not having time nor interest for it.
- Use install-libs target instead of manually installing some cherrypicked
headers - now all needed headers are installed in the right place.
- Install fsck and its manpage as fsck_ext2fs instead of the confusing pfsck.
- Install uuid.pc as e2fs-uuid.pc to avoid conflicts with devel/uuid.
- Patch most Makefiles to print full build commands instead of the
non-informative linux-kernel-like output.
- Patch some regress tests, more and more works fine now.

With feedback and tweaks from naddy@ and pea@
This commit is contained in:
landry 2009-03-15 19:59:31 +00:00
parent 9debc5067c
commit e1da3db508
27 changed files with 1876 additions and 370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
sysutils/e2fsprogs/Makefile
View File

@ -1,61 +1,59 @@
# $OpenBSD: Makefile,v 1.11 2008/11/22 11:06:15 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.12 2009/03/15 19:59:31 landry Exp $
# $FreeBSD: ports/sysutils/e2fsprogs/Makefile,v 1.8 2003/02/20 19:00:47 knu Exp $
COMMENT-main= utilities to manipulate ext2 filesystems
COMMENT-uuid= unique id generator library
V= 1.27
V= 1.41.4
DISTNAME= e2fsprogs-${V}
PKGNAME-main= ${DISTNAME}p6
PKGNAME-uuid= e2fs-uuid-${V}p0
PKGNAME-main= ${DISTNAME}
PKGNAME-uuid= e2fs-uuid-${V}
CATEGORIES-uuid= devel
CATEGORIES= sysutils
SHARED_LIBS= e2p 2.3 \
ext2fs 2.4 \
ext2fs_com_err 2.0 \
ss 2.0 \
uuid 1.2
SHARED_LIBS= blkid 0.0 \
e2p 3.0 \
ext2fs 3.0 \
ext2fs_com_err 3.0 \
ss 3.0 \
uuid 2.0
HOMEPAGE= http://e2fsprogs.sourceforge.net/
MAINTAINER= Laurent Corbes <caf@glot.net> \
Sebastien Bombal <acide@bombal.org>
MULTI_PACKAGES= -main -uuid
# GPL
# GPLv2/LGPLv2/BSD/MIT
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c
WANTLIB= c iconv intl
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
MODULES= devel/gettext
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-elf-shlibs
CONFIGURE_ARGS+= --enable-elf-shlibs --disable-tls
USE_GMAKE= Yes
MAKE_FLAGS= LIBe2p_VERSION=${LIBe2p_VERSION} \
MAKE_FLAGS= LIBblkid_VERSION=${LIBblkid_VERSION} \
LIBe2p_VERSION=${LIBe2p_VERSION} \
LIBext2fs_VERSION=${LIBext2fs_VERSION} \
LIBext2fs_com_err_VERSION=${LIBext2fs_com_err_VERSION} \
LIBss_VERSION=${LIBss_VERSION} \
LIBuuid_VERSION=${LIBuuid_VERSION}
LIB_DEPENDS-main= lib/uuid/uuid::${BUILD_PKGPATH},-uuid
INSTALL_TARGET= install install-libs
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/include/ext2fs
${INSTALL_DATA_DIR} ${PREFIX}/include/uuid
${INSTALL_DATA} ${WRKSRC}/lib/ext2fs/*.h ${PREFIX}/include/ext2fs
${INSTALL_DATA} ${WRKSRC}/lib/uuid/*.h ${PREFIX}/include/uuid
@cd ${PREFIX}/sbin && mv fsck pfsck
@cd ${PREFIX}/man/man8 && mv fsck.8 pfsck.8
@${INSTALL_DATA_DIR} ${PREFIX}/lib/uuid
@mv ${PREFIX}/lib/libuuid.* ${PREFIX}/lib/uuid
cd ${PREFIX}/sbin && mv fsck fsck_ext2fs
cd ${PREFIX}/man/man8 && mv fsck.8 fsck_ext2fs.8
${INSTALL_DATA_DIR} ${PREFIX}/lib/uuid
mv ${PREFIX}/lib/libuuid.* ${PREFIX}/lib/uuid
mv ${PREFIX}/lib/pkgconfig/uuid.pc ${PREFIX}/lib/pkgconfig/e2fs-uuid.pc
if [ -f ${PREFIX}/lib/uuid/libuuid.so.${LIBuuid_VERSION} ]; then \
ln -s uuid/libuuid.so.${LIBuuid_VERSION} ${PREFIX}/lib; \
fi
.include <bsd.port.mk>

10
sysutils/e2fsprogs/distinfo
View File

@ -1,5 +1,5 @@
MD5 (e2fsprogs-1.27.tar.gz) = SFtDh1vsyY3RGsTCow3XNA==
RMD160 (e2fsprogs-1.27.tar.gz) = Hxrda2MX5odDGhtTgk8hiAK51yY=
SHA1 (e2fsprogs-1.27.tar.gz) = ZgAYtKt75vVVc4qY7nFgXR+msl0=
SHA256 (e2fsprogs-1.27.tar.gz) = WvB1WACn6SJGNRY2e6ga93c0kV07USOPSqLClIGKLjg=
SIZE (e2fsprogs-1.27.tar.gz) = 1376698
MD5 (e2fsprogs-1.41.4.tar.gz) = WQMziN82mH0rnJu/fhm9Vw==
RMD160 (e2fsprogs-1.41.4.tar.gz) = 2h938KQaAEe4a/VAv7SEYi79ef0=
SHA1 (e2fsprogs-1.41.4.tar.gz) = VdoUW857Akq2CapKb8i+gaK7NJA=
SHA256 (e2fsprogs-1.41.4.tar.gz) = LMEP7isprdc35FTrY0UTE1s0pjj3yisYNkhk/giQINw=
SIZE (e2fsprogs-1.41.4.tar.gz) = 4389512

47
sysutils/e2fsprogs/patches/patch-MCONFIG_in
View File

@ -1,48 +1,47 @@
$OpenBSD: patch-MCONFIG_in,v 1.1.1.1 2004/02/20 19:54:58 espie Exp $
--- MCONFIG.in.orig 2002-02-24 22:03:57.000000000 +0100
+++ MCONFIG.in 2003-11-24 11:59:04.000000000 +0100
@@ -56,25 +56,37 @@ LDCONFIG = @LDCONFIG@
$OpenBSD: patch-MCONFIG_in,v 1.2 2009/03/15 19:59:31 landry Exp $
--- MCONFIG.in.orig Sat Nov 15 18:17:22 2008
+++ MCONFIG.in Sat Feb 21 17:00:02 2009
@@ -70,29 +70,35 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
# Library definitions
#
LIB = $(top_builddir)/lib
-LIBSS = $(LIB)/libss@LIB_EXT@
-LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@
-LIBSS = $(LIB)/libss@LIB_EXT@ @PRIVATE_LIBS_CMT@ @DLOPEN_LIB@
-LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ @PRIVATE_LIBS_CMT@ @SEM_INIT_LIB@
-LIBE2P = $(LIB)/libe2p@LIB_EXT@
-LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@
-LIBUUID = $(LIB)/libuuid@LIB_EXT@ @SOCKET_LIB@
-LIBUUID = $(LIB)/libuuid@LIB_EXT@ @SOCKET_LIB@
-LIBBLKID = $(LIB)/libblkid@LIB_EXT@ @PRIVATE_LIBS_CMT@ $(LIBUUID)
+LIBSS = -L$(LIB) -lss
+LIBCOM_ERR = -L$(LIB) -lext2fs_com_err
+LIBE2P = -L$(LIB) -le2p
+LIBEXT2FS = -L$(LIB) -lext2fs
+LIBUUID = -L$(LIB) -luuid @SOCKET_LIB@
+DEPLIBEXT2FS= $(LIB)/libext2fs@LIB_EXT@
+LIBUUID = -L$(LIB) -luuid @SOCKET_LIB@
+LIBBLKID = -L$(LIB) -lblkid $(LIBUUID)
LIBINTL = @LIBINTL@
DEPLIBSS = $(LIB)/libss@LIB_EXT@
+DEPLIBE2P= $(LIB)/libe2p@LIB_EXT@
+DEPLIBEXT2FS= $(LIB)/libext2fs@LIB_EXT@
+DEPLIBCOM_ERR= $(LIB)/libext2fs_com_err@LIB_EXT@
+DEPLIBSS= $(LIB)/libss@LIB_EXT@
DEPLIBUUID = $(LIB)/libuuid@LIB_EXT@
DEPLIBBLKID = $(LIB)/libblkid@LIB_EXT@ @PRIVATE_LIBS_CMT@ $(LIBUUID)
STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@
-STATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@
+STATIC_LIBCOM_ERR = $(LIB)/libext2fs_com_err@STATIC_LIB_EXT@
STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@ @DLOPEN_LIB@
-STATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@ @SEM_INIT_LIB@
+STATIC_LIBCOM_ERR = $(LIB)/libext2fs_com_err@STATIC_LIB_EXT@ @SEM_INIT_LIB@
STATIC_LIBE2P = $(LIB)/libe2p@STATIC_LIB_EXT@
STATIC_LIBEXT2FS = $(LIB)/libext2fs@STATIC_LIB_EXT@
STATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@ @SOCKET_LIB@
STATIC_LIBBLKID = $(LIB)/libblkid@STATIC_LIB_EXT@ $(STATIC_LIBUUID)
+DEPSTATIC_LIBEXT2FS= $(LIB)/libext2fs@STATIC_LIB_EXT@
+DEPSTATIC_LIBE2P= $(LIB)/libe2p@STATIC_LIB_EXT@
+DEPSTATIC_LIBCOM_ERR= $(LIB)/libext2fs_com_err@STATIC_LIB_EXT@
+DEPSTATIC_LIBSS= $(LIB)/libss@STATIC_LIB_EXT@
DEPSTATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@
DEPSTATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@
DEPSTATIC_LIBBLKID = $(LIB)/libblkid@STATIC_LIB_EXT@
PROFILED_LIBSS = $(LIB)/libss@PROFILED_LIB_EXT@
-PROFILED_LIBCOM_ERR = $(LIB)/libcom_err@PROFILED_LIB_EXT@
+PROFILED_LIBCOM_ERR = $(LIB)/libext2fs_com_err@PROFILED_LIB_EXT@
PROFILED_LIBSS = $(LIB)/libss@PROFILED_LIB_EXT@ @DLOPEN_LIB@
-PROFILED_LIBCOM_ERR = $(LIB)/libcom_err@PROFILED_LIB_EXT@ @SEM_INIT_LIB@
+PROFILED_LIBCOM_ERR = $(LIB)/libext2fs_com_err@PROFILED_LIB_EXT@ @SEM_INIT_LIB@
PROFILED_LIBE2P = $(LIB)/libe2p@PROFILED_LIB_EXT@
PROFILED_LIBEXT2FS = $(LIB)/libext2fs@PROFILED_LIB_EXT@
PROFILED_LIBUUID = $(LIB)/libuuid@PROFILED_LIB_EXT@ @SOCKET_LIB@
+DEPPROFILED_LIBEXT2FS= $(LIB)/libext2fs@PROFILED_LIB_EXT@
+DEPPROFILED_LIBE2P= $(LIB)/libe2p@PROFILED_LIB_EXT@
+DEPPROFILED_LIBCOM_ERR= $(LIB)/libext2fs_com_err@PROFILED_LIB_EXT@
+DEPPROFILED_LIBSS= $(LIB)/libss@PROFILED_LIB_EXT@
DEPPROFILED_LIBUUID = $(LIB)/libuuid@PROFILED_LIB_EXT@
#

21
sysutils/e2fsprogs/patches/patch-configure Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-configure,v 1.1 2009/03/15 19:59:31 landry Exp $
--- configure.orig Wed Mar 11 18:05:17 2009
+++ configure Wed Mar 11 18:06:11 2009
@@ -16312,7 +16312,7 @@ HAVE_POSIX_PRINTF!$HAVE_POSIX_PRINTF$ac_delim
HAVE_ASPRINTF!$HAVE_ASPRINTF$ac_delim
HAVE_SNPRINTF!$HAVE_SNPRINTF$ac_delim
HAVE_WPRINTF!$HAVE_WPRINTF$ac_delim
-LIBICONV!$LIBICONV$ac_delim
+LIBICONV!$LTLIBICONV$ac_delim
LTLIBICONV!$LTLIBICONV$ac_delim
INTLBISON!$INTLBISON$ac_delim
BUILD_INCLUDED_LIBINTL!$BUILD_INCLUDED_LIBINTL$ac_delim
@@ -16324,7 +16324,7 @@ GENCAT!$GENCAT$ac_delim
INTLOBJS!$INTLOBJS$ac_delim
INTL_LIBTOOL_SUFFIX_PREFIX!$INTL_LIBTOOL_SUFFIX_PREFIX$ac_delim
INTLLIBS!$INTLLIBS$ac_delim
-LIBINTL!$LIBINTL$ac_delim
+LIBINTL!$LTLIBINTL$ac_delim
LTLIBINTL!$LTLIBINTL$ac_delim
POSUB!$POSUB$ac_delim
BINARY_TYPE!$BINARY_TYPE$ac_delim

68
sysutils/e2fsprogs/patches/patch-debugfs_Makefile_in
View File

@ -1,20 +1,60 @@
$OpenBSD: patch-debugfs_Makefile_in,v 1.3 2008/11/22 11:06:15 ajacoutot Exp $
--- debugfs/Makefile.in.orig Tue Mar 5 09:31:15 2002
+++ debugfs/Makefile.in Sat Nov 22 11:56:10 2008
@@ -25,7 +25,7 @@ SRCS= debug_cmds.c $(srcdir)/debugfs.c $(srcdir)/util.
$(srcdir)/htree.c
$OpenBSD: patch-debugfs_Makefile_in,v 1.4 2009/03/15 19:59:31 landry Exp $
--- debugfs/Makefile.in.orig Wed Jun 18 05:53:42 2008
+++ debugfs/Makefile.in Sun Feb 22 11:52:07 2009
@@ -26,47 +26,39 @@ SRCS= debug_cmds.c $(srcdir)/debugfs.c $(srcdir)/util.
LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(LIBUUID)
-DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(DEPLIBUUID)
+DEPLIBS= $(DEPLIBEXT2FS) $(DEPLIBE2P) $(DEPLIBSS) $(DEPLIBCOM_ERR) $(DEPLIBUUID)
LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(LIBBLKID) \
$(LIBUUID)
-DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(DEPLIBSS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID)
+DEPLIBS= $(DEPLIBEXT2FS) $(DEPLIBE2P) $(DEPLIBSS) $(DEPLIBCOM_ERR) $(DEPDEPLIBBLKID) $(DEPLIBUUID)
.c.o:
$(CC) -c $(ALL_CFLAGS) $< -o $@
@@ -48,7 +48,6 @@ installdirs:
- @echo " CC $<"
- @$(CC) -c $(ALL_CFLAGS) $< -o $@
+ $(CC) -c $(ALL_CFLAGS) $< -o $@
all:: $(PROGS) $(MANPAGES)
debugfs: $(DEBUG_OBJS) $(DEPLIBS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o debugfs $(DEBUG_OBJS) $(LIBS)
+ $(CC) $(ALL_LDFLAGS) -o debugfs $(DEBUG_OBJS) $(LIBS)
debug_cmds.c debug_cmds.h: debug_cmds.ct
- @echo " MK_CMDS $@"
- @$(MK_CMDS) $(srcdir)/debug_cmds.ct
+ $(MK_CMDS) $(srcdir)/debug_cmds.ct
debugfs.8: $(DEP_SUBSTITUTE) $(srcdir)/debugfs.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8
+ $(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8
installdirs:
- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
+ $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
$(DESTDIR)$(man8dir)
install: $(PROGS) $(MANPAGES) installdirs
for i in $(PROGS); do \
- @for i in $(PROGS); do \
- echo " INSTALL $(root_sbindir)/$$i"; \
+ for i in $(PROGS); do \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
- $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
done
for i in $(MANPAGES); do \
$(RM) -f $(DESTDIR)$(man8dir)/$$i.gz; \
- @for i in $(MANPAGES); do \
+ for i in $(MANPAGES); do \
for j in $(COMPRESS_EXT); do \
$(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
done; \
- echo " INSTALL_DATA $(man8dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
done
install-strip: install
- @for i in $(PROGS); do \
- echo " STRIP $(root_sbindir)/$$i"; \
+ for i in $(PROGS); do \
$(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
done

41
sysutils/e2fsprogs/patches/patch-doc_Makefile_in
View File

@ -1,11 +1,40 @@
$OpenBSD: patch-doc_Makefile_in,v 1.1.1.1 2004/02/20 19:54:58 espie Exp $
--- doc/Makefile.in.orig 2003-11-17 00:40:41.000000000 +0100
+++ doc/Makefile.in 2003-11-17 00:40:53.000000000 +0100
@@ -24,7 +24,6 @@ install-doc-libs:
for i in libext2fs.info* ; do \
$OpenBSD: patch-doc_Makefile_in,v 1.2 2009/03/15 19:59:31 landry Exp $
--- doc/Makefile.in.orig Mon May 26 01:52:27 2008
+++ doc/Makefile.in Sun Feb 22 12:08:54 2009
@@ -16,29 +16,23 @@ DVIPS=dvips -o "$@"
INFO=@MAKEINFO@
HTML=texi2html
-all:: libext2fs.info libext2fs.dvi
+all:: libext2fs.info
-install-doc-libs: libext2fs.info libext2fs.dvi
- @$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
- @echo " MKINSTALLDIRS $(infodir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(infodir)
- -@for i in libext2fs.info* ; do \
- echo " INSTALL_DATA $(infodir)/$$i" ; \
+install-doc-libs: libext2fs.info
+ $(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
+ $(MKINSTALLDIRS) $(DESTDIR)$(infodir)
+ for i in libext2fs.info* ; do \
$(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
done
- gzip -9 $(DESTDIR)$(infodir)/libext2fs.info*
- @echo " GZIP $(infodir)/libext2fs.info*"
- -@gzip -9 $(DESTDIR)$(infodir)/libext2fs.info*
uninstall-doc-libs:
$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
libext2fs.info: $(srcdir)/libext2fs.texinfo
- @echo " MAKEINFO $@"
- -@$(INFO) $(srcdir)/libext2fs.texinfo
+ $(INFO) $(srcdir)/libext2fs.texinfo
libext2fs.dvi: $(srcdir)/libext2fs.texinfo
- @echo " TEXI2DVI $@"
- -@$(DVI) $(srcdir)/libext2fs.texinfo
+ $(DVI) $(srcdir)/libext2fs.texinfo
.PHONY: distclean
distclean:: clean

193
sysutils/e2fsprogs/patches/patch-e2fsck_Makefile_in
View File

@ -1,20 +1,183 @@
$OpenBSD: patch-e2fsck_Makefile_in,v 1.2 2006/02/20 16:51:46 aanriot Exp $
--- e2fsck/Makefile.in.orig Sun Feb 24 22:03:58 2002
+++ e2fsck/Makefile.in Sun Feb 19 18:14:04 2006
@@ -17,7 +17,7 @@ MANPAGES= e2fsck.8
XTRA_CFLAGS= -DRESOURCE_TRACK
$OpenBSD: patch-e2fsck_Makefile_in,v 1.3 2009/03/15 19:59:31 landry Exp $
--- e2fsck/Makefile.in.orig Sat Nov 15 05:19:57 2008
+++ e2fsck/Makefile.in Sun Feb 22 12:44:42 2009
@@ -17,7 +17,7 @@ FMANPAGES= e2fsck.conf.5
XTRA_CFLAGS= -DRESOURCE_TRACK -I.
LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBUUID)
-DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(DEPLIBUUID)
+DEPLIBS= $(DEPLIBEXT2FS) $(DEPLIBCOM_ERR) $(DEPDEPLIBUUID)
LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(LIBUUID) $(LIBINTL) $(LIBE2P)
-DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID) $(DEPLIBE2P)
+DEPLIBS= $(DEPLIBEXT2FS) $(DEPLIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID) $(DEPLIBE2P)
STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBUUID)
STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(DEPSTATIC_LIBUUID)
@@ -139,7 +139,6 @@ installdirs:
install: $(PROGS) $(MANPAGES) installdirs
for i in $(PROGS); do \
STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBBLKID) \
$(STATIC_LIBUUID) $(LIBINTL) $(STATIC_LIBE2P)
@@ -32,8 +32,7 @@ PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIB
COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
.c.o:
- @echo " CC $<"
- @$(CC) -c $(ALL_CFLAGS) $< -o $@
+ $(CC) -c $(ALL_CFLAGS) $< -o $@
@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
#
@@ -109,43 +108,35 @@ all:: profiled $(PROGS) e2fsck $(MANPAGES) $(FMANPAGES
@PROFILE_CMT@all:: e2fsck.profiled
prof_err.c prof_err.h: prof_err.et
- @echo " COMPILE_ET prof_err.et"
- @$(COMPILE_ET) $(srcdir)/prof_err.et
+ $(COMPILE_ET) $(srcdir)/prof_err.et
e2fsck: $(OBJS) $(DEPLIBS)
- @echo " LD $@"
- @$(LD) $(ALL_LDFLAGS) -o e2fsck $(OBJS) $(LIBS)
+ $(LD) $(ALL_LDFLAGS) -o e2fsck $(OBJS) $(LIBS)
e2fsck.static: $(OBJS) $(STATIC_DEPLIBS)
- @echo " LD $@"
- @$(LD) $(LDFLAGS_STATIC) -o e2fsck.static $(OBJS) $(STATIC_LIBS)
+ $(LD) $(LDFLAGS_STATIC) -o e2fsck.static $(OBJS) $(STATIC_LIBS)
e2fsck.profiled: $(PROFILED_OBJS) $(PROFILED_DEPLIBS)
- @echo " LD $@"
- @$(LD) $(ALL_LDFLAGS) -g -pg -o e2fsck.profiled $(PROFILED_OBJS) \
+ $(LD) $(ALL_LDFLAGS) -g -pg -o e2fsck.profiled $(PROFILED_OBJS) \
$(PROFILED_LIBS)
gen_crc32table: $(srcdir)/gen_crc32table.c
- @echo " CC $@"
- @$(BUILD_CC) $(BUILD_CFLAGS) -o gen_crc32table \
+ $(BUILD_CC) $(BUILD_CFLAGS) -o gen_crc32table \
$(srcdir)/gen_crc32table.c
crc32table.h: gen_crc32table
- @echo " GEN32TABLE $@"
- @./gen_crc32table > crc32table.h
+ ./gen_crc32table > crc32table.h
-tst_crc32: $(srcdir)/crc32.c $(LIBEXT2FS)
- @$(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) -o tst_crc32 $(srcdir)/crc32.c \
+tst_crc32: $(srcdir)/crc32.c $(DEPLIBEXT2FS)
+ $(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) -o tst_crc32 $(srcdir)/crc32.c \
-DUNITTEST $(LIBEXT2FS) $(LIBCOM_ERR)
tst_refcount: ea_refcount.c
- @echo " LD $@"
- @$(CC) -o tst_refcount $(srcdir)/ea_refcount.c \
+ $(CC) -o tst_refcount $(srcdir)/ea_refcount.c \
$(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR) $(LIBEXT2FS)
tst_region: region.c
- @echo " LD $@"
- @$(CC) -o tst_region $(srcdir)/region.c \
+ $(CC) -o tst_region $(srcdir)/region.c \
$(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR)
check:: tst_refcount tst_region tst_crc32
@@ -154,21 +145,17 @@ check:: tst_refcount tst_region tst_crc32
LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_crc32
extend: extend.o
- @echo " LD $@"
- @$(LD) $(ALL_LDFLAGS) -o extend extend.o $(CHECKLIB)
+ $(LD) $(ALL_LDFLAGS) -o extend extend.o $(CHECKLIB)
flushb: flushb.o
- @echo " LD $@"
- @$(LD) $(ALL_LDFLAGS) -o flushb flushb.o $(CHECKLIB)
+ $(LD) $(ALL_LDFLAGS) -o flushb flushb.o $(CHECKLIB)
iscan: iscan.o util.o ehandler.o $(DEPLIBS)
- @echo " LD $@"
- @$(LD) $(ALL_LDFLAGS) -o iscan iscan.o util.o ehandler.o $(LIBS)
+ $(LD) $(ALL_LDFLAGS) -o iscan iscan.o util.o ehandler.o $(LIBS)
test_profile: $(srcdir)/profile.c profile_helpers.o argv_parse.o \
prof_err.o profile.h $(STATIC_LIBCOM_ERR)
- @echo " LD $@"
- @$(CC) -o test_profile -DDEBUG_PROGRAM $(srcdir)/profile.c prof_err.o \
+ $(CC) -o test_profile -DDEBUG_PROGRAM $(srcdir)/profile.c prof_err.o \
profile_helpers.o argv_parse.o $(STATIC_LIBCOM_ERR) \
$(ALL_CFLAGS)
@@ -177,65 +164,50 @@ profiled:
@PROFILE_CMT@ @mkdir profiled
e2fsck.8: $(DEP_SUBSTITUTE) $(srcdir)/e2fsck.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.8.in e2fsck.8
+ $(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.8.in e2fsck.8
e2fsck.conf.5: $(DEP_SUBSTITUTE) $(srcdir)/e2fsck.conf.5.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5
+ $(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5
installdirs:
- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
+ $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
$(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir)
install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs
- @for i in $(PROGS); do \
- echo " INSTALL $(root_sbindir)/$$i"; \
+ for i in $(PROGS); do \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
- $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
done
$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
- @echo " LINK $(root_sbindir)/fsck.ext2"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+ $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
$(DESTDIR)$(root_sbindir)/fsck.ext2
- @echo " LINK $(root_sbindir)/fsck.ext3"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+ $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
$(DESTDIR)$(root_sbindir)/fsck.ext3
- @echo " LINK $(root_sbindir)/fsck.ext4"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+ $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
$(DESTDIR)$(root_sbindir)/fsck.ext4
- @echo " LINK $(root_sbindir)/fsck.ext4dev"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+ $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
$(DESTDIR)$(root_sbindir)/fsck.ext4dev
- @for i in $(MANPAGES); do \
+ for i in $(MANPAGES); do \
for j in $(COMPRESS_EXT); do \
$(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
done; \
- echo " INSTALL_DATA $(man8dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
done
- @for i in $(FMANPAGES); do \
+ for i in $(FMANPAGES); do \
for j in $(COMPRESS_EXT); do \
$(RM) -f $(DESTDIR)$(man5dir)/$$i.$$j; \
done; \
- echo " INSTALL_DATA $(man5dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
done
- @echo " LINK $(man8dir)/fsck.ext2.8"
- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
+ $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
$(DESTDIR)$(man8dir)/fsck.ext2.8
- @echo " LINK $(man8dir)/fsck.ext3.8"
- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
+ $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
$(DESTDIR)$(man8dir)/fsck.ext3.8
- @echo " LINK $(man8dir)/fsck.ext4.8"
- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
+ $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
$(DESTDIR)$(man8dir)/fsck.ext4.8
- @echo " LINK $(man8dir)/fsck.ext4.8"
- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
+ $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
$(DESTDIR)$(man8dir)/fsck.ext4dev.8
install-strip: install
- @for i in $(PROGS); do \
- echo " STRIP $(root_sbindir)/$$i"; \
+ for i in $(PROGS); do \
$(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
done

11
sysutils/e2fsprogs/patches/patch-e2fsck_journal_c
View File

@ -1,11 +1,10 @@
$OpenBSD: patch-e2fsck_journal_c,v 1.1.1.1 2004/02/20 19:54:58 espie Exp $
--- e2fsck/journal.c.orig 2002-03-08 07:05:02.000000000 +0100
+++ e2fsck/journal.c 2003-11-16 17:07:37.000000000 +0100
@@ -13,6 +13,8 @@
*/
$OpenBSD: patch-e2fsck_journal_c,v 1.2 2009/03/15 19:59:31 landry Exp $
--- e2fsck/journal.c.orig Fri Jan 2 17:10:48 2009
+++ e2fsck/journal.c Sat Feb 21 17:17:46 2009
@@ -14,6 +14,7 @@
#ifdef HAVE_SYS_MOUNT_H
+#include <sys/param.h>
#include <sys/param.h>
+#include <sys/types.h>
#include <sys/mount.h>
#define MNT_FL (MS_MGC_VAL | MS_RDONLY)

84
sysutils/e2fsprogs/patches/patch-lib_Makefile_elf-lib
View File

@ -1,35 +1,69 @@
$OpenBSD: patch-lib_Makefile_elf-lib,v 1.5 2008/11/22 11:06:15 ajacoutot Exp $
--- lib/Makefile.elf-lib.orig Sun Feb 24 22:03:59 2002
+++ lib/Makefile.elf-lib Sat Nov 22 11:56:10 2008
@@ -23,14 +23,13 @@ ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION)
$OpenBSD: patch-lib_Makefile_elf-lib,v 1.6 2009/03/15 19:59:31 landry Exp $
--- lib/Makefile.elf-lib.orig Tue Oct 7 16:22:39 2008
+++ lib/Makefile.elf-lib Sun Feb 22 11:11:17 2009
@@ -14,8 +14,7 @@
all:: image
real-subdirs:: Makefile
- @echo " MKDIR elfshared"
- @mkdir -p elfshared
+ mkdir -p elfshared
ELF_LIB = $(ELF_IMAGE).so.$(ELF_VERSION)
ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION)
@@ -23,45 +22,28 @@ ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION)
image: $(ELF_LIB)
-$(ELF_LIB): $(OBJS)
- (cd elfshared; $(CC) --shared -o $(ELF_LIB) -Wl,-soname,$(ELF_SONAME) \
- $(OBJS) $(ELF_OTHER_LIBS))
+$(ELF_LIB) $(ELF_IMAGE).so: $(OBJS)
+ (cd elfshared; $(CC) -shared -fPIC -o $(ELF_LIB) \
+ $(OBJS))
$(MV) elfshared/$(ELF_LIB) .
$(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
$(LN) $(ELF_LIB) ../$(ELF_LIB)
$(LN) ../$(ELF_LIB) ../$(ELF_IMAGE).so
- $(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
$(ELF_LIB): $(OBJS)
- @echo " GEN_ELF_SOLIB $(ELF_LIB)"
- @(cd elfshared; $(CC) --shared -o $(ELF_LIB) $(LDFLAGS) \
- -Wl,-soname,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
- @$(MV) elfshared/$(ELF_LIB) .
- @$(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
- @$(LN) $(ELF_LIB) ../$(ELF_LIB)
- @$(LN) ../$(ELF_LIB) ../$(ELF_IMAGE).so
- @$(LN) ../$(ELF_LIB) ../$(ELF_SONAME)
+ (cd elfshared; $(CC) --shared -fPIC -o $(ELF_LIB) $(LDFLAGS) $(OBJS))
+ $(MV) elfshared/$(ELF_LIB) .
+ $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
+ $(LN) $(ELF_LIB) ../$(ELF_LIB)
+ $(LN) ../$(ELF_LIB) ../$(ELF_IMAGE).so
installdirs-elf-lib::
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(ELF_INSTALL_DIR) \
@@ -40,12 +39,7 @@ installdirs:: installdirs-elf-lib
- @echo " MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
+ $(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \
$(DESTDIR)$(libdir)
installdirs:: installdirs-elf-lib
install-shlibs install:: $(ELF_LIB) installdirs-elf-lib
$(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
- $(STRIP) --strip-debug \
- $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
- $(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
- $(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
- $(DESTDIR)$(libdir)/$(ELF_IMAGE).so
- -$(LDCONFIG)
- @echo " INSTALL-ELF-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
- @$(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
- @echo " SYMLINK $(ELF_INSTALL_DIR)/$(ELF_SONAME)"
- @$(LN_S) -f $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_SONAME)
- @echo " SYMLINK $(libdir)/$(ELF_IMAGE).so"
- @if test "$(ELF_INSTALL_DIR)" = "$(libdir)"; then \
- $(LN_S) -f $(ELF_SONAME) $(DESTDIR)$(libdir)/$(ELF_IMAGE).so ; \
- else \
- $(LN_S) -f $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
- $(DESTDIR)$(libdir)/$(ELF_IMAGE).so; \
- fi
- @echo " LDCONFIG"
- @-$(LDCONFIG)
+ $(INSTALL_PROGRAM) $(ELF_LIB) $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
+ $(INSTALL_DATA) $(ELF_IMAGE).a $(DESTDIR)$(ELF_INSTALL_DIR)/
install-strip: install
- @echo " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
- @$(STRIP) --strip-unneeded --remove-section=.comment \
+ $(STRIP) --strip-unneeded --remove-section=.comment \
--remove-section=.note $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
install-shlibs-strip: install-shlibs
- @echo " STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
- @$(STRIP) --strip-unneeded --remove-section=.comment \
+ $(STRIP) --strip-unneeded --remove-section=.comment \
--remove-section=.note $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB)
uninstall-shlibs uninstall::
$(RM) -f $(DESTDIR)$(ELF_INSTALL_DIR)/$(ELF_LIB) \

149
sysutils/e2fsprogs/patches/patch-lib_blkid_Makefile_in Normal file
View File

@ -0,0 +1,149 @@
$OpenBSD: patch-lib_blkid_Makefile_in,v 1.1 2009/03/15 19:59:31 landry Exp $
--- lib/blkid/Makefile.in.orig Tue Oct 7 16:22:39 2008
+++ lib/blkid/Makefile.in Sun Feb 22 11:47:57 2009
@@ -32,8 +32,8 @@ HFILES_IN= blkid_types.h
LIBRARY= libblkid
LIBDIR= blkid
-ELF_VERSION = 1.0
-ELF_SO_VERSION = 1
+ELF_VERSION = $(LIBblkid_VERSION)
+ELF_SO_VERSION = $(LIBblkid_VERSION)
ELF_IMAGE = libblkid
ELF_MYDIR = blkid
ELF_INSTALL_DIR = $(root_libdir)
@@ -54,8 +54,7 @@ LIBS_BLKID= $(STATIC_LIBBLKID) $(STATIC_LIBUUID)
DEPLIBS_BLKID= $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID)
.c.o:
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(CC) $(ALL_CFLAGS) -c $< -o $@
@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
@CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
@ELF_CMT@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
@@ -64,66 +63,51 @@ DEPLIBS_BLKID= $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUU
all:: $(SMANPAGES) blkid.pc
$(top_builddir)/lib/blkid/blkid_types.h: $(srcdir)/blkid_types.h.in $(top_builddir)/config.status
- @echo " CONFIG.STATUS $@"
- @cd $(top_builddir); \
+ cd $(top_builddir); \
CONFIG_FILES=$(my_dir)/blkid_types.h ./config.status
libblkid.3: $(DEP_SUBSTITUTE) $(srcdir)/libblkid.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/libblkid.3.in libblkid.3
+ $(SUBSTITUTE_UPTIME) $(srcdir)/libblkid.3.in libblkid.3
tst_cache: $(srcdir)/cache.c $(DEPLIBS_BLKID)
- @echo " LD $@"
- @$(CC) -o tst_cache -DTEST_PROGRAM $(srcdir)/cache.c $(LIBS_BLKID) $(ALL_CFLAGS)
+ $(CC) -o tst_cache -DTEST_PROGRAM $(srcdir)/cache.c $(LIBS_BLKID) $(ALL_CFLAGS)
tst_dev: $(srcdir)/dev.c $(DEPLIBS_BLKID)
- @echo " LD $@"
- @$(CC) -o tst_dev -DTEST_PROGRAM $(srcdir)/dev.c $(LIBS_BLKID) $(ALL_CFLAGS)
+ $(CC) -o tst_dev -DTEST_PROGRAM $(srcdir)/dev.c $(LIBS_BLKID) $(ALL_CFLAGS)
tst_devname: $(srcdir)/devname.c $(DEPLIBS_BLKID)
- @echo " LD $@"
- @$(CC) -o tst_devname -DTEST_PROGRAM $(srcdir)/devname.c $(LIBS_BLKID) $(ALL_CFLAGS)
+ $(CC) -o tst_devname -DTEST_PROGRAM $(srcdir)/devname.c $(LIBS_BLKID) $(ALL_CFLAGS)
tst_devno: $(srcdir)/devno.c $(DEPLIBS_BLKID)
- @echo " LD $@"
- @$(CC) -o tst_devno -DTEST_PROGRAM $(srcdir)/devno.c $(LIBS_BLKID) $(ALL_CFLAGS)
+ $(CC) -o tst_devno -DTEST_PROGRAM $(srcdir)/devno.c $(LIBS_BLKID) $(ALL_CFLAGS)
tst_getsize: $(srcdir)/getsize.c $(DEPLIBS_BLKID)
- @echo " LD $@"
- @$(CC) -o tst_getsize -DTEST_PROGRAM $(srcdir)/getsize.c $(LIBS_BLKID) $(ALL_CFLAGS)
+ $(CC) -o tst_getsize -DTEST_PROGRAM $(srcdir)/getsize.c $(LIBS_BLKID) $(ALL_CFLAGS)
tst_probe: $(srcdir)/probe.c $(DEPLIBS_BLKID)
- @echo " LD $@"
- @$(CC) -o tst_probe -DTEST_PROGRAM $(srcdir)/probe.c $(LIBS_BLKID) $(ALL_CFLAGS)
+ $(CC) -o tst_probe -DTEST_PROGRAM $(srcdir)/probe.c $(LIBS_BLKID) $(ALL_CFLAGS)
tst_read: $(srcdir)/read.c $(DEPLIBS_BLKID)
- @echo " LD $@"
- @$(CC) -o tst_read -DTEST_PROGRAM $(srcdir)/read.c $(LIBS_BLKID) $(ALL_CFLAGS)
+ $(CC) -o tst_read -DTEST_PROGRAM $(srcdir)/read.c $(LIBS_BLKID) $(ALL_CFLAGS)
tst_resolve: $(srcdir)/resolve.c $(DEPLIBS_BLKID)
- @echo " LD $@"
- @$(CC) -o tst_resolve -DTEST_PROGRAM $(srcdir)/resolve.c $(LIBS_BLKID) $(ALL_CFLAGS)
+ $(CC) -o tst_resolve -DTEST_PROGRAM $(srcdir)/resolve.c $(LIBS_BLKID) $(ALL_CFLAGS)
tst_save: $(srcdir)/save.c $(DEPLIBS_BLKID)
- @echo " LD $@"
- @$(CC) -o tst_save -DTEST_PROGRAM $(srcdir)/save.c $(LIBS_BLKID) $(ALL_CFLAGS)
+ $(CC) -o tst_save -DTEST_PROGRAM $(srcdir)/save.c $(LIBS_BLKID) $(ALL_CFLAGS)
tst_tag: $(srcdir)/tag.c $(DEPLIBS_BLKID)
- @echo " LD $@"
- @$(CC) -o tst_tag -DTEST_PROGRAM $(srcdir)/tag.c $(LIBS_BLKID) $(ALL_CFLAGS)
+ $(CC) -o tst_tag -DTEST_PROGRAM $(srcdir)/tag.c $(LIBS_BLKID) $(ALL_CFLAGS)
tst_types: tst_types.o blkid_types.h
- @echo " LD $@"
- @$(CC) -o tst_types tst_types.o
+ $(CC) -o tst_types tst_types.o
../../misc/blkid.o: $(top_srcdir)/misc/blkid.c blkid.h
- @echo " CC $@"
- @$(CC) $(ALL_CFLAGS) -c $(top_srcdir)/misc/blkid.c \
+ $(CC) $(ALL_CFLAGS) -c $(top_srcdir)/misc/blkid.c \
-o ../../misc/blkid.o
blkid: ../../misc/blkid.o libblkid.a $(DEPLIBUUID)
- @echo " LD $@"
- @$(CC) -o blkid ../../misc/blkid.o libblkid.a $(LIBUUID)
+ $(CC) -o blkid ../../misc/blkid.o libblkid.a $(LIBUUID)
test_probe: test_probe.in Makefile
@echo "Creating test_probe..."
@@ -138,33 +122,26 @@ check:: all tst_cache tst_dev tst_devname tst_devno ts
./tst_types
blkid.pc: $(srcdir)/blkid.pc.in $(top_builddir)/config.status
- @echo " CONFIG.STATUS $@"
- @cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status
+ cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status
installdirs::
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/blkid"
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig
install:: all installdirs
- @echo " INSTALL_DATA $(libdir)/libblkid.a"
- @$(INSTALL_DATA) libblkid.a $(DESTDIR)$(libdir)/libblkid.a
- @-$(RANLIB) $(DESTDIR)$(libdir)/libblkid.a
- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libblkid.a
- @set -e; for i in $(HFILES); do \
- echo " INSTALL_DATA $(includedir)/blkid/$$i"; \
+ $(INSTALL_DATA) libblkid.a $(DESTDIR)$(libdir)/libblkid.a
+ $(RANLIB) $(DESTDIR)$(libdir)/libblkid.a
+ $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libblkid.a
+ set -e; for i in $(HFILES); do \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/blkid/$$i; \
done
- @set -e; for i in $(HFILES_IN); do \
- echo " INSTALL_DATA $(includedir)/blkid/$$i"; \
+ set -e; for i in $(HFILES_IN); do \
$(INSTALL_DATA) $$i $(DESTDIR)$(includedir)/blkid/$$i; \
done
- @for i in $(SMANPAGES); do \
- echo " INSTALL_DATA $(man3dir)/$$i"; \
+ for i in $(SMANPAGES); do \
$(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$i; \
done
- @echo " INSTALL_DATA $(libdir)/pkgconfig/blkid.pc"
- @$(INSTALL_DATA) blkid.pc $(DESTDIR)$(libdir)/pkgconfig/blkid.pc
+ $(INSTALL_DATA) blkid.pc $(DESTDIR)$(libdir)/pkgconfig/blkid.pc
uninstall::
$(RM) -f $(DESTDIR)$(libdir)/libblkid.a \

74
sysutils/e2fsprogs/patches/patch-lib_e2p_Makefile_in
View File

@ -1,12 +1,72 @@
$OpenBSD: patch-lib_e2p_Makefile_in,v 1.1 2006/02/04 18:37:36 bernd Exp $
--- lib/e2p/Makefile.in.orig Sat Feb 4 19:03:34 2006
+++ lib/e2p/Makefile.in Sat Feb 4 19:04:11 2006
@@ -42,7 +42,7 @@ DLL_STUB = libe2p
DLL_MYDIR = e2p
DLL_INSTALL_DIR = $(root_libdir)
$OpenBSD: patch-lib_e2p_Makefile_in,v 1.2 2009/03/15 19:59:31 landry Exp $
--- lib/e2p/Makefile.in.orig Tue Oct 7 16:22:39 2008
+++ lib/e2p/Makefile.in Sun Feb 22 11:42:42 2009
@@ -34,8 +34,8 @@ HFILES= e2p.h
LIBRARY= libe2p
LIBDIR= e2p
-ELF_VERSION = 2.3
-ELF_SO_VERSION = 2
+ELF_VERSION = $(LIBe2p_VERSION)
ELF_SO_VERSION = 2
+ELF_SO_VERSION = $(LIBe2p_VERSION)
ELF_IMAGE = libe2p
ELF_MYDIR = e2p
ELF_INSTALL_DIR = $(root_libdir)
@@ -53,25 +53,21 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
@MAKEFILE_CHECKER@
.c.o:
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(CC) $(ALL_CFLAGS) -c $< -o $@
@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
@CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
@ELF_CMT@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
@BSDLIB_CMT@ @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
e2p.pc: $(srcdir)/e2p.pc.in $(top_builddir)/config.status
- @echo " CONFIG.STATUS $@"
- @cd $(top_builddir); CONFIG_FILES=lib/e2p/e2p.pc ./config.status
+ cd $(top_builddir); CONFIG_FILES=lib/e2p/e2p.pc ./config.status
tst_ostype: $(srcdir)/ostype.c
- @echo " LD $@"
- @$(CC) -DTEST_PROGRAM -I$(top_srcdir)/lib -o tst_ostype \
+ $(CC) -DTEST_PROGRAM -I$(top_srcdir)/lib -o tst_ostype \
$(srcdir)/ostype.c $(ALL_CFLAGS)
tst_feature: $(srcdir)/feature.c
- @echo " LD $@"
- @$(CC) -DTEST_PROGRAM -I$(top_srcdir)/lib -o tst_feature \
+ $(CC) -DTEST_PROGRAM -I$(top_srcdir)/lib -o tst_feature \
$(srcdir)/feature.c $(ALL_CFLAGS)
check:: tst_ostype tst_feature
@@ -79,21 +75,17 @@ check:: tst_ostype tst_feature
./tst_feature
installdirs::
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/e2p"
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/e2p $(DESTDIR)$(libdir)/pkgconfig
install:: all installdirs
- @echo " INSTALL_DATA $(libdir)/libe2p.a"
- @$(INSTALL_DATA) libe2p.a $(DESTDIR)$(libdir)/libe2p.a
- @-$(RANLIB) $(DESTDIR)$(libdir)/libe2p.a
- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libe2p.a
- @set -e; for i in $(HFILES); do \
- echo " INSTALL_DATA $(includedir)/e2p/$$i"; \
+ $(INSTALL_DATA) libe2p.a $(DESTDIR)$(libdir)/libe2p.a
+ $(RANLIB) $(DESTDIR)$(libdir)/libe2p.a
+ $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libe2p.a
+ set -e; for i in $(HFILES); do \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/e2p/$$i; \
done
- @echo " INSTALL_DATA $(libdir)/pkgconfig/e2p.pc"
- @$(INSTALL_DATA) e2p.pc $(DESTDIR)$(libdir)/pkgconfig/e2p.pc
+ $(INSTALL_DATA) e2p.pc $(DESTDIR)$(libdir)/pkgconfig/e2p.pc
uninstall::
$(RM) -f $(DESTDIR)$(libdir)/libe2p.a \

120
sysutils/e2fsprogs/patches/patch-lib_et_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_et_Makefile_in,v 1.3 2008/11/22 11:06:15 ajacoutot Exp $
--- lib/et/Makefile.in.orig Sun Feb 24 22:03:59 2002
+++ lib/et/Makefile.in Sat Nov 22 11:56:10 2008
@@ -22,7 +22,7 @@ SRCS = $(srcdir)/error_message.c $(srcdir)/et_name.c $
$OpenBSD: patch-lib_et_Makefile_in,v 1.4 2009/03/15 19:59:31 landry Exp $
--- lib/et/Makefile.in.orig Tue Oct 7 16:22:39 2008
+++ lib/et/Makefile.in Sun Feb 22 11:41:29 2009
@@ -22,18 +22,18 @@ SRCS = $(srcdir)/error_message.c $(srcdir)/et_name.c $
HFILES= com_err.h
SHARE_FILES= et_c.awk et_h.awk
@ -9,64 +9,112 @@ $OpenBSD: patch-lib_et_Makefile_in,v 1.3 2008/11/22 11:06:15 ajacoutot Exp $
+LIBRARY= libext2fs_com_err
LIBDIR= et
DLL_ADDRESS = 0x66800000
@@ -30,19 +30,19 @@ DLL_JUMPSIZE = 0x1000
DLL_GOTSIZE = 0x1000
DLL_VERSION = 1.0
DLL_IMAGE = libet
-DLL_STUB = libcom_err
+DLL_STUB = libext2fs_com_err
DLL_MYDIR = et
DLL_INSTALL_DIR = $(root_libdir)
-ELF_VERSION = 2.0
+ELF_VERSION = $(LIBext2fs_com_err_VERSION)
ELF_SO_VERSION = 2
-ELF_VERSION = 2.1
-ELF_SO_VERSION = 2
-ELF_IMAGE = libcom_err
+ELF_VERSION = $(LIBext2fs_com_err_VERSION)
+ELF_SO_VERSION = $(LIBext2fs_com_err_VERSION)
+ELF_IMAGE = libext2fs_com_err
ELF_MYDIR = et
ELF_INSTALL_DIR = $(root_libdir)
ELF_OTHER_LIBS =
ELF_OTHER_LIBS = @SEM_INIT_LIB@
BSDLIB_VERSION = 1.0
BSDLIB_VERSION = 1.1
-BSDLIB_IMAGE = libcom_err
+BSDLIB_IMAGE = libext2fs_com_err
BSDLIB_MYDIR = et
BSDLIB_INSTALL_DIR = $(root_libdir)
@@ -85,11 +85,11 @@ installdirs::
$(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) \
$(DESTDIR)$(man3dir)
@@ -41,8 +41,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
# what to build...
#
.c.o:
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(CC) $(ALL_CFLAGS) -c $< -o $@
@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
@CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
@ELF_CMT@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
@@ -55,16 +54,14 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
@MAKEFILE_CHECKER@
-install:: compile_et libcom_err.a $(HFILES) installdirs
- $(INSTALL_DATA) libcom_err.a $(DESTDIR)$(libdir)/libcom_err.a
- $(CHMOD) 644 $(DESTDIR)$(libdir)/libcom_err.a
- -$(RANLIB) $(DESTDIR)$(libdir)/libcom_err.a
- $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libcom_err.a
+install:: compile_et $(LIBRARY).a $(HFILES) installdirs
compile_et: $(DEP_SUBSTITUTE) $(srcdir)/compile_et.sh.in
- @echo " SUBST $@"
- @$(SUBSTITUTE) $(srcdir)/compile_et.sh.in compile_et
- @$(CHMOD) +x compile_et
+ $(SUBSTITUTE) $(srcdir)/compile_et.sh.in compile_et
+ $(CHMOD) +x compile_et
com_err.ps : com_err.dvi
com_err.dvi: com_err.texinfo
com_err.pc: $(srcdir)/com_err.pc.in $(top_builddir)/config.status
- @echo " CONFIG.STATUS $@"
- @cd $(top_builddir); CONFIG_FILES=lib/et/com_err.pc ./config.status
+ cd $(top_builddir); CONFIG_FILES=lib/et/com_err.pc ./config.status
#libcom_err.o: $(LIBOBJS)
# $(LD) -r -s -o libcom_err.o $(LIBOBJS)
@@ -74,37 +71,29 @@ TAGS: $(SRCS)
$(TAGS) $(SRCS)
installdirs::
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et \
$(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) \
$(DESTDIR)$(man3dir) $(DESTDIR)$(libdir)/pkgconfig
-install:: compile_et libcom_err.a $(HFILES) installdirs com_err.pc
- @echo " INSTALL_DATA $(libdir)/libcom_err.a"
- @$(INSTALL_DATA) libcom_err.a $(DESTDIR)$(libdir)/libcom_err.a
- @-$(RANLIB) $(DESTDIR)$(libdir)/libcom_err.a
- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libcom_err.a
- @for i in $(HFILES); do \
- echo " INSTALL_DATA $(includedir)/et/$$i"; \
+install:: compile_et $(LIBRARY).a $(HFILES) installdirs com_err.pc
+ $(INSTALL_DATA) $(LIBRARY).a $(DESTDIR)$(libdir)/$(LIBRARY).a
+ $(CHMOD) 644 $(DESTDIR)$(libdir)/$(LIBRARY).a
+ -$(RANLIB) $(DESTDIR)$(libdir)/$(LIBRARY).a
+ $(RANLIB) $(DESTDIR)$(libdir)/$(LIBRARY).a
+ $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/$(LIBRARY).a
for i in $(HFILES); do \
+ for i in $(HFILES); do \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/et/$$i; \
done
@@ -102,15 +102,15 @@ install:: compile_et libcom_err.a $(HFILES) installdir
- @for i in $(SHARE_FILES); do \
- echo " INSTALL_DATA $(datadir)/et/$$i"; \
+ for i in $(SHARE_FILES); do \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/et/$$i; \
done
- @echo " INSTALL_SCRIPT $(bindir)/compile_et"
- @$(INSTALL_SCRIPT) compile_et $(DESTDIR)$(bindir)/compile_et
- @echo " INSTALL_DATA $(man3dir)/com_err.3"
- @$(INSTALL_DATA) $(srcdir)/com_err.3 $(DESTDIR)$(man3dir)/com_err.3
- @echo " INSTALL_DATA $(man1dir)/compile_et.1"
- @$(INSTALL_DATA) $(srcdir)/compile_et.1 \
+ $(INSTALL_SCRIPT) compile_et $(DESTDIR)$(bindir)/compile_et
+ $(INSTALL_DATA) $(srcdir)/com_err.3 $(DESTDIR)$(man3dir)/com_err.3
+ $(INSTALL_DATA) $(srcdir)/compile_et.1 \
$(DESTDIR)$(man1dir)/compile_et.1
- @echo " INSTALL_DATA $(libdir)/pkgconfig/com_err.pc"
- @$(INSTALL_DATA) com_err.pc $(DESTDIR)$(libdir)/pkgconfig/com_err.pc
+ $(INSTALL_DATA) com_err.pc $(DESTDIR)$(libdir)/pkgconfig/com_err.pc
uninstall::
- $(RM) -f $(DESTDIR)$(libdir)/libcom_err.a \
+ $(RM) -f $(DESTDIR)$(libdir)/$(LIBRARY).a \
$(DESTDIR)$(bindir)/compile_et
$(DESTDIR)$(bindir)/compile_et \
$(DESTDIR)$(libdir)/pkgconfig/com_err.pc
$(RM) -rf $(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et
@@ -122,10 +111,10 @@ check:: compile_et
done
clean::
- $(RM) -f compile_et libcom_err.a libcom_err_p.a
+ $(RM) -f compile_et $(LIBRARY).a $(LIBRARY)_p.a
- $(RM) -f compile_et libcom_err.a libcom_err_p.a com_err.info
+ $(RM) -f compile_et $(LIBRARY).a $(LIBRARY)_p.a com_err.info
$(RM) -f $(OBJS) profiled/*
$(RM) -f *~ \#* *.bak *.otl *.aux *.toc *.PS *.dvi *.ps TAGS *.ln
- $(RM) -f ../libcom_err.a ../libcom_err_p.a
+ $(RM) -f ../$(LIBRARY).a ../$(LIBRARY)_p.a
mostlyclean:: clean
distclean:: clean
$(RM) -f .depend Makefile $(srcdir)/TAGS $(srcdir)/Makefile.in.old

226
sysutils/e2fsprogs/patches/patch-lib_ext2fs_Makefile_in
View File

@ -1,13 +1,14 @@
$OpenBSD: patch-lib_ext2fs_Makefile_in,v 1.2 2006/02/04 18:37:36 bernd Exp $
--- lib/ext2fs/Makefile.in.orig Fri Mar 8 06:05:02 2002
+++ lib/ext2fs/Makefile.in Sat Feb 4 19:04:53 2006
@@ -139,12 +139,12 @@ DLL_LIBS = -L../.. -lcom_err
DLL_MYDIR = ext2fs
DLL_INSTALL_DIR = $(root_libdir)
$OpenBSD: patch-lib_ext2fs_Makefile_in,v 1.3 2009/03/15 19:59:31 landry Exp $
--- lib/ext2fs/Makefile.in.orig Tue Oct 7 16:22:39 2008
+++ lib/ext2fs/Makefile.in Sun Feb 22 10:54:40 2009
@@ -155,12 +155,12 @@ HFILES_IN= ext2_err.h ext2_types.h
LIBRARY= libext2fs
LIBDIR= ext2fs
-ELF_VERSION = 2.4
-ELF_SO_VERSION = 2
+ELF_VERSION = $(LIBext2fs_VERSION)
ELF_SO_VERSION = 2
+ELF_SO_VERSION = $(LIBext2fs_VERSION)
ELF_IMAGE = libext2fs
ELF_MYDIR = ext2fs
ELF_INSTALL_DIR = $(root_libdir)
@ -16,3 +17,214 @@ $OpenBSD: patch-lib_ext2fs_Makefile_in,v 1.2 2006/02/04 18:37:36 bernd Exp $
BSDLIB_VERSION = 2.1
BSDLIB_IMAGE = libext2fs
@@ -176,8 +176,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
all:: ext2fs.pc
.c.o:
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(CC) $(ALL_CFLAGS) -c $< -o $@
@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
@CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
@ELF_CMT@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
@@ -188,137 +187,107 @@ COMPILE_ET=../et/compile_et --build-tree
DISTFILES= Makefile *.c *.h image
ext2_err.et: $(DEP_SUBSTITUTE) $(srcdir)/ext2_err.et.in
- @echo " SUBST $@"
- @$(SUBSTITUTE) $(srcdir)/ext2_err.et.in ext2_err.et
+ $(SUBSTITUTE) $(srcdir)/ext2_err.et.in ext2_err.et
ext2_err.c ext2_err.h: ext2_err.et
- @echo " COMPILE_ET ext2_err.et"
- @$(COMPILE_ET) ext2_err.et
+ $(COMPILE_ET) ext2_err.et
ext2fs.pc: $(srcdir)/ext2fs.pc.in $(top_builddir)/config.status
- @echo " CONFIG.STATUS $@"
- @cd $(top_builddir); CONFIG_FILES=lib/ext2fs/ext2fs.pc ./config.status
+ cd $(top_builddir); CONFIG_FILES=lib/ext2fs/ext2fs.pc ./config.status
tst_badblocks: tst_badblocks.o $(STATIC_LIBEXT2FS)
- @echo " LD $@"
- @$(CC) -o tst_badblocks tst_badblocks.o $(STATIC_LIBEXT2FS) \
+ $(CC) -o tst_badblocks tst_badblocks.o $(STATIC_LIBEXT2FS) \
$(LIBCOM_ERR)
tst_icount: $(srcdir)/icount.c $(STATIC_LIBEXT2FS)
- @echo " LD $@"
- @$(CC) -o tst_icount $(srcdir)/icount.c -DDEBUG $(ALL_CFLAGS) \
+ $(CC) -o tst_icount $(srcdir)/icount.c -DDEBUG $(ALL_CFLAGS) \
$(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
tst_iscan: tst_iscan.o $(STATIC_LIBEXT2FS)
- @echo " LD $@"
- @$(CC) -o tst_iscan tst_iscan.o $(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
+ $(CC) -o tst_iscan tst_iscan.o $(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
tst_getsize: tst_getsize.o $(STATIC_LIBEXT2FS)
- @echo " LD $@"
- @$(CC) -o tst_getsize tst_getsize.o $(STATIC_LIBEXT2FS) \
+ $(CC) -o tst_getsize tst_getsize.o $(STATIC_LIBEXT2FS) \
$(LIBCOM_ERR)
tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS)
- @echo " LD $@"
- @$(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) $(LIBCOM_ERR)
+ (CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) $(LIBCOM_ERR)
tst_byteswap: tst_byteswap.o $(STATIC_LIBEXT2FS)
- @echo " LD $@"
- @$(CC) -o tst_byteswap tst_byteswap.o $(STATIC_LIBEXT2FS) \
+ $(CC) -o tst_byteswap tst_byteswap.o $(STATIC_LIBEXT2FS) \
$(LIBCOM_ERR)
tst_bitops: tst_bitops.o $(STATIC_LIBEXT2FS)
- @echo " LD $@"
- @$(CC) -o tst_bitops tst_bitops.o $(ALL_CFLAGS) \
+ $(CC) -o tst_bitops tst_bitops.o $(ALL_CFLAGS) \
$(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
tst_getsectsize: tst_getsectsize.o $(STATIC_LIBEXT2FS)
- @echo " LD $@"
- @$(CC) -o tst_sectgetsize tst_getsectsize.o \
+ $(CC) -o tst_sectgetsize tst_getsectsize.o \
$(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
tst_types: tst_types.o ext2_types.h
- @echo " LD $@"
- @$(CC) -o tst_types tst_types.o
+ $(CC) -o tst_types tst_types.o
tst_super_size: tst_super_size.o ext2_fs.h
- @echo " LD $@"
- @$(CC) -o tst_super_size tst_super_size.o
+ $(CC) -o tst_super_size tst_super_size.o
ext2_tdbtool: tdbtool.o
- @echo " LD $@"
- @$(CC) -o ext2_tdbtool tdbtool.o tdb.o
+ $(CC) -o ext2_tdbtool tdbtool.o tdb.o
extent_dbg.c: $(srcdir)/extent_dbg.ct
- @echo " MK_CMDS $<"
- @$(MK_CMDS) $(srcdir)/extent_dbg.ct
+ $(MK_CMDS) $(srcdir)/extent_dbg.ct
debug_cmds.c debug_cmds.h: $(top_srcdir)/debugfs/debug_cmds.ct
- @echo " MK_CMDS $<@"
- @$(MK_CMDS) $(top_srcdir)/debugfs/debug_cmds.ct
+ $(MK_CMDS) $(top_srcdir)/debugfs/debug_cmds.ct
DEBUG_OBJS= debug_cmds.o debugfs.o util.o ncheck.o icheck.o ls.o \
lsdel.o dump.o set_fields.o logdump.o htree.o unused.o
debugfs.o: $(top_srcdir)/debugfs/debugfs.c
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(CC) $(ALL_CFLAGS) -c $< -o $@
util.o: $(top_srcdir)/debugfs/util.c
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(CC) $(ALL_CFLAGS) -c $< -o $@
ncheck.o: $(top_srcdir)/debugfs/ncheck.c
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(CC) $(ALL_CFLAGS) -c $< -o $@
icheck.o: $(top_srcdir)/debugfs/icheck.c
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(CC) $(ALL_CFLAGS) -c $< -o $@
ls.o: $(top_srcdir)/debugfs/ls.c
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(CC) $(ALL_CFLAGS) -c $< -o $@
lsdel.o: $(top_srcdir)/debugfs/lsdel.c
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(CC) $(ALL_CFLAGS) -c $< -o $@
dump.o: $(top_srcdir)/debugfs/dump.c
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(CC) $(ALL_CFLAGS) -c $< -o $@
set_fields.o: $(top_srcdir)/debugfs/set_fields.c
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(CC) $(ALL_CFLAGS) -c $< -o $@
logdump.o: $(top_srcdir)/debugfs/logdump.c
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(CC) $(ALL_CFLAGS) -c $< -o $@
htree.o: $(top_srcdir)/debugfs/htree.c
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(CC) $(ALL_CFLAGS) -c $< -o $@
unused.o: $(top_srcdir)/debugfs/unused.c
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(CC) $(ALL_CFLAGS) -c $< -o $@
tst_extents: $(srcdir)/extent.c extent_dbg.c $(DEBUG_OBJS) $(DEPLIBSS) $(LIBE2P) $(DEPLIBUUID) $(DEPLIBBLKID)
- @echo " LD $@"
- @$(CC) -o tst_extents $(srcdir)/extent.c extent_dbg.c \
+ $(CC) -o tst_extents $(srcdir)/extent.c extent_dbg.c \
$(ALL_CFLAGS) -DDEBUG $(DEBUG_OBJS) $(LIBSS) $(LIBE2P) \
$(STATIC_LIBEXT2FS) $(LIBBLKID) $(LIBUUID) $(LIBCOM_ERR) \
-I $(top_srcdir)/debugfs
tst_csum: tst_csum.c csum.c $(STATIC_LIBEXT2FS)
- @echo " LD $@"
- @$(CC) -o tst_csum $(srcdir)/csum.c $(srcdir)/tst_csum.c -DDEBUG \
+ $(CC) -o tst_csum $(srcdir)/csum.c $(srcdir)/tst_csum.c -DDEBUG \
$(ALL_CFLAGS) $(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
mkjournal: mkjournal.c $(STATIC_LIBEXT2FS)
- @echo " LD $@"
- @$(CC) -o mkjournal $(srcdir)/mkjournal.c -DDEBUG $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) $(ALL_CFLAGS)
+ $(CC) -o mkjournal $(srcdir)/mkjournal.c -DDEBUG $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) $(ALL_CFLAGS)
check:: tst_bitops tst_badblocks tst_iscan tst_types tst_icount tst_super_size tst_types tst_csum
LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_bitops
@@ -330,25 +299,20 @@ check:: tst_bitops tst_badblocks tst_iscan tst_types t
LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_csum
installdirs::
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/ext2fs"
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/ext2fs $(DESTDIR)$(libdir)/pkgconfig
install:: all $(HFILES) $(HFILES_IN) installdirs ext2fs.pc
- @echo " INSTALL_DATA $(libdir)/libext2fs.a"
- @$(INSTALL_DATA) libext2fs.a $(DESTDIR)$(libdir)/libext2fs.a
- @-$(RANLIB) $(DESTDIR)$(libdir)/libext2fs.a
- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libext2fs.a
- @for i in $(HFILES); do \
- echo " INSTALL_DATA $(includedir)/ext2fs/$$i"; \
+ $(INSTALL_DATA) libext2fs.a $(DESTDIR)$(libdir)/libext2fs.a
+ $(RANLIB) $(DESTDIR)$(libdir)/libext2fs.a
+ $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libext2fs.a
+ for i in $(HFILES); do \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/ext2fs/$$i; \
done
- @for i in $(HFILES_IN); do \
- echo " INSTALL_DATA $(includedir)/ext2fs/$$i"; \
+ for i in $(HFILES_IN); do \
$(INSTALL_DATA) $$i $(DESTDIR)$(includedir)/ext2fs/$$i; \
done
- @echo " INSTALL_DATA $(libdir)/pkgconfig/ext2fs.pc"
- @$(INSTALL_DATA) ext2fs.pc $(DESTDIR)$(libdir)/pkgconfig/ext2fs.pc
+ $(INSTALL_DATA) ext2fs.pc $(DESTDIR)$(libdir)/pkgconfig/ext2fs.pc
uninstall::
$(RM) -f $(DESTDIR)$(libdir)/libext2fs.a \

11
sysutils/e2fsprogs/patches/patch-lib_ext2fs_flushb_c
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-lib_ext2fs_flushb_c,v 1.1.1.1 2004/02/20 19:54:58 espie Exp $
--- lib/ext2fs/flushb.c.orig 2002-02-24 22:03:59.000000000 +0100
+++ lib/ext2fs/flushb.c 2003-11-16 17:07:37.000000000 +0100
@@ -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

105
sysutils/e2fsprogs/patches/patch-lib_ext2fs_ismounted_c
View File

@ -1,105 +0,0 @@
$OpenBSD: patch-lib_ext2fs_ismounted_c,v 1.3 2008/11/22 11:06:15 ajacoutot Exp $
--- lib/ext2fs/ismounted.c.orig Sun Feb 24 22:03:59 2002
+++ lib/ext2fs/ismounted.c Sat Nov 22 11:56:10 2008
@@ -146,50 +146,6 @@ exit:
return retval;
}
-/*
- * Check to see if we're dealing with the swap device.
- */
-static int is_swap_device(const char *file)
-{
- FILE *f;
- char buf[1024], *cp;
- dev_t file_dev;
- struct stat st_buf;
- int ret = 0;
-
- file_dev = 0;
-#ifndef __GNU__ /* The GNU hurd is broken with respect to stat devices */
- if (stat(file, &st_buf) == 0)
- file_dev = st_buf.st_rdev;
-#endif
-
- if (!(f = fopen("/proc/swaps", "r")))
- return 0;
- /* Skip the first line */
- fgets(buf, sizeof(buf), f);
- while (!feof(f)) {
- if (!fgets(buf, sizeof(buf), f))
- break;
- if ((cp = strchr(buf, ' ')) != NULL)
- *cp = 0;
- if ((cp = strchr(buf, '\t')) != NULL)
- *cp = 0;
- if (strcmp(buf, file) == 0) {
- ret++;
- break;
- }
-#ifndef __GNU__
- if (file_dev && (stat(buf, &st_buf) == 0) &&
- file_dev == st_buf.st_rdev) {
- ret++;
- break;
- }
-#endif
- }
- fclose(f);
- return ret;
-}
-
static errcode_t check_mntent(const char *file, int *mount_flags,
char *mtpt, int mtlen)
{
@@ -248,6 +204,50 @@ static errcode_t check_getmntinfo(const char *file, in
return 0;
}
#endif /* HAVE_GETMNTINFO */
+
+/*
+ * Check to see if we're dealing with the swap device.
+ */
+static int is_swap_device(const char *file)
+{
+ FILE *f;
+ char buf[1024], *cp;
+ dev_t file_dev;
+ struct stat st_buf;
+ int ret = 0;
+
+ file_dev = 0;
+#ifndef __GNU__ /* The GNU hurd is broken with respect to stat devices */
+ if (stat(file, &st_buf) == 0)
+ file_dev = st_buf.st_rdev;
+#endif
+
+ if (!(f = fopen("/proc/swaps", "r")))
+ return 0;
+ /* Skip the first line */
+ fgets(buf, sizeof(buf), f);
+ while (!feof(f)) {
+ if (!fgets(buf, sizeof(buf), f))
+ break;
+ if ((cp = strchr(buf, ' ')) != NULL)
+ *cp = 0;
+ if ((cp = strchr(buf, '\t')) != NULL)
+ *cp = 0;
+ if (strcmp(buf, file) == 0) {
+ ret++;
+ break;
+ }
+#ifndef __GNU__
+ if (file_dev && (stat(buf, &st_buf) == 0) &&
+ file_dev == st_buf.st_rdev) {
+ ret++;
+ break;
+ }
+#endif
+ }
+ fclose(f);
+ return ret;
+}
/*
* ext2fs_check_mount_point() returns 1 if the device is mounted, 0

11
sysutils/e2fsprogs/patches/patch-lib_ext2fs_unix_io_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-lib_ext2fs_unix_io_c,v 1.1 2009/03/15 19:59:31 landry Exp $
--- lib/ext2fs/unix_io.c.orig Sat Feb 21 17:42:28 2009
+++ lib/ext2fs/unix_io.c Sat Feb 21 17:42:49 2009
@@ -35,6 +35,7 @@
#include <sys/ioctl.h>
#endif
#ifdef HAVE_SYS_MOUNT_H
+#include <sys/param.h>
#include <sys/mount.h>
#endif
#if HAVE_SYS_STAT_H

128
sysutils/e2fsprogs/patches/patch-lib_ss_Makefile_in
View File

@ -1,18 +1,128 @@
$OpenBSD: patch-lib_ss_Makefile_in,v 1.2 2006/02/04 18:37:36 bernd Exp $
--- lib/ss/Makefile.in.orig Sun Feb 24 21:04:00 2002
+++ lib/ss/Makefile.in Sat Feb 4 19:06:07 2006
@@ -24,12 +24,12 @@ DLL_LIBS = -L../.. -lcom_err
DLL_MYDIR = ss
DLL_INSTALL_DIR = $(root_libdir)
$OpenBSD: patch-lib_ss_Makefile_in,v 1.3 2009/03/15 19:59:31 landry Exp $
--- lib/ss/Makefile.in.orig Tue Oct 7 16:22:39 2008
+++ lib/ss/Makefile.in Sun Feb 22 12:17:33 2009
@@ -15,12 +15,12 @@ DLOPEN_LIB = @DLOPEN_LIB@
LIBRARY= libss
LIBDIR= ss
-ELF_VERSION = 2.0
-ELF_SO_VERSION = 2
+ELF_VERSION = $(LIBss_VERSION)
ELF_SO_VERSION = 2
+ELF_SO_VERSION = $(LIBss_VERSION)
ELF_IMAGE = libss
ELF_MYDIR = ss
ELF_INSTALL_DIR = $(root_libdir)
-ELF_OTHER_LIBS = -L../.. -lcom_err
+ELF_OTHER_LIBS = -L../.. -lext2fs_com_err
-ELF_OTHER_LIBS = -L../.. -lcom_err $(DLOPEN_LIB)
+ELF_OTHER_LIBS = -L../.. -lext2fs_com_err $(DLOPEN_LIB)
BSDLIB_VERSION = 1.0
BSDLIB_IMAGE = libss
@@ -37,8 +37,7 @@ MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmds
XTRA_CFLAGS= -I$(srcdir)/../et
.c.o:
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $<
+ $(CC) $(ALL_CFLAGS) -c $<
@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
@CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
@ELF_CMT@ @$(CC) $(ALL_CFLAGS) -DSHARED_ELF_LIB -fPIC -o elfshared/$*.o -c $<
@@ -96,18 +95,15 @@ FILES= $(SRCS) $(MKCMDSFILES) $(HFILES) \
all:: libss.a ss.pc # libss_p.a lint
std_rqs.c: std_rqs.ct mk_cmds
- @echo " MK_CMDS $@"
- @DIR=$(srcdir) $(MK_CMDS) $(srcdir)/std_rqs.ct
+ DIR=$(srcdir) $(MK_CMDS) $(srcdir)/std_rqs.ct
std_rqs.o: ss_err.h
test_cmd.c: test_cmd.ct mk_cmds
- @echo " MK_CMDS $@"
- @DIR=$(srcdir) $(MK_CMDS) $(srcdir)/test_cmd.ct
+ DIR=$(srcdir) $(MK_CMDS) $(srcdir)/test_cmd.ct
ss_err.c ss_err.h: ss_err.et
- @echo " COMPILE_ET ss_err.et"
- @$(COMPILE_ET) $(srcdir)/ss_err.et
+ $(COMPILE_ET) $(srcdir)/ss_err.et
ct.tab.c ct.tab.h: ct.y
$(RM) -f ct.tab.* y.*
@@ -120,42 +116,32 @@ ct.tab.c ct.tab.h: ct.y
# $(CHMOD) -x $@
mk_cmds: $(DEP_SUBSTITUTE) $(srcdir)/mk_cmds.sh.in
- @echo " SUBST $@"
- @$(SUBSTITUTE) $(srcdir)/mk_cmds.sh.in mk_cmds
- @$(CHMOD) +x mk_cmds
+ $(SUBSTITUTE) $(srcdir)/mk_cmds.sh.in mk_cmds
+ $(CHMOD) +x mk_cmds
ss.pc: $(srcdir)/ss.pc.in $(top_builddir)/config.status
- @echo " CONFIG.STATUS $@"
- @cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status
+ cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status
installdirs::
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss \
$(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/pkgconfig
install:: libss.a $(INSTALL_HFILES) installdirs ss_err.h mk_cmds ss.pc
- @echo " INSTALL_DATA $(DESTDIR)$(libdir)/libss.a"
- @$(INSTALL_DATA) libss.a $(DESTDIR)$(libdir)/libss.a
- @-$(RANLIB) $(DESTDIR)$(libdir)/libss.a
- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libss.a
- @$(RM) -f $(DESTDIR)$(includedir)/ss/*
- @for i in $(INSTALL_HFILES); do \
- echo " INSTALL_DATA $(DESTDIR)$(includedir)/ss/$$i"; \
+ $(INSTALL_DATA) libss.a $(DESTDIR)$(libdir)/libss.a
+ $(RANLIB) $(DESTDIR)$(libdir)/libss.a
+ $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libss.a
+ $(RM) -f $(DESTDIR)$(includedir)/ss/*
+ for i in $(INSTALL_HFILES); do \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/ss/$$i; \
done
- @echo " INSTALL_DATA $(includedir)/ss/ss_err.h"
- @$(INSTALL_DATA) ss_err.h $(DESTDIR)$(includedir)/ss/ss_err.h
- @for i in $(SHARE_FILES); do \
- echo " INSTALL_DATA $(DESTDIR)$(datadir)/ss/$$i"; \
+ $(INSTALL_DATA) ss_err.h $(DESTDIR)$(includedir)/ss/ss_err.h
+ for i in $(SHARE_FILES); do \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/ss/$$i; \
done
- @echo " INSTALL $(bindir)/mk_cmds"
- @$(INSTALL) mk_cmds $(DESTDIR)$(bindir)/mk_cmds
- @echo " INSTALL_DATA $(man1dir)/mk_cmds.1"
- @$(INSTALL_DATA) $(srcdir)/mk_cmds.1 $(DESTDIR)$(man1dir)/mk_cmds.1
- @echo " INSTALL_DATA $(libdir)/pkgconfig/ss.pc"
- @$(INSTALL_DATA) ss.pc $(DESTDIR)$(libdir)/pkgconfig/ss.pc
+ $(INSTALL) mk_cmds $(DESTDIR)$(bindir)/mk_cmds
+ $(INSTALL_DATA) $(srcdir)/mk_cmds.1 $(DESTDIR)$(man1dir)/mk_cmds.1
+ $(INSTALL_DATA) ss.pc $(DESTDIR)$(libdir)/pkgconfig/ss.pc
uninstall::
$(RM) -f $(DESTDIR)$(libdir)/libss.a $(DESTDIR)$(bindir)/mk_cmds \
@@ -163,15 +149,13 @@ uninstall::
$(DESTDIR)$(man1dir)/mk_cmds.1
$(RM) -rf $(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss
-test_ss: test_ss.o test_cmd.o $(DEPLIBSS) $(LIBCOM_ERR)
- @echo " LD $@"
- @$(CC) -o $@ test_ss.o test_cmd.o $(ALL_CFLAGS) \
+test_ss: test_ss.o test_cmd.o $(DEPLIBSS) $(DEPLIBCOM_ERR)
+ $(CC) -o $@ test_ss.o test_cmd.o $(ALL_CFLAGS) \
$(LIBSS) $(LIBCOM_ERR)
check:: all test_ss
- @echo " RUN TEST test_ss"
- -@(LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./test_ss -f $(srcdir)/test_script > test_out 2>&1; exit 0)
- @if diff test_out $(srcdir)/test_script_expected > test.diff; then \
+ (LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./test_ss -f $(srcdir)/test_script > test_out 2>&1; exit 0)
+ if diff test_out $(srcdir)/test_script_expected > test.diff; then \
true ; else echo "Regression test for ss library failed!"; exit 1 ; fi
clean::

134
sysutils/e2fsprogs/patches/patch-lib_uuid_Makefile_in
View File

@ -1,12 +1,132 @@
$OpenBSD: patch-lib_uuid_Makefile_in,v 1.1 2006/02/04 18:37:36 bernd Exp $
--- lib/uuid/Makefile.in.orig Sat Feb 4 19:06:20 2006
+++ lib/uuid/Makefile.in Sat Feb 4 19:06:38 2006
@@ -54,7 +54,7 @@ DLL_STUB = libuuid
DLL_MYDIR = uuid
DLL_INSTALL_DIR = $(root_libdir)
$OpenBSD: patch-lib_uuid_Makefile_in,v 1.2 2009/03/15 19:59:31 landry Exp $
--- lib/uuid/Makefile.in.orig Tue Feb 19 05:33:10 2008
+++ lib/uuid/Makefile.in Sun Feb 22 10:55:09 2009
@@ -41,8 +41,8 @@ SRCS= $(srcdir)/clear.c \
LIBRARY= libuuid
LIBDIR= uuid
-ELF_VERSION = 1.2
-ELF_SO_VERSION = 1
+ELF_VERSION = $(LIBuuid_VERSION)
ELF_SO_VERSION = 1
+ELF_SO_VERSION = $(LIBuuid_VERSION)
ELF_IMAGE = libuuid
ELF_MYDIR = uuid
ELF_INSTALL_DIR = $(root_libdir)
@@ -60,8 +60,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
@MAKEFILE_CHECKER@
.c.o:
- @echo " CC $<"
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
+ $(CC) $(ALL_CFLAGS) -c $< -o $@
@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
@CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
@ELF_CMT@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
@@ -73,84 +72,65 @@ $(top_builddir)/lib/uuid/uuid_types.h: $(srcdir)/uuid_
cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status
tst_uuid.o: $(srcdir)/tst_uuid.c
- @echo " CC $@"
- @$(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o
+ $(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o
tst_uuid: tst_uuid.o $(DEPSTATIC_LIBUUID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o tst_uuid tst_uuid.o $(STATIC_LIBUUID)
+ $(CC) $(ALL_LDFLAGS) -o tst_uuid tst_uuid.o $(STATIC_LIBUUID)
uuid_time: $(srcdir)/uuid_time.c $(DEPLIBUUID)
- @echo " LD $@"
- @$(CC) $(ALL_CFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \
+ $(CC) $(ALL_CFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \
$(LIBUUID)
uuid.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid.3.in uuid.3
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid.3.in uuid.3
uuid_clear.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_clear.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_clear.3.in uuid_clear.3
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_clear.3.in uuid_clear.3
uuid_compare.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_compare.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_compare.3.in uuid_compare.3
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_compare.3.in uuid_compare.3
uuid_copy.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_copy.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_copy.3.in uuid_copy.3
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_copy.3.in uuid_copy.3
uuid_generate.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_generate.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_generate.3.in uuid_generate.3
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_generate.3.in uuid_generate.3
uuid_is_null.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_is_null.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_is_null.3.in uuid_is_null.3
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_is_null.3.in uuid_is_null.3
uuid_parse.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_parse.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_parse.3.in uuid_parse.3
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_parse.3.in uuid_parse.3
uuid_time.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_time.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_time.3.in uuid_time.3
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_time.3.in uuid_time.3
uuid_unparse.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_unparse.3.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_unparse.3.in uuid_unparse.3
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_unparse.3.in uuid_unparse.3
uuid.pc: $(srcdir)/uuid.pc.in $(top_builddir)/config.status
- @echo " CONFIG.STATUS $@"
- @cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status
+ cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status
installdirs::
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/uuid $(man3dir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
$(DESTDIR)$(includedir)/uuid $(DESTDIR)$(man3dir) \
$(DESTDIR)$(libdir)/pkgconfig
install:: all installdirs
- @echo " INSTALL_DATA $(libdir)/libuuid.a"
- @$(INSTALL_DATA) libuuid.a $(DESTDIR)$(libdir)/libuuid.a
- @-$(RANLIB) $(DESTDIR)$(libdir)/libuuid.a
- @$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libuuid.a
- @echo " INSTALL_DATA $(includedir)/uuid/uuid.h"
- @$(INSTALL_DATA) $(srcdir)/uuid.h $(DESTDIR)$(includedir)/uuid/uuid.h
- @for i in $(SMANPAGES); do \
+ $(INSTALL_DATA) libuuid.a $(DESTDIR)$(libdir)/libuuid.a
+ $(RANLIB) $(DESTDIR)$(libdir)/libuuid.a
+ $(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libuuid.a
+ $(INSTALL_DATA) $(srcdir)/uuid.h $(DESTDIR)$(includedir)/uuid/uuid.h
+ for i in $(SMANPAGES); do \
$(RM) -f $(DESTDIR)$(man3dir)/$$i.gz; \
echo " INSTALL_DATA $(man3dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man3dir)/$$i; \
done
- @$(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \
+ $(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \
$(DESTDIR)$(man3dir)/uuid_generate_time.3.gz
- @echo " LINK $(man3dir)/uuid_generate_random.3"
- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
- @echo " LINK $(man3dir)/uuid_generate_time.3"
- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
- @echo " INSTALL_DATA $(libdir)/pkgconfig/uuid.pc"
- @$(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
+ $(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
+ $(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
+ $(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
uninstall::
$(RM) -f $(DESTDIR)$(libdir)/libuuid.a \

490
sysutils/e2fsprogs/patches/patch-misc_Makefile_in
View File

@ -1,48 +1,484 @@
$OpenBSD: patch-misc_Makefile_in,v 1.3 2008/11/22 11:06:15 ajacoutot Exp $
--- misc/Makefile.in.orig Sun Feb 24 22:04:00 2002
+++ misc/Makefile.in Sat Nov 22 11:56:10 2008
@@ -39,13 +39,13 @@ SRCS= $(srcdir)/tune2fs.c $(srcdir)/mklost+found.c $(s
$(srcdir)/uuidgen.c $(srcdir)/fstype.c
$OpenBSD: patch-misc_Makefile_in,v 1.4 2009/03/15 19:59:31 landry Exp $
--- misc/Makefile.in.orig Sat Nov 15 18:33:33 2008
+++ misc/Makefile.in Sat Feb 21 18:44:08 2009
@@ -74,7 +74,7 @@ SRCS= $(srcdir)/tune2fs.c $(srcdir)/mklost+found.c $(s
$(srcdir)/e2undo.c
LIBS= $(LIBEXT2FS) $(LIBCOM_ERR)
-DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR)
+DEPLIBS= $(DEPLIBEXT2FS) $(DEPLIBCOM_ERR)
PROFILED_LIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR)
PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR)
STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR)
@@ -82,13 +82,12 @@ STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR)
STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR)
LIBS_E2P= $(LIBEXT2FS) $(LIBE2P) $(LIBCOM_ERR)
-DEPLIBS_E2P= $(LIBEXT2FS) $(LIBE2P) $(LIBCOM_ERR)
+DEPLIBS_E2P= $(DEPLIBEXT2FS) $(DEPLIBE2P) $(DEPLIBCOM_ERR)
LIBS_E2P= $(LIBE2P) $(LIBCOM_ERR)
-DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR)
+DEPLIBS_E2P= $(DEPLIBE2P) $(DEpLIBCOM_ERR)
COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
.c.o:
$(CC) -c $(ALL_CFLAGS) $< -o $@
@@ -76,7 +76,7 @@ check:: base_device
- @echo " CC $<"
- @$(CC) -c $(ALL_CFLAGS) $< -o $@
+ $(CC) -c $(ALL_CFLAGS) $< -o $@
@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
all:: profiled $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \
@@ -104,84 +103,68 @@ profiled:
@PROFILE_CMT@ @mkdir profiled
prof_err.c prof_err.h: $(srcdir)/../e2fsck/prof_err.et
- @echo " COMPILE_ET prof_err.et"
- @$(COMPILE_ET) $(srcdir)/../e2fsck/prof_err.et
+ $(COMPILE_ET) $(srcdir)/../e2fsck/prof_err.et
default_profile.c: $(srcdir)/mke2fs.conf $(srcdir)/profile-to-c.awk
- @echo " PROFILE_TO_C mke2fs.conf"
- @$(AWK) -f $(srcdir)/profile-to-c.awk < $(srcdir)/mke2fs.conf \
+ $(AWK) -f $(srcdir)/profile-to-c.awk < $(srcdir)/mke2fs.conf \
> default_profile.c
profile.o:
- @echo " CC $<"
- @$(CC) -c $(ALL_CFLAGS) $(srcdir)/../e2fsck/profile.c -o $@
+ $(CC) -c $(ALL_CFLAGS) $(srcdir)/../e2fsck/profile.c -o $@
@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/profile.o -c \
@PROFILE_CMT@ $(srcdir)/../e2fsck/profile.c
findsuper: findsuper.o
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o findsuper findsuper.o
+ $(CC) $(ALL_LDFLAGS) -o findsuper findsuper.o
partinfo: partinfo.o
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o partinfo partinfo.o
+ $(CC) $(ALL_LDFLAGS) -o partinfo partinfo.o
-e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBBLKID) $(LIBEXT2FS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o e2initrd_helper e2initrd_helper.o $(LIBS) \
+e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBBLKID) $(DEPLIBEXT2FS)
+ $(CC) $(ALL_LDFLAGS) -o e2initrd_helper e2initrd_helper.o $(LIBS) \
$(LIBBLKID) $(LIBEXT2FS) $(LIBINTL)
tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBBLKID) \
- $(DEPLIBUUID) $(LIBEXT2FS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS) \
+ $(DEPLIBUUID) $(DEPLIBEXT2FS)
+ $(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS) \
$(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) $(LIBS_E2P) $(LIBINTL)
tune2fs.static: $(TUNE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBBLKID)
- @echo " LD $@"
- @$(CC) $(LDFLAGS_STATIC) -o tune2fs.static $(TUNE2FS_OBJS) \
+ $(CC) $(LDFLAGS_STATIC) -o tune2fs.static $(TUNE2FS_OBJS) \
$(STATIC_LIBS) $(STATIC_LIBBLKID) $(STATIC_LIBUUID) \
$(STATIC_LIBE2P) $(LIBINTL)
tune2fs.profiled: $(PROFILED_TUNE2FS_OBJS) $(PROFILED_DEPLIBS) \
$(PROFILED_E2P) $(DEPPROFILED_LIBBLKID) $(DEPPROFILED_LIBUUID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o tune2fs.profiled \
+ $(CC) $(ALL_LDFLAGS) -g -pg -o tune2fs.profiled \
$(PROFILED_TUNE2FS_OBJS) $(PROFILED_LIBBLKID) \
$(PROFILED_LIBUUID) $(PROFILED_LIBE2P) $(LIBINTL) \
$(PROFILED_LIBS)
-blkid: $(BLKID_OBJS) $(DEPLIBBLKID) $(LIBEXT2FS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBBLKID) $(LIBINTL) \
- $(LIBEXT2FS)
+blkid: $(BLKID_OBJS) $(DEPLIBBLKID) $(DEPLIBEXT2FS) $(DEPLIBCOM_ERR)
+ $(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBBLKID) $(LIBINTL) \
+ $(LIBEXT2FS) $(LIBCOM_ERR)
blkid.profiled: $(PROFILED_BLKID_OBJS) $(DEPPROFILED_LIBBLKID) \
$(PROFILED_LIBEXT2FS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o blkid.profiled $(PROFILED_BLKID_OBJS) \
+ $(CC) $(ALL_LDFLAGS) -g -pg -o blkid.profiled $(PROFILED_BLKID_OBJS) \
$(PROFILED_LIBBLKID) $(LIBINTL) $(PROFILED_LIBEXT2FS)
e2image: $(E2IMAGE_OBJS) $(DEPLIBS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS) $(LIBINTL)
+ $(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS) $(LIBINTL)
e2image.profiled: $(PROFILED_E2IMAGE_OBJS) $(PROFILED_DEPLIBS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o e2image.profiled \
+ $(CC) $(ALL_LDFLAGS) -g -pg -o e2image.profiled \
$(PROFILED_E2IMAGE_OBJS) $(PROFILED_LIBS) $(LIBINTL)
e2undo: $(E2UNDO_OBJS) $(DEPLIBS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o e2undo $(E2UNDO_OBJS) $(LIBS) $(LIBINTL)
+ $(CC) $(ALL_LDFLAGS) -o e2undo $(E2UNDO_OBJS) $(LIBS) $(LIBINTL)
e2undo.profiled: $(PROFILED_E2UNDO_OBJS) $(PROFILED_DEPLIBS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o e2undo.profiled \
+ $(CC) $(ALL_LDFLAGS) -g -pg -o e2undo.profiled \
$(PROFILED_E2UNDO_OBJS) $(PROFILED_LIBS) $(LIBINTL)
base_device: base_device.c
- @echo " LD $@"
- @$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(srcdir)/base_device.c \
+ $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(srcdir)/base_device.c \
-DDEBUG -o base_device
check:: base_device
@@ -189,267 +172,208 @@ check:: base_device
cmp $(srcdir)/base_device.tst base_device.out
mklost+found: $(MKLPF_OBJS)
$(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL)
+ $(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL)
-mke2fs: $(MKE2FS_OBJS) $(DEPLIBS) $(LIBE2P) $(DEPLIBUUID)
+mke2fs: $(MKE2FS_OBJS) $(DEPLIBS) $(DEPLIBE2P) $(DEPLIBUUID)
$(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBE2P) $(LIBUUID)
-mke2fs: $(MKE2FS_OBJS) $(DEPLIBS) $(LIBE2P) $(DEPLIBBLKID) $(DEPLIBUUID) \
- $(LIBEXT2FS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBBLKID) \
+mke2fs: $(MKE2FS_OBJS) $(DEPLIBS) $(DEPLIBE2P) $(DEPLIBBLKID) $(DEPLIBUUID) \
+ $(DEPLIBEXT2FS)
+ $(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBBLKID) \
$(LIBUUID) $(LIBEXT2FS) $(LIBE2P) $(LIBINTL)
mke2fs.static: $(MKE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBUUID) $(DEPSTATIC_LIBBLKID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -static -o mke2fs.static $(MKE2FS_OBJS) \
+ $(CC) $(ALL_LDFLAGS) -static -o mke2fs.static $(MKE2FS_OBJS) \
$(STATIC_LIBS) $(STATIC_LIBE2P) $(STATIC_LIBBLKID) \
$(STATIC_LIBUUID) $(LIBINTL)
mke2fs.profiled: $(PROFILED_MKE2FS_OBJS) $(PROFILED_DEPLIBS) \
$(PROFILED_LIBE2P) $(PROFILED_DEPLIBBLKID) $(PROFILED_DEPLIBUUID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o mke2fs.profiled \
+ $(CC) $(ALL_LDFLAGS) -g -pg -o mke2fs.profiled \
$(PROFILED_MKE2FS_OBJS) $(PROFILED_LIBBLKID) \
$(PROFILED_LIBUUID) $(PROFILED_LIBE2P) $(LIBINTL) \
$(PROFILED_LIBS)
chattr: $(CHATTR_OBJS) $(DEPLIBS_E2P)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS_E2P) $(LIBINTL)
+ $(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS_E2P) $(LIBINTL)
lsattr: $(LSATTR_OBJS) $(DEPLIBS_E2P)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o lsattr $(LSATTR_OBJS) $(LIBS_E2P) $(LIBINTL)
+ $(CC) $(ALL_LDFLAGS) -o lsattr $(LSATTR_OBJS) $(LIBS_E2P) $(LIBINTL)
uuidgen: $(UUIDGEN_OBJS) $(DEPLIBUUID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID) $(LIBINTL)
+ $(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID) $(LIBINTL)
uuidgen.profiled: $(PROFILED_UUIDGEN_OBJS) $(PROFILED_DEPLIBUUID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o uuidgen.profiled \
+ $(CC) $(ALL_LDFLAGS) -g -pg -o uuidgen.profiled \
$(PROFILED_UUIDGEN_OBJS) $(PROFILED_LIBUUID) $(LIBINTL)
uuidd: $(UUIDD_OBJS) $(DEPLIBUUID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o uuidd $(UUIDD_OBJS) $(LIBUUID) $(LIBINTL)
+ $(CC) $(ALL_LDFLAGS) -o uuidd $(UUIDD_OBJS) $(LIBUUID) $(LIBINTL)
uuidd.profiled: $(PROFILED_UUIDD_OBJS) $(PROFILED_DEPLIBUUID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o uuidd.profiled $(PROFILED_UUIDD_OBJS) \
+ $(CC) $(ALL_LDFLAGS) -g -pg -o uuidd.profiled $(PROFILED_UUIDD_OBJS) \
$(PROFILED_LIBUUID) $(LIBINTL)
dumpe2fs: $(DUMPE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBUUID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \
+ $(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \
$(LIBS_E2P) $(LIBUUID) $(LIBINTL)
dumpe2fs.profiled: $(PROFILED_DUMPE2FS_OBJS) $(PROFILED_DEPLIBS) \
$(PROFILED_LIBE2P) $(PROFILED_DEPLIBUUID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o dumpe2fs.profiled \
+ $(CC) $(ALL_LDFLAGS) -g -pg -o dumpe2fs.profiled \
$(PROFILED_DUMPE2FS_OBJS) $(PROFILED_LIBS) \
$(PROFILED_LIBE2P) $(PROFILED_LIBUUID) $(LIBINTL)
fsck: $(FSCK_OBJS) $(DEPLIBBLKID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBINTL)
+ $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBINTL)
fsck.profiled: $(PROFILED_FSCK_OBJS) $(PROFILED_DEPLIBBLKID)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o fsck.profiled $(PROFILED_FSCK_OBJS) \
+ $(CC) $(ALL_LDFLAGS) -g -pg -o fsck.profiled $(PROFILED_FSCK_OBJS) \
$(PROFILED_LIBBLKID) $(LIBINTL)
badblocks: $(BADBLOCKS_OBJS) $(DEPLIBS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS) $(LIBINTL)
+ $(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS) $(LIBINTL)
badblocks.profiled: $(PROFILED_BADBLOCKS_OBJS) $(PROFILED_DEPLIBS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o badblocks.profiled \
+ $(CC) $(ALL_LDFLAGS) -g -pg -o badblocks.profiled \
$(PROFILED_BADBLOCKS_OBJS) $(PROFILED_LIBS) $(LIBINTL)
logsave: logsave.o
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o logsave logsave.o
+ $(CC) $(ALL_LDFLAGS) -o logsave logsave.o
logsave.profiled: profiled/logsave.o
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o logsave.profiled profiled/logsave.o
+ $(CC) $(ALL_LDFLAGS) -g -pg -o logsave.profiled profiled/logsave.o
filefrag: $(FILEFRAG_OBJS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o filefrag $(FILEFRAG_OBJS)
+ $(CC) $(ALL_LDFLAGS) -o filefrag $(FILEFRAG_OBJS)
filefrag.profiled: $(PROFILED_FILEFRAG_OBJS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -g -pg -o filefrag.profiled \
+ $(CC) $(ALL_LDFLAGS) -g -pg -o filefrag.profiled \
$(PROFILED_FILEFRAG_OBJS)
tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS)
- @echo " LD $@"
$(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) $(LIBCOM_ERR)
tune2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/tune2fs.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/tune2fs.8.in tune2fs.8
+ $(SUBSTITUTE_UPTIME) $(srcdir)/tune2fs.8.in tune2fs.8
mklost+found.8: $(DEP_SUBSTITUTE) $(srcdir)/mklost+found.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/mklost+found.8.in mklost+found.8
+ $(SUBSTITUTE_UPTIME) $(srcdir)/mklost+found.8.in mklost+found.8
mke2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/mke2fs.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.8.in mke2fs.8
+ $(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.8.in mke2fs.8
mke2fs.conf.5: $(DEP_SUBSTITUTE) $(srcdir)/mke2fs.conf.5.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.conf.5.in mke2fs.conf.5
+ $(SUBSTITUTE_UPTIME) $(srcdir)/mke2fs.conf.5.in mke2fs.conf.5
e2label.8: $(DEP_SUBSTITUTE) $(srcdir)/e2label.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/e2label.8.in e2label.8
+ $(SUBSTITUTE_UPTIME) $(srcdir)/e2label.8.in e2label.8
e2undo.8: $(DEP_SUBSTITUTE) $(srcdir)/e2undo.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/e2undo.8.in e2undo.8
+ $(SUBSTITUTE_UPTIME) $(srcdir)/e2undo.8.in e2undo.8
findfs.8: $(DEP_SUBSTITUTE) $(srcdir)/findfs.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/findfs.8.in findfs.8
+ $(SUBSTITUTE_UPTIME) $(srcdir)/findfs.8.in findfs.8
e2image.8: $(DEP_SUBSTITUTE) $(srcdir)/e2image.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/e2image.8.in e2image.8
+ $(SUBSTITUTE_UPTIME) $(srcdir)/e2image.8.in e2image.8
dumpe2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/dumpe2fs.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/dumpe2fs.8.in dumpe2fs.8
+ $(SUBSTITUTE_UPTIME) $(srcdir)/dumpe2fs.8.in dumpe2fs.8
badblocks.8: $(DEP_SUBSTITUTE) $(srcdir)/badblocks.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/badblocks.8.in badblocks.8
+ $(SUBSTITUTE_UPTIME) $(srcdir)/badblocks.8.in badblocks.8
fsck.8: $(DEP_SUBSTITUTE) $(srcdir)/fsck.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/fsck.8.in fsck.8
+ $(SUBSTITUTE_UPTIME) $(srcdir)/fsck.8.in fsck.8
blkid.8: $(DEP_SUBSTITUTE) $(srcdir)/blkid.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/blkid.8.in blkid.8
+ $(SUBSTITUTE_UPTIME) $(srcdir)/blkid.8.in blkid.8
logsave.8: $(DEP_SUBSTITUTE) $(srcdir)/logsave.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/logsave.8.in logsave.8
+ $(SUBSTITUTE_UPTIME) $(srcdir)/logsave.8.in logsave.8
uuidd.8: $(DEP_SUBSTITUTE) $(srcdir)/uuidd.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuidd.8.in uuidd.8
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuidd.8.in uuidd.8
chattr.1: $(DEP_SUBSTITUTE) $(srcdir)/chattr.1.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/chattr.1.in chattr.1
+ $(SUBSTITUTE_UPTIME) $(srcdir)/chattr.1.in chattr.1
lsattr.1: $(DEP_SUBSTITUTE) $(srcdir)/lsattr.1.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/lsattr.1.in lsattr.1
+ $(SUBSTITUTE_UPTIME) $(srcdir)/lsattr.1.in lsattr.1
uuidgen.1: $(DEP_SUBSTITUTE) $(srcdir)/uuidgen.1.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuidgen.1.in uuidgen.1
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuidgen.1.in uuidgen.1
blkid.1: $(DEP_SUBSTITUTE) $(srcdir)/blkid.1.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/blkid.1.in blkid.1
+ $(SUBSTITUTE_UPTIME) $(srcdir)/blkid.1.in blkid.1
filefrag.8: $(DEP_SUBSTITUTE) $(srcdir)/filefrag.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
+ $(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
installdirs:
- @echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
+ $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
$(DESTDIR)$(libdir) $(DESTDIR)/$(root_sysconfdir)
mke2fs.static: $(MKE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBUUID)
@@ -145,11 +145,9 @@ installdirs:
install: all $(SMANPAGES) $(UMANPAGES) installdirs
for i in $(SPROGS); do \
- @for i in $(SPROGS); do \
- echo " INSTALL $(root_sbindir)/$$i"; \
+ for i in $(SPROGS); do \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
- $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
done
for i in $(USPROGS); do \
- @for i in $(USPROGS); do \
- echo " INSTALL $(sbindir)/$$i"; \
+ for i in $(USPROGS); do \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
- $(STRIP) $(DESTDIR)$(sbindir)/$$i; \
done
$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
- @echo " LINK $(root_sbindir)/mkfs.ext2"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+ $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
$(DESTDIR)$(root_sbindir)/mkfs.ext2
@@ -159,7 +157,6 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs
- @echo " LINK $(root_sbindir)/mkfs.ext3"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+ $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
$(DESTDIR)$(root_sbindir)/mkfs.ext3
- @echo " LINK $(root_sbindir)/mkfs.ext4"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+ $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
$(DESTDIR)$(root_sbindir)/mkfs.ext4
- @echo " LINK $(root_sbindir)/mkfs.ext4dev"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+ $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
$(DESTDIR)$(root_sbindir)/mkfs.ext4dev
- @echo " LINK $(root_sbindir)/e2label"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
+ $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
$(DESTDIR)$(root_sbindir)/e2label
for i in $(UPROGS); do \
- @echo " LINK $(root_sbindir)/findfs"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
+ $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
$(DESTDIR)$(root_sbindir)/findfs
- @for i in $(UPROGS); do \
- echo " INSTALL $(bindir)/$$i"; \
+ for i in $(UPROGS); do \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \
- $(STRIP) $(DESTDIR)$(bindir)/$$i; \
done
for i in $(SMANPAGES); do \
$(RM) -f $(DESTDIR)$(man8dir)/$$i.gz; \
- @for i in $(LPROGS); do \
- echo " INSTALL $(libdir)/$$i"; \
+ for i in $(LPROGS); do \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(libdir)/$$i; \
done
- @for i in $(SMANPAGES); do \
+ for i in $(SMANPAGES); do \
for j in $(COMPRESS_EXT); do \
$(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
done; \
- echo " INSTALL_DATA $(man8dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
done
- @$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
+ $(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
$(DESTDIR)$(man8dir)/mkfs.ext3.8.gz
- @echo " LINK mkfs.ext2.8"
- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+ $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
$(DESTDIR)$(man8dir)/mkfs.ext2.8
- @echo " LINK mkfs.ext3.8"
- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+ $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
$(DESTDIR)$(man8dir)/mkfs.ext3.8
- @echo " LINK mkfs.ext4.8"
- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+ $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
$(DESTDIR)$(man8dir)/mkfs.ext4.8
- @echo " LINK mkfs.ext4dev.8"
- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
+ $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
$(DESTDIR)$(man8dir)/mkfs.ext4dev.8
- @for i in $(UMANPAGES); do \
+ for i in $(UMANPAGES); do \
for j in $(COMPRESS_EXT); do \
$(RM) -f $(DESTDIR)$(man1dir)/$$i.$$j; \
done; \
- echo " INSTALL_DATA $(man1dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man1dir)/$$i; \
done
- @for i in $(FMANPAGES); do \
+ for i in $(FMANPAGES); do \
for j in $(COMPRESS_EXT); do \
$(RM) -f $(DESTDIR)$(man5dir)/$$i.$$j; \
done; \
- echo " INSTALL_DATA $(man5dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
done
- @if test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
+ if test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \
if cmp -s $(DESTDIR)$(root_sysconfdir)/mke2fs.conf \
$(srcdir)/mke2fs.conf; then \
true; \
else \
if grep -q ext4dev $(DESTDIR)$(root_sysconfdir)/mke2fs.conf ; then \
- echo " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf.e2fsprogs-new"; \
$(INSTALL_DATA) $(srcdir)/mke2fs.conf \
$(DESTDIR)$(root_sysconfdir)/mke2fs.conf.e2fsprogs-new; \
echo "Warning: installing mke2fs.conf in $(DESTDIR)$(root_sysconfdir)/mke2fs.conf.e2fsprogs-new"; \
@@ -467,18 +391,15 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs
echo " "; \
fi; \
else \
- echo " INSTALL_DATA $(root_sysconfdir)/mke2fs.conf"; \
$(INSTALL_DATA) $(srcdir)/mke2fs.conf \
- $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \
+ $(DESTDIR)$(datadir)/examples/mke2fs.conf; \
fi
install-strip: install
- @for i in $(SPROGS); do \
- echo " STRIP $(root_sbindir)/$$i"; \
+ for i in $(SPROGS); do \
$(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
done
- @for i in $(USPROGS); do \
- echo " STRIP $(sbindir)/$$i"; \
+ for i in $(USPROGS); do \
$(STRIP) $(DESTDIR)$(sbindir)/$$i; \
done

8
sysutils/e2fsprogs/patches/patch-misc_fsck_8_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-misc_fsck_8_in,v 1.1.1.1 2004/02/20 19:54:58 espie Exp $
--- misc/fsck.8.in.orig 2004-02-20 20:42:54.000000000 +0100
+++ misc/fsck.8.in 2004-02-20 20:43:50.000000000 +0100
$OpenBSD: patch-misc_fsck_8_in,v 1.2 2009/03/15 19:59:31 landry Exp $
--- misc/fsck.8.in.orig Wed Apr 2 17:56:12 2008
+++ misc/fsck.8.in Sat Feb 21 16:54:47 2009
@@ -2,11 +2,11 @@
.\" Copyright 1993, 1994, 1995 by Theodore Ts'o. All Rights Reserved.
.\" This file may be copied under the terms of the GNU Public License.
@ -14,5 +14,5 @@ $OpenBSD: patch-misc_fsck_8_in,v 1.1.1.1 2004/02/20 19:54:58 espie Exp $
-.B fsck
+.B pfsck
[
.B \-sACVRTNP
.B \-sAVRTMNP
]

78
sysutils/e2fsprogs/patches/patch-resize_Makefile_in
View File

@ -1,20 +1,70 @@
$OpenBSD: patch-resize_Makefile_in,v 1.2 2006/02/20 16:51:46 aanriot Exp $
--- resize/Makefile.in.orig Fri Mar 8 07:05:02 2002
+++ resize/Makefile.in Sun Feb 19 18:15:12 2006
@@ -26,7 +26,7 @@ SRCS= $(srcdir)/extent.c \
$OpenBSD: patch-resize_Makefile_in,v 1.3 2009/03/15 19:59:31 landry Exp $
--- resize/Makefile.in.orig Sat Jun 30 14:58:35 2007
+++ resize/Makefile.in Sun Feb 22 11:52:47 2009
@@ -27,56 +27,47 @@ SRCS= $(srcdir)/extent.c \
$(srcdir)/sim_progress.c
LIBS= $(LIBEXT2FS) $(LIBCOM_ERR)
-DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR)
+DEPLIBS= $(DEPLIBEXT2FS) $(DEPLIBCOM_ERR)
LIBS= $(LIBE2P) $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBINTL)
-DEPLIBS= $(LIBE2P) $(LIBEXT2FS) $(LIBCOM_ERR)
+DEPLIBS= $(DEPLIBE2P) $(DEPLIBEXT2FS) $(DEPLIBCOM_ERR)
STATIC_LIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) \
$(LIBINTL)
STATIC_DEPLIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR)
.c.o:
- @echo " CC $<"
- @$(CC) -c $(ALL_CFLAGS) $< -o $@
+ $(CC) -c $(ALL_CFLAGS) $< -o $@
all:: $(PROGS) $(TEST_PROGS) $(MANPAGES)
resize2fs: $(RESIZE_OBJS) $(DEPLIBS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o resize2fs $(RESIZE_OBJS) $(LIBS)
+ $(CC) $(ALL_LDFLAGS) -o resize2fs $(RESIZE_OBJS) $(LIBS)
resize2fs.static: $(RESIZE_OBJS) $(STATIC_DEPLIBS)
- @echo " LD $@"
- @$(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o resize2fs.static \
+ $(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o resize2fs.static \
$(RESIZE_OBJS) $(STATIC_LIBS)
resize2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/resize2fs.8.in
- @echo " SUBST $@"
- @$(SUBSTITUTE_UPTIME) $(srcdir)/resize2fs.8.in resize2fs.8
+ $(SUBSTITUTE_UPTIME) $(srcdir)/resize2fs.8.in resize2fs.8
test_extent: $(TEST_EXTENT_OBJS)
- @echo " LD $@"
- @$(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS)
+ $(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS)
installdirs:
- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
+ $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
$(DESTDIR)$(man8dir)
STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR)
STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR)
@@ -56,7 +56,6 @@ installdirs:
install: $(PROGS) $(MANPAGES) installdirs
for i in $(PROGS); do \
- @for i in $(PROGS); do \
- echo " INSTALL $(root_sbindir)/$$i"; \
+ for i in $(PROGS); do \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
- $(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
done
for i in $(MANPAGES); do \
$(RM) -f $(DESTDIR)$(man8dir)/$$i.gz; \
- @for i in $(MANPAGES); do \
+ for i in $(MANPAGES); do \
for j in $(COMPRESS_EXT); do \
$(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
done; \
- echo " INSTALL_DATA $(man8dir)/$$i"; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
done
install-strip: install
- @for i in $(PROGS); do \
- echo " STRIP $(root_sbindir)/$$i"; \
+ for i in $(PROGS); do \
$(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
done

10
sysutils/e2fsprogs/patches/patch-tests_progs_Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-tests_progs_Makefile_in,v 1.2 2008/11/22 11:06:15 ajacoutot Exp $
--- tests/progs/Makefile.in.orig Sun Feb 24 22:04:04 2002
+++ tests/progs/Makefile.in Sat Nov 22 11:56:10 2008
$OpenBSD: patch-tests_progs_Makefile_in,v 1.3 2009/03/15 19:59:31 landry Exp $
--- tests/progs/Makefile.in.orig Wed Jun 18 05:53:42 2008
+++ tests/progs/Makefile.in Sat Feb 21 17:12:42 2009
@@ -22,7 +22,7 @@ TEST_ICOUNT_OBJS= test_icount.o test_icount_cmds.o
SRCS= $(srcdir)/test_rel.c
LIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR)
-DEPLIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR)
-DEPLIBS= $(LIBEXT2FS) $(DEPLIBSS) $(LIBCOM_ERR)
+DEPLIBS= $(DEPLIBEXT2FS) $(DEPLIBSS) $(DEPLIBCOM_ERR)
.c.o:
$(CC) -c $(ALL_CFLAGS) $< -o $@
@echo " CC $<"

23
sysutils/e2fsprogs/patches/patch-tests_u_mke2fs_script Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-tests_u_mke2fs_script,v 1.1 2009/03/15 19:59:31 landry Exp $
--- tests/u_mke2fs/script.orig Sun Feb 22 12:52:58 2009
+++ tests/u_mke2fs/script Sun Feb 22 12:53:14 2009
@@ -11,16 +11,16 @@ dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/nul
echo mke2fs -q -F -o Linux -b 1024 test.img > $OUT
$MKE2FS -F -o Linux -I 128 -b 1024 $TMPFILE >> $OUT 2>&1
-md5=`md5sum $TMPFILE | cut -d " " -f 1`
+md5=`md5 $TMPFILE | cut -d " " -f 1`
echo md5sum before mke2fs $md5 >> $OUT
echo using mke2fs to test e2undo >> $OUT
$MKE2FS -q -F -o Linux -I 256 -O uninit_bg -E lazy_itable_init=1 -b 1024 $TMPFILE >> $OUT 2>&1
-new_md5=`md5sum $TMPFILE | cut -d " " -f 1`
+new_md5=`md5 $TMPFILE | cut -d " " -f 1`
echo md5sum after mke2fs $new_md5 >> $OUT
$E2UNDO_EXE $TDB_FILE $TMPFILE >> $OUT 2>&1
-new_md5=`md5sum $TMPFILE | cut -d " " -f 1`
+new_md5=`md5 $TMPFILE | cut -d " " -f 1`
echo md5sum after e2undo $new_md5 >> $OUT
if [ $md5 = $new_md5 ]; then

23
sysutils/e2fsprogs/patches/patch-tests_u_tune2fs_script Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-tests_u_tune2fs_script,v 1.1 2009/03/15 19:59:31 landry Exp $
--- tests/u_tune2fs/script.orig Sun Feb 22 12:52:31 2009
+++ tests/u_tune2fs/script Sun Feb 22 12:52:48 2009
@@ -11,16 +11,16 @@ dd if=/dev/zero of=$TMPFILE bs=1k count=512 > /dev/nul
echo mke2fs -q -F -o Linux -b 1024 $TMPFILE > $OUT
$MKE2FS -q -F -o Linux -I 128 -b 1024 $TMPFILE >> $OUT 2>&1
-md5=`md5sum $TMPFILE | cut -d " " -f 1`
+md5=`md5 $TMPFILE | cut -d " " -f 1`
echo md5sum before tune2fs $md5 >> $OUT
echo using tune2fs to test e2undo >> $OUT
$TUNE2FS -I 256 $TMPFILE >> $OUT 2>&1
-new_md5=`md5sum $TMPFILE | cut -d " " -f 1`
+new_md5=`md5 $TMPFILE | cut -d " " -f 1`
echo md5sum after tune2fs $new_md5 >> $OUT
$E2UNDO_EXE $TDB_FILE $TMPFILE >> $OUT 2>&1
-new_md5=`md5sum $TMPFILE | cut -d " " -f 1`
+new_md5=`md5 $TMPFILE | cut -d " " -f 1`
echo md5sum after e2undo $new_md5 >> $OUT
if [ $md5 = $new_md5 ]; then

3
sysutils/e2fsprogs/pkg/PFRAG.shared-main
View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.1 2007/01/07 19:13:49 espie Exp $
@comment $OpenBSD: PFRAG.shared-main,v 1.2 2009/03/15 19:59:31 landry Exp $
@lib lib/libblkid.so.${LIBblkid_VERSION}
@lib lib/libe2p.so.${LIBe2p_VERSION}
@lib lib/libext2fs.so.${LIBext2fs_VERSION}
@lib lib/libext2fs_com_err.so.${LIBext2fs_com_err_VERSION}

111
sysutils/e2fsprogs/pkg/PLIST-main
View File

@ -1,57 +1,140 @@
@comment $OpenBSD: PLIST-main,v 1.2 2008/11/22 11:06:15 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.3 2009/03/15 19:59:31 landry Exp $
@bin bin/chattr
bin/compile_et
@bin bin/lsattr
bin/mk_cmds
include/blkid/
include/blkid/blkid.h
include/blkid/blkid_types.h
include/e2p/
include/e2p/e2p.h
include/et/
include/et/com_err.h
include/ext2fs/
include/ext2fs/bitops.h
include/ext2fs/brel.h
include/ext2fs/dosio.h
include/ext2fs/e2image.h
include/ext2fs/ext2_err.h
include/ext2fs/ext2_ext_attr.h
include/ext2fs/ext2_fs.h
include/ext2fs/ext2_io.h
include/ext2fs/ext2_types.h
include/ext2fs/ext2fs.h
include/ext2fs/ext2fsP.h
include/ext2fs/irel.h
include/ext2fs/jfs_compat.h
include/ext2fs/jfs_dat.h
include/ext2fs/jfs_user.h
include/ext2fs/kernel-jbd.h
include/ext2fs/kernel-list.h
include/ext2fs/ext3_extents.h
include/ext2fs/tdb.h
include/ss/
include/ss/ss.h
include/ss/ss_err.h
%%SHARED%%
@info info/libext2fs.info
@bin lib/e2initrd_helper
lib/libblkid.a
lib/libe2p.a
lib/libext2fs.a
lib/libext2fs_com_err.a
lib/libss.a
lib/pkgconfig/
lib/pkgconfig/blkid.pc
lib/pkgconfig/com_err.pc
lib/pkgconfig/e2p.pc
lib/pkgconfig/ext2fs.pc
lib/pkgconfig/ss.pc
@man man/man1/chattr.1
@man man/man1/compile_et.1
@man man/man1/lsattr.1
@man man/man1/mk_cmds.1
@man man/man3/com_err.3
@man man/man3/libblkid.3
@man man/man5/e2fsck.conf.5
@man man/man5/mke2fs.conf.5
@man man/man8/badblocks.8
@man man/man8/blkid.8
@man man/man8/debugfs.8
@man man/man8/dumpe2fs.8
@man man/man8/e2fsck.8
@man man/man8/e2image.8
@man man/man8/e2label.8
@man man/man8/e2undo.8
@man man/man8/filefrag.8
@man man/man8/findfs.8
@man man/man8/fsck.ext2.8
@man man/man8/fsck.ext3.8
@man man/man8/fsck.ext4.8
@man man/man8/fsck.ext4dev.8
@man man/man8/fsck_ext2fs.8
@man man/man8/logsave.8
@man man/man8/mke2fs.8
@man man/man8/mkfs.ext2.8
@man man/man8/mkfs.ext3.8
@man man/man8/mkfs.ext4.8
@man man/man8/mkfs.ext4dev.8
@man man/man8/mklost+found.8
@man man/man8/pfsck.8
@man man/man8/resize2fs.8
@man man/man8/tune2fs.8
@bin sbin/badblocks
@bin sbin/blkid
@bin sbin/debugfs
@bin sbin/dumpe2fs
@bin sbin/e2fsck
@bin sbin/e2image
@bin sbin/e2label
@bin sbin/e2undo
@bin sbin/filefrag
@bin sbin/findfs
@bin sbin/fsck.ext2
@bin sbin/fsck.ext3
@bin sbin/fsck.ext4
@bin sbin/fsck.ext4dev
@bin sbin/fsck_ext2fs
@bin sbin/logsave
@bin sbin/mke2fs
@bin sbin/mkfs.ext2
@bin sbin/mkfs.ext3
@bin sbin/mkfs.ext4
@bin sbin/mkfs.ext4dev
@bin sbin/mklost+found
@bin sbin/pfsck
@bin sbin/resize2fs
@bin sbin/tune2fs
%%SHARED%%
share/et/
share/et/et_c.awk
share/et/et_h.awk
share/examples/mke2fs.conf
@sample ${SYSCONFDIR}/mke2fs.conf
share/locale/
share/locale/ca/
share/locale/ca/LC_MESSAGES/
share/locale/ca/LC_MESSAGES/e2fsprogs.mo
share/locale/cs/
share/locale/cs/LC_MESSAGES/
share/locale/cs/LC_MESSAGES/e2fsprogs.mo
share/locale/de/
share/locale/de/LC_MESSAGES/
share/locale/de/LC_MESSAGES/e2fsprogs.mo
share/locale/es/
share/locale/es/LC_MESSAGES/
share/locale/es/LC_MESSAGES/e2fsprogs.mo
share/locale/fr/
share/locale/fr/LC_MESSAGES/
share/locale/fr/LC_MESSAGES/e2fsprogs.mo
share/locale/id/
share/locale/id/LC_MESSAGES/
share/locale/id/LC_MESSAGES/e2fsprogs.mo
share/locale/it/
share/locale/it/LC_MESSAGES/
share/locale/it/LC_MESSAGES/e2fsprogs.mo
share/locale/nl/
share/locale/nl/LC_MESSAGES/
share/locale/nl/LC_MESSAGES/e2fsprogs.mo
share/locale/pl/
share/locale/pl/LC_MESSAGES/
share/locale/pl/LC_MESSAGES/e2fsprogs.mo
share/locale/sv/
share/locale/sv/LC_MESSAGES/
share/locale/sv/LC_MESSAGES/e2fsprogs.mo
share/locale/tr/
share/locale/tr/LC_MESSAGES/
share/locale/tr/LC_MESSAGES/e2fsprogs.mo
share/locale/vi/
share/locale/vi/LC_MESSAGES/
share/locale/vi/LC_MESSAGES/e2fsprogs.mo
share/ss/
share/ss/ct_c.awk
share/ss/ct_c.sed

19
sysutils/e2fsprogs/pkg/PLIST-uuid
View File

@ -1,9 +1,22 @@
@comment $OpenBSD: PLIST-uuid,v 1.2 2008/11/22 11:06:15 ajacoutot Exp $
@comment $OpenBSD: PLIST-uuid,v 1.3 2009/03/15 19:59:31 landry Exp $
@bin bin/uuidgen
include/uuid/
include/uuid/uuid.h
include/uuid/uuidP.h
lib/pkgconfig/
lib/pkgconfig/e2fs-uuid.pc
lib/uuid/
lib/uuid/libuuid.a
@man man/man1/uuidgen.1
%%SHARED%%
@man man/man1/uuidgen.1
@man man/man3/uuid_clear.3
@man man/man3/uuid_compare.3
@man man/man3/uuid_copy.3
@man man/man3/uuid_generate.3
@man man/man3/uuid_generate_random.3
@man man/man3/uuid_generate_time.3
@man man/man3/uuid_is_null.3
@man man/man3/uuid_parse.3
@man man/man3/uuid_time.3
@man man/man3/uuid_unparse.3
@man man/man8/uuidd.8
@bin sbin/uuidd