From 11a1e89fc7ca1541145fc51e9323e76c7a4d6b2e Mon Sep 17 00:00:00 2001
From: Matthias Andree <mandree@FreeBSD.org>
Date: Sun, 29 Oct 2017 15:42:09 +0000
Subject: [PATCH] Install header and .pc (pkg-config) files, too.

Reported by:	ehaupt@
---
 sysutils/e2fsprogs/Makefile       |  9 ++++++++-
 sysutils/e2fsprogs/files/unwanted | 28 ++++++++++++++++++++++++++++
 sysutils/e2fsprogs/pkg-plist      | 18 +++++++++++++++---
 3 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 sysutils/e2fsprogs/files/unwanted

diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index dc20e5c1a15d..59c8da32d8bf 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	e2fsprogs
 PORTVERSION=	1.43.7
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	sysutils
 MASTER_SITES=	KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
 
@@ -40,6 +40,8 @@ MAKE_ARGS+=	pkgconfigdir='${PREFIX}/libdata/pkgconfig'
 MAKE_ENV+=	CHECK_CMD=@true
 
 .if !defined(MASTERDIR)
+INSTALL_TARGET=		install install-libs
+
 OPTIONS_DEFINE=		DOCS NLS FUSEFS PARALLELTESTS
 OPTIONS_EXCLUDE+=	EXAMPLES
 OPTIONS_SUB=		yes
@@ -222,6 +224,11 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
+# ditch files installed by other ports already, or shadowing system files:
+	cd ${STAGEDIR}${PREFIX} && \
+		${XARGS} <${FILESDIR}/unwanted ${RM} && \
+		${RMDIR} include/blkid include/et include/ss share/et share/ss
+
 #
 # the next line closes .if ${MASTERDIR} == ${.CURDIR}
 .endif
diff --git a/sysutils/e2fsprogs/files/unwanted b/sysutils/e2fsprogs/files/unwanted
new file mode 100644
index 000000000000..1f1fae049fc0
--- /dev/null
+++ b/sysutils/e2fsprogs/files/unwanted
@@ -0,0 +1,28 @@
+lib/libblkid.so
+lib/libblkid.so.1
+lib/libblkid.so.1.0
+lib/libss.so
+lib/libss.so.2
+lib/libss.so.2.0
+bin/compile_et
+bin/mk_cmds
+include/blkid/blkid.h
+include/blkid/blkid_types.h
+include/com_err.h
+include/et/com_err.h
+include/ss/ss.h
+include/ss/ss_err.h
+lib/libblkid.a
+lib/libcom_err.a
+lib/libss.a
+libdata/pkgconfig/blkid.pc
+libdata/pkgconfig/com_err.pc
+libdata/pkgconfig/ss.pc
+man/man1/compile_et.1
+man/man1/mk_cmds.1
+man/man3/com_err.3
+man/man3/libblkid.3
+share/et/et_c.awk
+share/et/et_h.awk
+share/ss/ct_c.awk
+share/ss/ct_c.sed
diff --git a/sysutils/e2fsprogs/pkg-plist b/sysutils/e2fsprogs/pkg-plist
index d046c7b4ca68..97ee3407714a 100644
--- a/sysutils/e2fsprogs/pkg-plist
+++ b/sysutils/e2fsprogs/pkg-plist
@@ -86,6 +86,18 @@ lib/libe2p.so.2.3
 lib/libext2fs.so
 lib/libext2fs.so.2
 lib/libext2fs.so.2.4
-@comment lib/libss.so
-@comment lib/libss.so.2
-@comment lib/libss.so.2.0
+include/e2p/e2p.h
+include/ext2fs/bitops.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/ext3_extents.h
+include/ext2fs/qcow2.h
+include/ext2fs/tdb.h
+lib/libe2p.a
+lib/libext2fs.a
+libdata/pkgconfig/e2p.pc
+libdata/pkgconfig/ext2fs.pc