svn commit: r453120 - in head/sysutils/e2fsprogs: . files

[Matthias Andree]

Author: mandree
Date: Sun Oct 29 15:42:09 2017
New Revision: 453120
URL: https://svnweb.freebsd.org/changeset/ports/453120

Log:
  Install header and .pc (pkg-config) files, too.
  
  Reported by:	ehaupt@

Added:
  head/sysutils/e2fsprogs/files/unwanted   (contents, props changed)
Modified:
  head/sysutils/e2fsprogs/Makefile
  head/sysutils/e2fsprogs/pkg-plist

Modified: head/sysutils/e2fsprogs/Makefile
==============================================================================
--- head/sysutils/e2fsprogs/Makefile	Sun Oct 29 14:54:07 2017	(r453119)
+++ head/sysutils/e2fsprogs/Makefile	Sun Oct 29 15:42:09 2017	(r453120)
@@ -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

Added: head/sysutils/e2fsprogs/files/unwanted
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/e2fsprogs/files/unwanted	Sun Oct 29 15:42:09 2017	(r453120)
@@ -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

Modified: head/sysutils/e2fsprogs/pkg-plist
==============================================================================
--- head/sysutils/e2fsprogs/pkg-plist	Sun Oct 29 14:54:07 2017	(r453119)
+++ head/sysutils/e2fsprogs/pkg-plist	Sun Oct 29 15:42:09 2017	(r453120)
@@ -86,6 +86,18 @@ lib/libe2p.so.2.3
 lib/libext2fs.so
 lib/libext2fs.so.2
 lib/libext2fs.so.2.4
- at comment lib/libss.so
- at comment lib/libss.so.2
- at 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