summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorMatthias Andree <mandree@FreeBSD.org>2022-10-01 16:34:10 +0200
committerMatthias Andree <mandree@FreeBSD.org>2022-10-01 16:54:55 +0200
commit14e733a6bb4b99ae6fbbab6cb9d6b133583daabb (patch)
tree085fe22653711de51bdff2068cb062d002a7023a /misc
parentdevel/py-grpcio-tools: update to 1.49.1, also fix building on i386. (diff)
sysutils/e2fsprogs: 1/2 rename to -core, strip FLAVORS and /sbin
This is the first commit that renames e2fsprogs to e2fsprogs-core, makes the necessary changes to Makefiles, strips the FLAVORs that determined how to link or copy to /sbin. The latter feature will be placed into a new e2fsprogs port that just copies two files to /sbin. A followup 2/2 commit will then add the new e2fsprogs port. This is done so that Git can properly track the rename. While here, switch from FreeBSD's dd to GNU coreutils's dd in an attempt to fix sporadic m_offset self-test failures.
Diffstat (limited to 'misc')
-rw-r--r--misc/e2fsprogs-libblkid/Makefile4
-rw-r--r--misc/e2fsprogs-libuuid/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/misc/e2fsprogs-libblkid/Makefile b/misc/e2fsprogs-libblkid/Makefile
index 8dfd267d7a05..40e8a7e25a15 100644
--- a/misc/e2fsprogs-libblkid/Makefile
+++ b/misc/e2fsprogs-libblkid/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= misc devel
PKGNAMESUFFIX= -libblkid
@@ -11,7 +11,7 @@ LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid
CONFIGURE_ARGS= --enable-elf-shlibs --disable-libuuid --enable-libblkid
-MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs
+MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs-core
MAKE_ARGS= LIB_SUBDIRS=lib/blkid LDFLAGS_SHLIB=-L${LOCALBASE}/lib
USE_LDCONFIG= yes
ALL_TARGET= libs
diff --git a/misc/e2fsprogs-libuuid/Makefile b/misc/e2fsprogs-libuuid/Makefile
index 5783954bc643..98e76cf896a3 100644
--- a/misc/e2fsprogs-libuuid/Makefile
+++ b/misc/e2fsprogs-libuuid/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= misc devel
PKGNAMESUFFIX= -libuuid
@@ -10,7 +10,7 @@ LICENSE_FILE= ${INSTALL_WRKSRC}/COPYING
CONFIGURE_ARGS= --enable-elf-shlibs --enable-libuuid
OPTIONS_EXCLUDE= NLS
-MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs
+MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs-core
MAKE_ARGS= LIB_SUBDIRS=lib/uuid
USE_LDCONFIG= yes
ALL_TARGET= libs