devel/e2fsprogs-libss: merge to sysutils/e2fsprogs

This is to break dependency cycles between e2fsprogs-libss and
e2fsprogs (see 254751 comment #18 for details), and to avoid creating
yet another split-out port, then for e2fsprogs's libcom_err.

Bump PORTREVISION of the four e2fsprogs consumers to flush out
their e2fsprogs-libss dependency records.

PR:		254751
Reported by:	Felix Palmen
PR:		261217
Reported by:	tech-lists@zyxst.net
Fixes:		8e6ae60 devel/e2fsprogs-libss: use local compile_et...

Approved by:	prior maintainer timeout (Ben Kaduk, 7 months) on 254751

4 files changed, 20 insertions, 16 deletions

diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index d484531df454..45e9ef9ed007 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -14,7 +14,7 @@
 
 PORTNAME=	e2fsprogs
 PORTVERSION=	1.46.4
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	sysutils
 MASTER_SITES=	KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
 
@@ -87,7 +87,6 @@ BASHTESTS_BUILD_DEPENDS=	${BASH_CMD}:shells/bash
 BASH_CMD=	${LOCALBASE}/bin/bash
 
 LIB_DEPENDS+=	libblkid.so:misc/e2fsprogs-libblkid
-LIB_DEPENDS+=	libss.so:devel/e2fsprogs-libss
 LIB_DEPENDS+=	libuuid.so:misc/e2fsprogs-libuuid
 
 LIBUNWIND_LIB_DEPENDS=	libunwind.so:devel/libunwind
@@ -231,6 +230,8 @@ BROKEN=	it was not tested on your system by the maintainer; you must run self-te
 pre-build:
 # fix up Makefile ordering for parallel builds
 	cd ${WRKSRC}/lib/et && ${DO_MAKE_BUILD} compile_et
+	cd ${WRKSRC}/lib/ss && _ET_DIR_OVERRIDE=../et ../et/compile_et ss_err.et \
+		&& ${REINPLACE_CMD} -f ${FILESDIR}/fix-ss_err.h.sed ss_err.h
 	cd ${WRKSRC}/lib/support && ${DO_MAKE_BUILD} prof_err.h
 
 .if ${PORT_OPTIONS:MPARALLELTESTS}
@@ -352,7 +353,7 @@ post-install:
 	# remove or relocate files installed by other ports already, or shadowing system files:
 	cd ${STAGEDIR}${PREFIX} && \
 		${XARGS} <${FILESDIR}/unwanted ${RM} && \
-		${RMDIR} include/e2fsprogs/blkid include/e2fsprogs/ss share/ss
+		${RMDIR} include/e2fsprogs/blkid
 	${MV} ${STAGEDIR}${PREFIX}/bin/compile_et ${STAGEDIR}${PREFIX}/bin/e2fsprogs-compile_et
 	${MV} ${STAGEDIR}${PREFIX}/man/man1/compile_et.1 ${STAGEDIR}${PREFIX}/man/man1/e2fsprogs-compile_et.1
 	${MKDIR} ${STAGEDIR}${DATADIR}/et/
diff --git a/sysutils/e2fsprogs/files/fix-ss_err.h.sed b/sysutils/e2fsprogs/files/fix-ss_err.h.sed
new file mode 100644
index 000000000000..1b72045c519b
--- /dev/null
+++ b/sysutils/e2fsprogs/files/fix-ss_err.h.sed
@@ -0,0 +1,3 @@
+/#define __ss_err_h__/a\
+#include <stdio.h>
+#include <com_err.h>
diff --git a/sysutils/e2fsprogs/files/unwanted b/sysutils/e2fsprogs/files/unwanted
index a49d88186c6c..693deb364915 100644
--- a/sysutils/e2fsprogs/files/unwanted
+++ b/sysutils/e2fsprogs/files/unwanted
@@ -1,21 +1,8 @@
-bin/mk_cmds
 include/e2fsprogs/blkid/blkid.h
 include/e2fsprogs/blkid/blkid_types.h
-include/e2fsprogs/ss/ss.h
-include/e2fsprogs/ss/ss_err.h
 lib/e2fsprogs/libblkid.a
 lib/e2fsprogs/libblkid.so
 lib/e2fsprogs/libblkid.so.1
 lib/e2fsprogs/libblkid.so.1.0
-lib/e2fsprogs/libcom_err.a
-lib/e2fsprogs/libss.a
-lib/e2fsprogs/libss.so
-lib/e2fsprogs/libss.so.2
-lib/e2fsprogs/libss.so.2.0
 libdata/pkgconfig/blkid.pc
-libdata/pkgconfig/ss.pc
-man/man1/mk_cmds.1
-man/man3/com_err.3
 man/man3/libblkid.3
-share/ss/ct_c.awk
-share/ss/ct_c.sed
diff --git a/sysutils/e2fsprogs/pkg-plist b/sysutils/e2fsprogs/pkg-plist
index 83a2baf4e486..c6eb8d74c70f 100644
--- a/sysutils/e2fsprogs/pkg-plist
+++ b/sysutils/e2fsprogs/pkg-plist
@@ -4,6 +4,7 @@ bin/chattr
 bin/e2fsprogs-compile_et
 %%FUSEFS%%bin/fuse2fs
 bin/lsattr
+bin/mk_cmds
 etc/mke2fs.conf.dist
 include/e2fsprogs/com_err.h
 include/e2fsprogs/e2p/e2p.h
@@ -19,6 +20,9 @@ include/e2fsprogs/ext2fs/ext3_extents.h
 include/e2fsprogs/ext2fs/hashmap.h
 include/e2fsprogs/ext2fs/qcow2.h
 include/e2fsprogs/ext2fs/tdb.h
+include/e2fsprogs/ss/ss.h
+include/e2fsprogs/ss/ss_err.h
+lib/e2fsprogs/libcom_err.a
 lib/e2fsprogs/libcom_err.so
 lib/e2fsprogs/libcom_err.so.2
 lib/e2fsprogs/libcom_err.so.2.1
@@ -30,13 +34,20 @@ lib/e2fsprogs/libext2fs.a
 lib/e2fsprogs/libext2fs.so
 lib/e2fsprogs/libext2fs.so.2
 lib/e2fsprogs/libext2fs.so.2.4
+lib/e2fsprogs/libss.so.2.0
+lib/e2fsprogs/libss.so
+lib/e2fsprogs/libss.a
+lib/e2fsprogs/libss.so.2
 libdata/pkgconfig/com_err.pc
 libdata/pkgconfig/e2p.pc
 libdata/pkgconfig/ext2fs.pc
+libdata/pkgconfig/ss.pc
 man/man1/chattr.1.gz
 man/man1/e2fsprogs-compile_et.1.gz
 %%FUSEFS%%man/man1/fuse2fs.1.gz
 man/man1/lsattr.1.gz
+man/man1/mk_cmds.1.gz
+man/man3/com_err.3.gz
 man/man5/e2fsck.conf.5.gz
 man/man5/mke2fs.conf.5.gz
 man/man5/ext2.5.gz
@@ -112,3 +123,5 @@ sbin/tune2fs
 %%NLS%%share/locale/uk/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/e2fsprogs.mo
+share/ss/ct_c.awk
+share/ss/ct_c.sed