Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_153865569340660"
MIME-Version: 1.0
Date: Thu, 4 Oct 2018 12:21:33 +0000
From: "Tobias Nygren" <tnn@netbsd.org>
Subject: CVS commit: pkgsrc/sysutils/e2fsprogs
To: pkgsrc-changes@NetBSD.org
Reply-To: tnn@netbsd.org
Message-Id: <20181004122133.3934FFBEE@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_153865569340660
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	tnn
Date:		Thu Oct  4 12:21:33 UTC 2018

Modified Files:
	pkgsrc/sysutils/e2fsprogs: Makefile PLIST
Added Files:
	pkgsrc/sysutils/e2fsprogs: buildlink3.mk

Log Message:
e2fsprogs: install the libraries & headers. Add bl3. Bump rev.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/sysutils/e2fsprogs/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/e2fsprogs/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/e2fsprogs/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_153865569340660
Content-Disposition: inline
Content-Length: 4115
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/sysutils/e2fsprogs/Makefile
diff -u pkgsrc/sysutils/e2fsprogs/Makefile:1.27 pkgsrc/sysutils/e2fsprogs/Makefile:1.28
--- pkgsrc/sysutils/e2fsprogs/Makefile:1.27	Wed Jul  4 13:40:37 2018
+++ pkgsrc/sysutils/e2fsprogs/Makefile	Thu Oct  4 12:21:33 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2018/07/04 13:40:37 jperkin Exp $
+# $NetBSD: Makefile,v 1.28 2018/10/04 12:21:33 tnn Exp $
 
 DISTNAME=	e2fsprogs-1.43.7
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PKGVERSION_NOREV}/
 #MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
@@ -20,15 +21,31 @@ CONFIGURE_ARGS+=	--disable-libblkid
 CONFIGURE_ARGS+=	--disable-libuuid
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 INFO_FILES=		yes
+INSTALL_TARGET=		install install-libs
+
+PKGCONFIG_OVERRIDE+=	lib/blkid/blkid.pc.in
+PKGCONFIG_OVERRIDE+=	lib/e2p/e2p.pc.in
+PKGCONFIG_OVERRIDE+=	lib/et/com_err.pc.in
+PKGCONFIG_OVERRIDE+=	lib/ext2fs/ext2fs.pc.in
+PKGCONFIG_OVERRIDE+=	lib/ss/ss.pc.in
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "Darwin"
 BUILDLINK_TRANSFORM+=	rm:-luuid
 .endif
 
+PLIST_VARS+=		shlib
+.if ${OBJECT_FMT} == "ELF"
+PLIST.shlib=		yes
+CONFIGURE_ARGS+=	--enable-elf-shlibs
+.else
+CONFIGURE_ARGS+=	--disable-elf-shlibs
+.endif
+
 # Only build fsck(8) on platforms that need it.
 PLIST_VARS+=		fsck
 .if ${OPSYS} == "Linux"
+CONFIGURE_ARGS+=	--enable-fsck
 PLIST.fsck=		yes
 .else
 CONFIGURE_ARGS+=	--disable-fsck

Index: pkgsrc/sysutils/e2fsprogs/PLIST
diff -u pkgsrc/sysutils/e2fsprogs/PLIST:1.9 pkgsrc/sysutils/e2fsprogs/PLIST:1.10
--- pkgsrc/sysutils/e2fsprogs/PLIST:1.9	Fri Dec  8 08:12:58 2017
+++ pkgsrc/sysutils/e2fsprogs/PLIST	Thu Oct  4 12:21:33 2018
@@ -1,10 +1,50 @@
-@comment $NetBSD: PLIST,v 1.9 2017/12/08 08:12:58 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2018/10/04 12:21:33 tnn Exp $
 bin/chattr
+bin/compile_et
 bin/lsattr
+bin/mk_cmds
+include/com_err.h
+include/e2p/e2p.h
+include/et/com_err.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
+include/ss/ss.h
+include/ss/ss_err.h
 info/libext2fs.info
 lib/e2initrd_helper
+lib/libcom_err.a
+${PLIST.shlib}lib/libcom_err.so
+${PLIST.shlib}lib/libcom_err.so.2
+${PLIST.shlib}lib/libcom_err.so.2.1
+lib/libe2p.a
+${PLIST.shlib}lib/libe2p.so
+${PLIST.shlib}lib/libe2p.so.2
+${PLIST.shlib}lib/libe2p.so.2.3
+lib/libext2fs.a
+${PLIST.shlib}lib/libext2fs.so
+${PLIST.shlib}lib/libext2fs.so.2
+${PLIST.shlib}lib/libext2fs.so.2.4
+lib/libss.a
+${PLIST.shlib}lib/libss.so
+${PLIST.shlib}lib/libss.so.2
+${PLIST.shlib}lib/libss.so.2.0
+lib/pkgconfig/com_err.pc
+lib/pkgconfig/e2p.pc
+lib/pkgconfig/ext2fs.pc
+lib/pkgconfig/ss.pc
 man/man1/chattr.1
+man/man1/compile_et.1
 man/man1/lsattr.1
+man/man1/mk_cmds.1
+man/man3/com_err.3
 man/man5/e2fsck.conf.5
 man/man5/ext2.5
 man/man5/ext3.5
@@ -52,6 +92,8 @@ sbin/mkfs.ext4
 sbin/mklost+found
 sbin/resize2fs
 sbin/tune2fs
+share/et/et_c.awk
+share/et/et_h.awk
 share/examples/ext2fs/mke2fs.conf
 share/locale/ca/LC_MESSAGES/e2fsprogs.mo
 share/locale/cs/LC_MESSAGES/e2fsprogs.mo
@@ -73,3 +115,5 @@ share/locale/tr/LC_MESSAGES/e2fsprogs.mo
 share/locale/uk/LC_MESSAGES/e2fsprogs.mo
 share/locale/vi/LC_MESSAGES/e2fsprogs.mo
 share/locale/zh_CN/LC_MESSAGES/e2fsprogs.mo
+share/ss/ct_c.awk
+share/ss/ct_c.sed

Added files:

Index: pkgsrc/sysutils/e2fsprogs/buildlink3.mk
diff -u /dev/null pkgsrc/sysutils/e2fsprogs/buildlink3.mk:1.1
--- /dev/null	Thu Oct  4 12:21:33 2018
+++ pkgsrc/sysutils/e2fsprogs/buildlink3.mk	Thu Oct  4 12:21:33 2018
@@ -0,0 +1,13 @@
+# $NetBSD: buildlink3.mk,v 1.1 2018/10/04 12:21:33 tnn Exp $
+
+BUILDLINK_TREE+=	e2fsprogs
+
+.if !defined(E2FSPROGS_BUILDLINK3_MK)
+E2FSPROGS_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.e2fsprogs+=	e2fsprogs>=1.43.7nb1
+BUILDLINK_PKGSRCDIR.e2fsprogs?=	../../sysutils/e2fsprogs
+
+.endif	# E2FSPROGS_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-e2fsprogs


--_----------=_153865569340660--