From owner-svn-ports-head@freebsd.org Sun Oct 29 15:42:11 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1CE22E42CD0; Sun, 29 Oct 2017 15:42:11 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EAEE6820EE; Sun, 29 Oct 2017 15:42:10 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9TFgA9f033821; Sun, 29 Oct 2017 15:42:10 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9TFg9qQ033818; Sun, 29 Oct 2017 15:42:09 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201710291542.v9TFg9qQ033818@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Sun, 29 Oct 2017 15:42:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r453120 - in head/sysutils/e2fsprogs: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in head/sysutils/e2fsprogs: . files X-SVN-Commit-Revision: 453120 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Oct 2017 15:42:11 -0000 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 -@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