diff options
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/e2fsprogs/Makefile | 16 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/distinfo | 2 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/files/patch-MCONFIG.in | 15 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/files/patch-debugfs::Makefile.in | 9 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/files/patch-lib::ext2fs::ismounted.c | 104 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/pkg-plist | 8 |
6 files changed, 130 insertions, 24 deletions
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index 936380d3b15c..e0efb0299332 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -6,7 +6,7 @@ # PORTNAME= e2fsprogs -PORTVERSION= 1.22 +PORTVERSION= 1.27 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -24,15 +24,23 @@ CONFIGURE_ENV= CPPFLAGS="-I/usr/include -I${LOCALBASE}/include \ MAN1= chattr.1 lsattr.1 uuidgen.1 MAN8= badblocks.8 debugfs.8 dumpe2fs.8 e2fsck.8 e2image.8 e2label.8 fsck.8 \ - mke2fs.8 mklost+found.8 resize2fs.8 tune2fs.8 + mke2fs.8 mklost+found.8 resize2fs.8 tune2fs.8 \ + fsck.ext2.8 fsck.ext3.8 mkfs.ext2.8 mkfs.ext3.8 post-patch: + @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${CHMOD} 644 @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \ 's|LIST_HEAD|LIN_LST_HEAD|g ; \ s|et/com_err.h|com_err.h|g ; s|<malloc.h>|<stdlib.h>|' +pre-build: + @cd ${WRKSRC}/lib/et && ${GMAKE} + @cd ${WRKSRC}/lib/ss && ${GMAKE} + post-install: - ${MKDIR} ${PREFIX}/include/ext2fs - ${INSTALL_DATA} ${WRKSRC}/lib/ext2fs/*.h ${PREFIX}/include/ext2fs + @${MKDIR} ${PREFIX}/include/ext2fs + @${INSTALL_DATA} ${WRKSRC}/lib/ext2fs/*.h ${PREFIX}/include/ext2fs + @${MKDIR} ${PREFIX}/include/uuid + @${INSTALL_DATA} ${WRKSRC}/lib/uuid/*.h ${PREFIX}/include/uuid .include <bsd.port.mk> diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo index f75e84eee072..733829b77aba 100644 --- a/sysutils/e2fsprogs/distinfo +++ b/sysutils/e2fsprogs/distinfo @@ -1 +1 @@ -MD5 (e2fsprogs-1.22.tar.gz) = a2b689fda4e954df0258c2605bc65d9b +MD5 (e2fsprogs-1.27.tar.gz) = 485b43875becc98dd11ac4c2a30dd734 diff --git a/sysutils/e2fsprogs/files/patch-MCONFIG.in b/sysutils/e2fsprogs/files/patch-MCONFIG.in index 21bdc912776c..293447620344 100644 --- a/sysutils/e2fsprogs/files/patch-MCONFIG.in +++ b/sysutils/e2fsprogs/files/patch-MCONFIG.in @@ -1,15 +1,10 @@ - -$FreeBSD$ - ---- MCONFIG.in.orig Sat Jun 23 07:25:59 2001 -+++ MCONFIG.in Tue Jul 3 18:29:41 2001 -@@ -57,15 +57,15 @@ - # Library definitions +--- MCONFIG.in.orig Mon Feb 25 05:03:57 2002 ++++ MCONFIG.in Sun Aug 4 15:15:37 2002 +@@ -57,14 +57,14 @@ # LIB = $(top_builddir)/lib --LIBSS = $(LIB)/libss@LIB_EXT@ + LIBSS = $(LIB)/libss@LIB_EXT@ -LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ -+LIBSS = /usr/lib/libss.so +LIBCOM_ERR = /usr/lib/libcom_err.so LIBE2P = $(LIB)/libe2p@LIB_EXT@ LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@ @@ -18,7 +13,7 @@ $FreeBSD$ -STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@ -STATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@ -+STATIC_LIBSS = /usr/lib/libss.a ++STATIC_LIBSS = STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@ +STATIC_LIBCOM_ERR = /usr/lib/libcom_err.a STATIC_LIBE2P = $(LIB)/libe2p@STATIC_LIB_EXT@ STATIC_LIBEXT2FS = $(LIB)/libext2fs@STATIC_LIB_EXT@ diff --git a/sysutils/e2fsprogs/files/patch-debugfs::Makefile.in b/sysutils/e2fsprogs/files/patch-debugfs::Makefile.in index ba4235916a3b..df1254f27733 100644 --- a/sysutils/e2fsprogs/files/patch-debugfs::Makefile.in +++ b/sysutils/e2fsprogs/files/patch-debugfs::Makefile.in @@ -3,15 +3,6 @@ $FreeBSD$ --- debugfs/Makefile.in.orig Sat Jun 23 07:25:59 2001 +++ debugfs/Makefile.in Tue Jul 3 18:49:18 2001 -@@ -14,7 +14,7 @@ - PROGS= debugfs - MANPAGES= debugfs.8 - --MK_CMDS= _SS_DIR_OVERRIDE=../lib/ss ../lib/ss/mk_cmds -+MK_CMDS= mk_cmds - - DEBUG_OBJS= debug_cmds.o debugfs.o util.o ncheck.o icheck.o ls.o \ - lsdel.o dump.o setsuper.o logdump.o @@ -75,9 +75,9 @@ # the Makefile.in file # diff --git a/sysutils/e2fsprogs/files/patch-lib::ext2fs::ismounted.c b/sysutils/e2fsprogs/files/patch-lib::ext2fs::ismounted.c new file mode 100644 index 000000000000..198b3ae4179a --- /dev/null +++ b/sysutils/e2fsprogs/files/patch-lib::ext2fs::ismounted.c @@ -0,0 +1,104 @@ +--- lib/ext2fs/ismounted.c.orig Mon Feb 25 05:03:59 2002 ++++ lib/ext2fs/ismounted.c Sun Aug 4 02:51:39 2002 +@@ -146,50 +146,6 @@ + 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 @@ + 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 diff --git a/sysutils/e2fsprogs/pkg-plist b/sysutils/e2fsprogs/pkg-plist index ec2c0836c14c..15dd4d1090ac 100644 --- a/sysutils/e2fsprogs/pkg-plist +++ b/sysutils/e2fsprogs/pkg-plist @@ -6,14 +6,20 @@ 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/uuid/uuid.h +include/uuid/uuidP.h info/libext2fs.info.gz lib/libe2p.a lib/libe2p.so @@ -35,7 +41,9 @@ sbin/fsck.ext2 sbin/fsck.ext3 sbin/mke2fs sbin/mkfs.ext2 +sbin/mkfs.ext3 sbin/mklost+found sbin/resize2fs sbin/tune2fs +@dirrm include/uuid @dirrm include/ext2fs |