Date: Sat, 12 Aug 2017 10:12:47 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r447819 - in head: devel/e2fsprogs-libss misc/e2fsprogs-libblkid misc/e2fsprogs-libuuid sysutils/e2fsprogs Message-ID: <201708121012.v7CAClVe010627@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Sat Aug 12 10:12:47 2017 New Revision: 447819 URL: https://svnweb.freebsd.org/changeset/ports/447819 Log: Upgrade to new upstream release 1.43.5, assorted fixes. Changelog: <http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.43.5>; Add proper LICENSE* statements to all the Makefiles of e2fsprogs and its slave ports. Update e2fsprogs-libuuid's pkg-plist to use @preunexec and @dir, instead of @[un]exec. Add BLKID_FILE to e2fsprogs's Makefile to prevent f_detect_xfs from polluting the system's /etc/blkid.tab in make check. Modified: head/devel/e2fsprogs-libss/Makefile head/misc/e2fsprogs-libblkid/Makefile head/misc/e2fsprogs-libuuid/Makefile head/misc/e2fsprogs-libuuid/pkg-plist head/sysutils/e2fsprogs/Makefile head/sysutils/e2fsprogs/distinfo Modified: head/devel/e2fsprogs-libss/Makefile ============================================================================== --- head/devel/e2fsprogs-libss/Makefile Sat Aug 12 08:26:24 2017 (r447818) +++ head/devel/e2fsprogs-libss/Makefile Sat Aug 12 10:12:47 2017 (r447819) @@ -8,6 +8,9 @@ PKGNAMESUFFIX= -libss MAINTAINER= kaduk-fbsd@mit.edu COMMENT= Command-line interface parsing library from e2fsprogs +LICENSE= MIT +LICENSE_FILE= ${INSTALL_WRKSRC}/ss.h + CONFLICTS= heimdal-[0-9]* CONFLICTS+= krb4-[0-9]* Modified: head/misc/e2fsprogs-libblkid/Makefile ============================================================================== --- head/misc/e2fsprogs-libblkid/Makefile Sat Aug 12 08:26:24 2017 (r447818) +++ head/misc/e2fsprogs-libblkid/Makefile Sat Aug 12 10:12:47 2017 (r447819) @@ -7,6 +7,9 @@ PKGNAMESUFFIX= -libblkid COMMENT= Blkid library from e2fsprogs package +LICENSE= LGPL20+ +_no_license_file= sorry + LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid CONFIGURE_ARGS= --enable-elf-shlibs Modified: head/misc/e2fsprogs-libuuid/Makefile ============================================================================== --- head/misc/e2fsprogs-libuuid/Makefile Sat Aug 12 08:26:24 2017 (r447818) +++ head/misc/e2fsprogs-libuuid/Makefile Sat Aug 12 10:12:47 2017 (r447819) @@ -7,6 +7,9 @@ PKGNAMESUFFIX= -libuuid COMMENT= UUID library from e2fsprogs package +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${INSTALL_WRKSRC}/COPYING + CONFIGURE_ARGS= --enable-elf-shlibs OPTIONS_EXCLUDE= NLS Modified: head/misc/e2fsprogs-libuuid/pkg-plist ============================================================================== --- head/misc/e2fsprogs-libuuid/pkg-plist Sat Aug 12 08:26:24 2017 (r447818) +++ head/misc/e2fsprogs-libuuid/pkg-plist Sat Aug 12 10:12:47 2017 (r447819) @@ -19,6 +19,5 @@ man/man3/uuid_generate_random.3.gz man/man3/uuid_generate_time.3.gz man/man8/uuidd.8.gz sbin/uuidd -@exec mkdir -p /var/run/libuuid -@unexec %D/etc/rc.d/uuidd stop >/dev/null 2>&1 || true -@unexec rmdir /var/run/libuuid >/dev/null 2>&1 || true +@dir /var/run/libuuid +@preunexec %D/etc/rc.d/uuidd stop >/dev/null 2>&1 || true Modified: head/sysutils/e2fsprogs/Makefile ============================================================================== --- head/sysutils/e2fsprogs/Makefile Sat Aug 12 08:26:24 2017 (r447818) +++ head/sysutils/e2fsprogs/Makefile Sat Aug 12 10:12:47 2017 (r447819) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= e2fsprogs -PORTVERSION= 1.43.4 +PORTVERSION= 1.43.5 PORTREVISION?= 0 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} @@ -10,7 +10,11 @@ MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${P MAINTAINER?= mandree@FreeBSD.org COMMENT?= Utilities & library to manipulate ext2/3/4 filesystems -LICENSE= GPLv2 +LICENSE?= GPLv2+ +.if !defined(_no_license_file) +LICENSE_FILE?= ${WRKSRC}/NOTICE +.endif +LICENSE_DISTFILES_GPLv2= ${DISTNAME}${EXTRACT_SUFX} PORTSCOUT= ignore # cannot handle the version in the directory @@ -190,7 +194,7 @@ post-build: @${ECHO_CMD} '===> Running e2fsprogs self-test suite' # do not add -j options unconditionally to ${MAKE_CMD} below, this might break # due to excessive disk space use. - cd ${WRKSRC}/tests && ulimit -t 60 && ${MKDIR} ${WRKDIR}/tmp && ${SETENV} e2fsprogs_inhibit_SIGINFO=1 ${MAKE_CMD} check ${_CHECK_JOBS} ${_checkaddargs} \ + cd ${WRKSRC}/tests && ulimit -t 60 && ${MKDIR} ${WRKDIR}/tmp && ${SETENV} e2fsprogs_inhibit_SIGINFO=1 BLKID_FILE=${WRKDIR}/tmp/blkid.tab ${MAKE_CMD} check ${_CHECK_JOBS} ${_checkaddargs} \ || { head -n30000 ${WRKSRC}/tests/*.failed 2>/dev/null ; exit 1 ; } .else @${ECHO_CMD} '===> SKIPPING e2fsprogs self-test suite (DISCOURAGED!)' Modified: head/sysutils/e2fsprogs/distinfo ============================================================================== --- head/sysutils/e2fsprogs/distinfo Sat Aug 12 08:26:24 2017 (r447818) +++ head/sysutils/e2fsprogs/distinfo Sat Aug 12 10:12:47 2017 (r447819) @@ -1,3 +1,3 @@ -TIMESTAMP = 1486335180 -SHA256 (e2fsprogs-1.43.4.tar.xz) = 54b3f21123a531a6a536b9cdcc21344b0122a72790dbe4dacc98e64db25e4a24 -SIZE (e2fsprogs-1.43.4.tar.xz) = 5265788 +TIMESTAMP = 1502496004 +SHA256 (e2fsprogs-1.43.5.tar.xz) = 261f3d9ade383fbf032a19140c9c25e998cc0f71a1ae686614fb3ae0eb955a17 +SIZE (e2fsprogs-1.43.5.tar.xz) = 5301436
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708121012.v7CAClVe010627>