From owner-svn-ports-head@freebsd.org Sat Jul 4 15:37:13 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EC1B3351547; Sat, 4 Jul 2020 15:37:13 +0000 (UTC) (envelope-from nobutaka@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49zbYP5yyWz3ZtK; Sat, 4 Jul 2020 15:37:13 +0000 (UTC) (envelope-from nobutaka@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B01491EB38; Sat, 4 Jul 2020 15:37:13 +0000 (UTC) (envelope-from nobutaka@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 064FbDvv068964; Sat, 4 Jul 2020 15:37:13 GMT (envelope-from nobutaka@FreeBSD.org) Received: (from nobutaka@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 064FbDFO068962; Sat, 4 Jul 2020 15:37:13 GMT (envelope-from nobutaka@FreeBSD.org) Message-Id: <202007041537.064FbDFO068962@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nobutaka set sender to nobutaka@FreeBSD.org using -f From: MANTANI Nobutaka Date: Sat, 4 Jul 2020 15:37:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r541219 - in head/sysutils/ufs_copy: . files X-SVN-Group: ports-head X-SVN-Commit-Author: nobutaka X-SVN-Commit-Paths: in head/sysutils/ufs_copy: . files X-SVN-Commit-Revision: 541219 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jul 2020 15:37:14 -0000 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) {