svn commit: r541219 - in head/sysutils/ufs_copy: . files
MANTANI Nobutaka
nobutaka at FreeBSD.org
Sat Jul 4 15:37:14 UTC 2020
Author: nobutaka
Date: Sat Jul 4 15:37:13 2020
New Revision: 541219
URL: https://svnweb.freebsd.org/changeset/ports/541219
Log:
- Fix build error on -current.
- Use PLIST_FILES instead of pkg-plist.
Deleted:
head/sysutils/ufs_copy/pkg-plist
Modified:
head/sysutils/ufs_copy/Makefile
head/sysutils/ufs_copy/files/patch-ufs_copy.c
Modified: head/sysutils/ufs_copy/Makefile
==============================================================================
--- head/sysutils/ufs_copy/Makefile Sat Jul 4 15:19:34 2020 (r541218)
+++ head/sysutils/ufs_copy/Makefile Sat Jul 4 15:37:13 2020 (r541219)
@@ -21,6 +21,8 @@ PORTDOCS= README
OPTIONS_DEFINE= DOCS
+PLIST_FILES= sbin/ufs_copy
+
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
Modified: head/sysutils/ufs_copy/files/patch-ufs_copy.c
==============================================================================
--- head/sysutils/ufs_copy/files/patch-ufs_copy.c Sat Jul 4 15:19:34 2020 (r541218)
+++ head/sysutils/ufs_copy/files/patch-ufs_copy.c Sat Jul 4 15:37:13 2020 (r541219)
@@ -58,11 +58,15 @@
fprintf(stderr, "done\n");
else
fprintf(stderr, "failed\n");
-@@ -262,6 +289,7 @@ copy_ufs(const char *src_path, const cha
+@@ -262,6 +289,11 @@ copy_ufs(const char *src_path, const char *dst_path)
}
}
bcopy(&src, &dst, sizeof(dst));
++#if (defined(__FreeBSD_version) && __FreeBSD_version >= 1300100)
++ dst.d_si = NULL;
++#else
+ dst.d_sbcsum = NULL;
++#endif
dst.d_name = dst_path;
dst.d_fd = open(dst_path, O_CREAT | O_WRONLY, S_IRUSR | S_IWUSR );
if (dst.d_fd < 0) {
More information about the svn-ports-all
mailing list