diff options
| -rw-r--r-- | misc/e2fsprogs-libblkid/Makefile | 4 | ||||
| -rw-r--r-- | misc/e2fsprogs-libuuid/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/Makefile | 35 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/pkg-plist | 15 |
5 files changed, 42 insertions, 20 deletions
diff --git a/misc/e2fsprogs-libblkid/Makefile b/misc/e2fsprogs-libblkid/Makefile index b47705c6be2b..b915e7812c7b 100644 --- a/misc/e2fsprogs-libblkid/Makefile +++ b/misc/e2fsprogs-libblkid/Makefile @@ -12,12 +12,13 @@ _no_license_file= sorry LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid -CONFIGURE_ARGS= --enable-elf-shlibs +CONFIGURE_ARGS= --enable-elf-shlibs --disable-libuuid --enable-libblkid MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs MAKE_ARGS= LIB_SUBDIRS=lib/blkid LDFLAGS_SHLIB=-L${LOCALBASE}/lib USE_LDCONFIG= yes ALL_TARGET= libs +LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install install-shlibs INSTALL_WRKSRC= ${WRKSRC}/lib/blkid @@ -28,7 +29,6 @@ pre-build: cd ${WRKSRC}/util && ${MAKE_CMD} subst post-build: - cd ${WRKSRC}/lib/uuid && ${MAKE_CMD} cd ${INSTALL_WRKSRC} && ${MAKE_CMD} check .include "${MASTERDIR}/Makefile" diff --git a/misc/e2fsprogs-libuuid/Makefile b/misc/e2fsprogs-libuuid/Makefile index 9cc53c269774..0dfb20ca4120 100644 --- a/misc/e2fsprogs-libuuid/Makefile +++ b/misc/e2fsprogs-libuuid/Makefile @@ -10,7 +10,7 @@ COMMENT= UUID library from e2fsprogs package LICENSE= BSD3CLAUSE LICENSE_FILE= ${INSTALL_WRKSRC}/COPYING -CONFIGURE_ARGS= --enable-elf-shlibs +CONFIGURE_ARGS= --enable-elf-shlibs --enable-libuuid OPTIONS_EXCLUDE= NLS MASTERDIR= ${.CURDIR}/../../sysutils/e2fsprogs diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index 8721b9a3e28d..dc20e5c1a15d 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= e2fsprogs -PORTVERSION= 1.43.6 -PORTREVISION?= 1 +PORTVERSION= 1.43.7 +PORTREVISION?= 0 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} @@ -22,17 +22,21 @@ PORTSCOUT= ignore # cannot handle the version in the directory BROKEN_aarch64= fails to link: missing sbrk .endif -USES= cpe gmake pkgconfig tar:xz +USES= cpe gmake makeinfo pkgconfig tar:xz CPE_VENDOR= e2fsprogs_project USE_CSTD= gnu99 USE_LDCONFIG= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--disable-fsck \ +CONFIGURE_ARGS?=--disable-fsck \ --disable-e2initrd-helper \ - --enable-libuuid \ - --with-root-prefix='${PREFIX}' + --disable-libuuid \ + --disable-uuidd \ + --enable-libblkid \ + --enable-elf-shlibs \ + --with-root-prefix='${PREFIX}' \ + LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib' CPPFLAGS+= -I${WRKSRC}/lib -I${LOCALBASE}/include # -D_EXT2_USE_C_VERSIONS -MAKE_ARGS+= LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib' pkgconfigdir='${PREFIX}/libdata/pkgconfig' +MAKE_ARGS+= pkgconfigdir='${PREFIX}/libdata/pkgconfig' MAKE_ENV+= CHECK_CMD=@true .if !defined(MASTERDIR) @@ -52,6 +56,10 @@ PARALLELTESTS_DESC= Parallelize self-tests (needs more disk space) BUILD_DEPENDS+= gdd:sysutils/coreutils +LIB_DEPENDS+= libblkid.so:misc/e2fsprogs-libblkid +LIB_DEPENDS+= libss.so:devel/e2fsprogs-libss +LIB_DEPENDS+= libuuid.so:misc/e2fsprogs-libuuid + PORTDOCS= NOTICE README RELEASE-NOTES SUBMITTING-PATCHES .endif @@ -80,9 +88,9 @@ USE_PERL5= build .if ${PORT_OPTIONS:MNLS} . if empty(ICONV_LIB) -libintl= "${LOCALBASE}/lib/libintl.a" +libintl= ${LOCALBASE}/lib/libintl.a . else -libintl= "${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a" +libintl= ${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a . endif .else CONFIGURE_ARGS+=--disable-nls @@ -166,11 +174,11 @@ post-build: # system are statically linked against anything that is outside the root fs, # else we're in trouble if e2fsck is needed for boot: # (we don't use e2fsck.static, since we can link libc.so dynamically) - cd ${WRKSRC}/e2fsck && ${RM} e2fsck \ + cd ${WRKSRC}/e2fsck && ${RM} -f e2fsck \ && ${MAKE_CMD} e2fsck V=1 \ - STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a \ - ../lib/libblkid.a ../lib/libuuid.a" \ - LIBINTL=${libintl} LIBMAGIC=/usr/lib/libmagic.a\ -lz + LIBS="../lib/libsupport.a ../lib/libext2fs.a ../lib/libcom_err.a \ + ${LOCALBASE}/lib/libblkid.a ${LOCALBASE}/lib/libuuid.a ${libintl} ../lib/libe2p.a" \ + LIBMAGIC=/usr/lib/libmagic.a\ -lz # Regression check: avoid a port (not upstream!) regression from 1.40.5, # check that e2fsck isn't dynalinked against anything but libc.so: @${ECHO_CMD} -n "===> checking that e2fsck depends on no shared objects outside /lib: " @@ -206,7 +214,6 @@ post-build: .endif post-install: - ${RM} ${STAGEDIR}${PREFIX}/sbin/uuidd ${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs ${STAGEDIR}${PREFIX}/sbin/ ${INSTALL_MAN} ${FILESDIR}/fsck_ext2fs.8 ${STAGEDIR}${PREFIX}/man/man8/ .if ${PORT_OPTIONS:MDOCS} diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo index d5683c98bc81..6c12add24d15 100644 --- a/sysutils/e2fsprogs/distinfo +++ b/sysutils/e2fsprogs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1505057223 -SHA256 (e2fsprogs-1.43.6.tar.xz) = c9b226234ee878a8d89951f3b155cec7416dd0ec09c932c855f1b1df8ad93402 -SIZE (e2fsprogs-1.43.6.tar.xz) = 5288388 +TIMESTAMP = 1508879954 +SHA256 (e2fsprogs-1.43.7.tar.xz) = 2a6367289047d68d9ba6a46cf89ab9a1efd0556cde02a51ebaf414ff51edded9 +SIZE (e2fsprogs-1.43.7.tar.xz) = 5286684 diff --git a/sysutils/e2fsprogs/pkg-plist b/sysutils/e2fsprogs/pkg-plist index b8c0b1959e81..d046c7b4ca68 100644 --- a/sysutils/e2fsprogs/pkg-plist +++ b/sysutils/e2fsprogs/pkg-plist @@ -74,3 +74,18 @@ sbin/tune2fs %%NLS%%share/locale/uk/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/vi/LC_MESSAGES/e2fsprogs.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/e2fsprogs.mo +@comment lib/libblkid.so +@comment lib/libblkid.so.1 +@comment lib/libblkid.so.1.0 +lib/libcom_err.so +lib/libcom_err.so.2 +lib/libcom_err.so.2.1 +lib/libe2p.so +lib/libe2p.so.2 +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 |