diff options
| author | Matthias Andree <mandree@FreeBSD.org> | 2025-07-06 14:24:34 +0200 |
|---|---|---|
| committer | Matthias Andree <mandree@FreeBSD.org> | 2025-07-06 14:29:39 +0200 |
| commit | cfd7d5319a08fdbfb233930ade490dbd1127a77c (patch) | |
| tree | f8b715d5b200ce733b0f704d3249bfa0712ab273 /filesystems | |
| parent | 3f8d44451253c6fc31eae6ff5e28f4f5fd97c457 (diff) | |
filesystems/e2fsprogs*: do not install findfs
Which will conflict with util-linux, and seems to identify
itself as tune2fs.
Diffstat (limited to 'filesystems')
| -rw-r--r-- | filesystems/e2fsprogs-core/Makefile | 4 | ||||
| -rw-r--r-- | filesystems/e2fsprogs-core/pkg-plist | 2 | ||||
| -rw-r--r-- | filesystems/e2fsprogs/Makefile | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/filesystems/e2fsprogs-core/Makefile b/filesystems/e2fsprogs-core/Makefile index 74fc7d58dc0f..3635f56a551c 100644 --- a/filesystems/e2fsprogs-core/Makefile +++ b/filesystems/e2fsprogs-core/Makefile @@ -1,6 +1,6 @@ PORTNAME= e2fsprogs PORTVERSION= 1.47.2 -PORTREVISION?= 3 # NOTE: when bumping PORTREVISION, also bump ../e2fsprogs/Makefile! +PORTREVISION?= 4 # NOTE: when bumping PORTREVISION, also bump ../e2fsprogs/Makefile! CATEGORIES?= filesystems sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} @@ -317,6 +317,7 @@ post-install: .endif # remove or relocate files installed by other ports already, or shadowing system files: ${MV} ${STAGEDIR}${PREFIX}/bin/compile_et ${STAGEDIR}${PREFIX}/bin/e2fsprogs-compile_et + ${RM} ${STAGEDIR}${PREFIX}/sbin/findfs ${MV} ${STAGEDIR}${PREFIX}/share/man/man1/compile_et.1 ${STAGEDIR}${PREFIX}/share/man/man1/e2fsprogs-compile_et.1 ${MKDIR} ${STAGEDIR}${DATADIR}/et/ ${MV} ${STAGEDIR}${PREFIX}/share/et/* ${STAGEDIR}${DATADIR}/et/ @@ -325,6 +326,7 @@ post-install: ${MV} -f ${STAGEDIR}${PREFIX}/share/man/man3/com_err.3 \ ${STAGEDIR}${PREFIX}/share/man/man3/e2fsprogs-com_err.3 ${RM} ${STAGEDIR}${PREFIX}/share/man/man3/libblkid.3 + ${RM} ${STAGEDIR}${PREFIX}/share/man/man8/findfs.8 # # the next line closes .if ${MASTERDIR} == ${.CURDIR} diff --git a/filesystems/e2fsprogs-core/pkg-plist b/filesystems/e2fsprogs-core/pkg-plist index aa62bd55cd74..9968e202315e 100644 --- a/filesystems/e2fsprogs-core/pkg-plist +++ b/filesystems/e2fsprogs-core/pkg-plist @@ -59,7 +59,6 @@ share/man/man8/e2image.8.gz share/man/man8/e2label.8.gz share/man/man8/e2mmpstatus.8.gz share/man/man8/e2undo.8.gz -share/man/man8/findfs.8.gz share/man/man8/mke2fs.8.gz share/man/man8/mklost+found.8.gz share/man/man8/resize2fs.8.gz @@ -82,7 +81,6 @@ sbin/e2image sbin/e2label sbin/e2mmpstatus sbin/e2undo -sbin/findfs sbin/fsck.ext2 sbin/fsck.ext3 sbin/fsck.ext4 diff --git a/filesystems/e2fsprogs/Makefile b/filesystems/e2fsprogs/Makefile index 21f6e3e86452..b54a99e70fad 100644 --- a/filesystems/e2fsprogs/Makefile +++ b/filesystems/e2fsprogs/Makefile @@ -1,7 +1,7 @@ PORTNAME= e2fsprogs CATEGORIES= filesystems sysutils PORTVERSION= 1.47.2 -PORTREVISION= 3 +PORTREVISION= 4 BUILD_DEPENDS= e2fsprogs-core=${PORTVERSION}${${PORTREVISION} > 0:?_${PORTREVISION}:}:filesystems/e2fsprogs-core RUN_DEPENDS= ${BUILD_DEPENDS} DISTFILES= # empty |