diff options
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/e2fsprogs/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/files/fix-ss_err.h.sed | 3 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/files/unwanted | 13 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/pkg-plist | 13 | ||||
| -rw-r--r-- | sysutils/e2tools/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/fusefs-ext2/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/unetbootin/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/vzvol/Makefile | 2 |
8 files changed, 24 insertions, 19 deletions
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index d484531df454..45e9ef9ed007 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -14,7 +14,7 @@ PORTNAME= e2fsprogs PORTVERSION= 1.46.4 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} @@ -87,7 +87,6 @@ BASHTESTS_BUILD_DEPENDS= ${BASH_CMD}:shells/bash BASH_CMD= ${LOCALBASE}/bin/bash LIB_DEPENDS+= libblkid.so:misc/e2fsprogs-libblkid -LIB_DEPENDS+= libss.so:devel/e2fsprogs-libss LIB_DEPENDS+= libuuid.so:misc/e2fsprogs-libuuid LIBUNWIND_LIB_DEPENDS= libunwind.so:devel/libunwind @@ -231,6 +230,8 @@ BROKEN= it was not tested on your system by the maintainer; you must run self-te pre-build: # fix up Makefile ordering for parallel builds cd ${WRKSRC}/lib/et && ${DO_MAKE_BUILD} compile_et + cd ${WRKSRC}/lib/ss && _ET_DIR_OVERRIDE=../et ../et/compile_et ss_err.et \ + && ${REINPLACE_CMD} -f ${FILESDIR}/fix-ss_err.h.sed ss_err.h cd ${WRKSRC}/lib/support && ${DO_MAKE_BUILD} prof_err.h .if ${PORT_OPTIONS:MPARALLELTESTS} @@ -352,7 +353,7 @@ post-install: # remove or relocate files installed by other ports already, or shadowing system files: cd ${STAGEDIR}${PREFIX} && \ ${XARGS} <${FILESDIR}/unwanted ${RM} && \ - ${RMDIR} include/e2fsprogs/blkid include/e2fsprogs/ss share/ss + ${RMDIR} include/e2fsprogs/blkid ${MV} ${STAGEDIR}${PREFIX}/bin/compile_et ${STAGEDIR}${PREFIX}/bin/e2fsprogs-compile_et ${MV} ${STAGEDIR}${PREFIX}/man/man1/compile_et.1 ${STAGEDIR}${PREFIX}/man/man1/e2fsprogs-compile_et.1 ${MKDIR} ${STAGEDIR}${DATADIR}/et/ diff --git a/sysutils/e2fsprogs/files/fix-ss_err.h.sed b/sysutils/e2fsprogs/files/fix-ss_err.h.sed new file mode 100644 index 000000000000..1b72045c519b --- /dev/null +++ b/sysutils/e2fsprogs/files/fix-ss_err.h.sed @@ -0,0 +1,3 @@ +/#define __ss_err_h__/a\ +#include <stdio.h> +#include <com_err.h> diff --git a/sysutils/e2fsprogs/files/unwanted b/sysutils/e2fsprogs/files/unwanted index a49d88186c6c..693deb364915 100644 --- a/sysutils/e2fsprogs/files/unwanted +++ b/sysutils/e2fsprogs/files/unwanted @@ -1,21 +1,8 @@ -bin/mk_cmds include/e2fsprogs/blkid/blkid.h include/e2fsprogs/blkid/blkid_types.h -include/e2fsprogs/ss/ss.h -include/e2fsprogs/ss/ss_err.h lib/e2fsprogs/libblkid.a lib/e2fsprogs/libblkid.so lib/e2fsprogs/libblkid.so.1 lib/e2fsprogs/libblkid.so.1.0 -lib/e2fsprogs/libcom_err.a -lib/e2fsprogs/libss.a -lib/e2fsprogs/libss.so -lib/e2fsprogs/libss.so.2 -lib/e2fsprogs/libss.so.2.0 libdata/pkgconfig/blkid.pc -libdata/pkgconfig/ss.pc -man/man1/mk_cmds.1 -man/man3/com_err.3 man/man3/libblkid.3 -share/ss/ct_c.awk -share/ss/ct_c.sed diff --git a/sysutils/e2fsprogs/pkg-plist b/sysutils/e2fsprogs/pkg-plist index 83a2baf4e486..c6eb8d74c70f 100644 --- a/sysutils/e2fsprogs/pkg-plist +++ b/sysutils/e2fsprogs/pkg-plist @@ -4,6 +4,7 @@ bin/chattr bin/e2fsprogs-compile_et %%FUSEFS%%bin/fuse2fs bin/lsattr +bin/mk_cmds etc/mke2fs.conf.dist include/e2fsprogs/com_err.h include/e2fsprogs/e2p/e2p.h @@ -19,6 +20,9 @@ include/e2fsprogs/ext2fs/ext3_extents.h include/e2fsprogs/ext2fs/hashmap.h include/e2fsprogs/ext2fs/qcow2.h include/e2fsprogs/ext2fs/tdb.h +include/e2fsprogs/ss/ss.h +include/e2fsprogs/ss/ss_err.h +lib/e2fsprogs/libcom_err.a lib/e2fsprogs/libcom_err.so lib/e2fsprogs/libcom_err.so.2 lib/e2fsprogs/libcom_err.so.2.1 @@ -30,13 +34,20 @@ lib/e2fsprogs/libext2fs.a lib/e2fsprogs/libext2fs.so lib/e2fsprogs/libext2fs.so.2 lib/e2fsprogs/libext2fs.so.2.4 +lib/e2fsprogs/libss.so.2.0 +lib/e2fsprogs/libss.so +lib/e2fsprogs/libss.a +lib/e2fsprogs/libss.so.2 libdata/pkgconfig/com_err.pc libdata/pkgconfig/e2p.pc libdata/pkgconfig/ext2fs.pc +libdata/pkgconfig/ss.pc man/man1/chattr.1.gz man/man1/e2fsprogs-compile_et.1.gz %%FUSEFS%%man/man1/fuse2fs.1.gz man/man1/lsattr.1.gz +man/man1/mk_cmds.1.gz +man/man3/com_err.3.gz man/man5/e2fsck.conf.5.gz man/man5/mke2fs.conf.5.gz man/man5/ext2.5.gz @@ -112,3 +123,5 @@ 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 +share/ss/ct_c.awk +share/ss/ct_c.sed diff --git a/sysutils/e2tools/Makefile b/sysutils/e2tools/Makefile index 9e65cc69089b..7325bb027790 100644 --- a/sysutils/e2tools/Makefile +++ b/sysutils/e2tools/Makefile @@ -1,6 +1,6 @@ PORTNAME= e2tools DISTVERSION= 0.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/ diff --git a/sysutils/fusefs-ext2/Makefile b/sysutils/fusefs-ext2/Makefile index 407ad78e8ef6..124b7c470366 100644 --- a/sysutils/fusefs-ext2/Makefile +++ b/sysutils/fusefs-ext2/Makefile @@ -3,7 +3,7 @@ PORTNAME= fusefs-ext2 PORTVERSION= 0.0.10 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MAINTAINER= ehaupt@FreeBSD.org diff --git a/sysutils/unetbootin/Makefile b/sysutils/unetbootin/Makefile index 9515de782991..70bb2cce05f5 100644 --- a/sysutils/unetbootin/Makefile +++ b/sysutils/unetbootin/Makefile @@ -2,6 +2,7 @@ PORTNAME= unetbootin PORTVERSION= 702 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/ DISTNAME= ${PORTNAME}-source-${PORTVERSION} diff --git a/sysutils/vzvol/Makefile b/sysutils/vzvol/Makefile index ef5f2cf1abd2..6db2a19904b3 100644 --- a/sysutils/vzvol/Makefile +++ b/sysutils/vzvol/Makefile @@ -1,7 +1,7 @@ PORTNAME= vzvol DISTVERSIONPREFIX= v DISTVERSION= 0.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MAINTAINER= rainbow@sanitylinux.org |