Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 2070E7A110 for ; Thu, 23 Jun 2016 13:39:05 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id C28A485E5B; Thu, 23 Jun 2016 13:39:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 528F484CFB for ; Thu, 23 Jun 2016 13:39:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id DtGGvScvGE1g for ; Thu, 23 Jun 2016 13:39:03 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id C8B3384C8B for ; Thu, 23 Jun 2016 13:39:03 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C41C1FBB5; Thu, 23 Jun 2016 13:39:03 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1466689143215690" MIME-Version: 1.0 Date: Thu, 23 Jun 2016 13:39:03 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/archivers/libarchive/files To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20160623133903.C41C1FBB5@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1466689143215690 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Thu Jun 23 13:39:03 UTC 2016 Modified Files: pkgsrc/archivers/libarchive/files: config.h.in configure configure.ac pkgsrc/archivers/libarchive/files/libarchive: archive_read_disk_posix.c Log Message: Detect vfsconf for DragonFly, since it doesn't use xvfsconf like FreeBSD. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 pkgsrc/archivers/libarchive/files/config.h.in cvs rdiff -u -r1.12 -r1.13 pkgsrc/archivers/libarchive/files/configure \ pkgsrc/archivers/libarchive/files/configure.ac cvs rdiff -u -r1.3 -r1.4 \ pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_posix.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1466689143215690 Content-Disposition: inline Content-Length: 3000 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/archivers/libarchive/files/config.h.in diff -u pkgsrc/archivers/libarchive/files/config.h.in:1.8 pkgsrc/archivers/libarchive/files/config.h.in:1.9 --- pkgsrc/archivers/libarchive/files/config.h.in:1.8 Mon Jun 20 17:24:55 2016 +++ pkgsrc/archivers/libarchive/files/config.h.in Thu Jun 23 13:39:03 2016 @@ -784,6 +784,9 @@ /* Define to 1 if `__tm_gmtoff' is a member of `struct tm'. */ #undef HAVE_STRUCT_TM___TM_GMTOFF +/* Define to 1 if the system has the type `struct vfsconf'. */ +#undef HAVE_STRUCT_VFSCONF + /* Define to 1 if you have the `symlink' function. */ #undef HAVE_SYMLINK Index: pkgsrc/archivers/libarchive/files/configure diff -u pkgsrc/archivers/libarchive/files/configure:1.12 pkgsrc/archivers/libarchive/files/configure:1.13 --- pkgsrc/archivers/libarchive/files/configure:1.12 Wed Jun 22 21:04:54 2016 +++ pkgsrc/archivers/libarchive/files/configure Thu Jun 23 13:39:03 2016 @@ -17264,6 +17264,23 @@ fi done +# DragonFly uses vfsconf, FreeBSD xvfsconf. +ac_fn_c_check_type "$LINENO" "struct vfsconf" "ac_cv_type_struct_vfsconf" "#if HAVE_SYS_TYPES_H + #include + #endif + #include + +" +if test "x$ac_cv_type_struct_vfsconf" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_VFSCONF 1 +_ACEOF + + +fi + + # There are several variants of readdir_r around; we only # accept the POSIX-compliant version. cat confdefs.h - <<_ACEOF >conftest.$ac_ext Index: pkgsrc/archivers/libarchive/files/configure.ac diff -u pkgsrc/archivers/libarchive/files/configure.ac:1.12 pkgsrc/archivers/libarchive/files/configure.ac:1.13 --- pkgsrc/archivers/libarchive/files/configure.ac:1.12 Wed Jun 22 21:04:54 2016 +++ pkgsrc/archivers/libarchive/files/configure.ac Thu Jun 23 13:39:03 2016 @@ -616,6 +616,14 @@ AC_CHECK_FUNCS([_get_timezone _localtime # detects cygwin-1.7, as opposed to older versions AC_CHECK_FUNCS([cygwin_conv_path]) +# DragonFly uses vfsconf, FreeBSD xvfsconf. +AC_CHECK_TYPES(struct vfsconf,,, + [#if HAVE_SYS_TYPES_H + #include + #endif + #include + ]) + # There are several variants of readdir_r around; we only # accept the POSIX-compliant version. AC_COMPILE_IFELSE( Index: pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_posix.c diff -u pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_posix.c:1.3 pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_posix.c:1.4 --- pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_posix.c:1.3 Mon Jun 20 17:24:57 2016 +++ pkgsrc/archivers/libarchive/files/libarchive/archive_read_disk_posix.c Thu Jun 23 13:39:03 2016 @@ -1504,7 +1504,11 @@ setup_current_filesystem(struct archive_ struct tree *t = a->tree; struct statfs sfs; #if defined(HAVE_GETVFSBYNAME) && defined(VFCF_SYNTHETIC) +# if defined(HAVE_STRUCT_VFSCONF) + struct vfsconf vfc; +# else struct xvfsconf vfc; +# endif #endif int r, xr = 0; #if !defined(HAVE_STRUCT_STATFS_F_NAMEMAX) --_----------=_1466689143215690--