diff options
| author | Matthias Andree <mandree@FreeBSD.org> | 2022-01-16 13:09:14 +0100 |
|---|---|---|
| committer | Matthias Andree <mandree@FreeBSD.org> | 2022-01-17 23:17:48 +0100 |
| commit | 29b349b2dba2a188140cb73fe451a9b9793178d4 (patch) | |
| tree | aa5709300bad49a4ec5bf01a9a6bb36802600715 /sysutils/e2fsprogs/files | |
| parent | mail/courier-imap: Update to 5.1.7 (diff) | |
devel/e2fsprogs-libss: merge to sysutils/e2fsprogs
This is to break dependency cycles between e2fsprogs-libss and
e2fsprogs (see 254751 comment #18 for details), and to avoid creating
yet another split-out port, then for e2fsprogs's libcom_err.
Bump PORTREVISION of the four e2fsprogs consumers to flush out
their e2fsprogs-libss dependency records.
PR: 254751
Reported by: Felix Palmen
PR: 261217
Reported by: tech-lists@zyxst.net
Fixes: 8e6ae60 devel/e2fsprogs-libss: use local compile_et...
Approved by: prior maintainer timeout (Ben Kaduk, 7 months) on 254751
Diffstat (limited to 'sysutils/e2fsprogs/files')
| -rw-r--r-- | sysutils/e2fsprogs/files/fix-ss_err.h.sed | 3 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/files/unwanted | 13 |
2 files changed, 3 insertions, 13 deletions
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 |