From nobody Thu May 26 06:21:20 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7008E1B599EB; Thu, 26 May 2022 06:21:20 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L7yW42lgmz4TfR; Thu, 26 May 2022 06:21:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653546080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GQHEzwa5Zq3bRHc3kK+tzqjapRW7y2P3f7aMVCc1IbQ=; b=gwNjSaN4Zoow7Z46gCI3XlpKCKaQ0bOncrYJg2ej0OLBwGR/KBPBvECH3FuWKiTyy3ha2i L7wkUwzWhhej86QXSfF1ZQZcS5z0q8ZzWHxbWeHx3hW0Leq6eJhsto4tRNGNyzyQAcb3pM DQb1ifcW3y+NPHs2TWCX8m1Rx29Cuiq1JnN+OA7wbcNg2ayfYyVUxAAzTgW/Srf/x6wQk+ IJkr84fgY8sfjx6kYp28WcdbRMiBLpJqOOMis7a93Q0YkHW3lYjT6VDCIHxiymnCuGchwz 4er3ept7TSKsNIV6tzZbWMV674pyJH0HW6wYZmVm68QfwFeWYze3OBcSjwQuiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3E64782C; Thu, 26 May 2022 06:21:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24Q6LK06042130; Thu, 26 May 2022 06:21:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24Q6LKhV042129; Thu, 26 May 2022 06:21:20 GMT (envelope-from git) Date: Thu, 26 May 2022 06:21:20 GMT Message-Id: <202205260621.24Q6LKhV042129@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 52eb14cdecd2 - main - sysutils/fusefs-ntfs: clean the port up before functional changes List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52eb14cdecd2ac9688c8e30c7a0a3166992a2c1b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653546080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GQHEzwa5Zq3bRHc3kK+tzqjapRW7y2P3f7aMVCc1IbQ=; b=Bb4xMpMa1BZrwvju9k+lAeVLNAk/p9wbAaObFq8uZvHsjKZSs985msTEt/KURHnBQaSIs5 4SRK4ik8q0LmN2jjkmzn6Uln/soa51kGgw6S5oOwgheQLiPDOl9vb3EIqBr7E2WRoV9QW1 aSr4xzP0Uk3LZhMteIpO/AeRKJNcqU51XcV0N19zpWjrMiYLbXsIr9xBdhN0Wu0myCWPQ2 VWy5Jz55+YLKshY83DfFRoZLp8Fhb4ATdmMYX5u2kLXk0AaRUwgAODi2PsFZI64LOO506z jGjtKjakUNWBbzGVizW4eLyGdl5D9nR6n+3oyOI1gS8vRt69wzLmzMoQ0z0GVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653546080; a=rsa-sha256; cv=none; b=fpSzoU6rWj3l6K/Vk2x3D11KVJd8aPF/lBkaOAdDr8TNZq2gj2DDcUBGc2eq8wJwtQrZsy kpKIBh/JL5hXtsORDYdfhyXQIUdRBap18aNaituZ3qwFBa1kSRAcHRvBmRcM4D+cEMjd32 PBSkE4jyi4BKZssvHHkv89LOb5bCRBGVnaTk4vykg8VrxMy6dTcyw2M4u5ljuIiEKWiYGT jxlSCNkZDJ8q8ZiL/mFyAFQRNRXLaU86f0O3W0weE4kltNLbtNrdsS1cFQffjuuFXZuppH OjZLw/P+u+dWJNCc4wxR1uLfPrTgxMrzRWkJ5005AyjKKf1vTDghcCCpUxhB+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=52eb14cdecd2ac9688c8e30c7a0a3166992a2c1b commit 52eb14cdecd2ac9688c8e30c7a0a3166992a2c1b Author: Alexey Dokuchaev AuthorDate: 2022-05-26 06:20:16 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-05-26 06:20:16 +0000 sysutils/fusefs-ntfs: clean the port up before functional changes - Drop needless CPPFLAGS, the build system already knows where to find its bits and pieces by itself - Replace hand-rolled stripping in the `post-install' target with appropriate INSTALL_TARGET - In the configure script, treat FreeBSD as first-class operating system and adhere to --with-fuse switch (which we already pass) - Drop the mount helper-related patch hunk so to not confuse the reader as we also pass it on the CONFIGURE_ARGS explicitly --- sysutils/fusefs-ntfs/Makefile | 5 +---- sysutils/fusefs-ntfs/files/patch-configure | 29 +++++++++++++++-------------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile index 5338d110ac16..d029b406c992 100644 --- a/sysutils/fusefs-ntfs/Makefile +++ b/sysutils/fusefs-ntfs/Makefile @@ -20,7 +20,7 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --exec-prefix=${PREFIX} --disable-mount-helper \ --disable-mtab --with-fuse=external --disable-ldconfig -CPPFLAGS+= -I${WRKSRC}/include/ntfs-3g/ +INSTALL_TARGET= install-strip OPTIONS_DEFINE= LOCK UBLIO DOCS OPTIONS_DEFAULT=LOCK UBLIO @@ -42,9 +42,6 @@ post-patch: @${REINPLACE_CMD} -e 's|\($$(AM_CFLAGS)\) \(-I$$(top_srcdir)/include/ntfs-3g\)|\2 \1|; \ /install-exec-hook:/,/^$$/ s|^@.*||' ${WRKSRC}/libntfs-3g/Makefile.in -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libntfs-3g.so - post-install-DOCS-on: ${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${STAGEDIR}${DOCSDIR}/ diff --git a/sysutils/fusefs-ntfs/files/patch-configure b/sysutils/fusefs-ntfs/files/patch-configure index c68919755849..cee7cc4a9090 100644 --- a/sysutils/fusefs-ntfs/files/patch-configure +++ b/sysutils/fusefs-ntfs/files/patch-configure @@ -1,24 +1,25 @@ ---- configure.orig 2015-03-14 14:10:24 UTC +--- configure.orig 2017-03-23 09:42:56 UTC +++ configure -@@ -3256,7 +3256,7 @@ if test "${enable_mount_helper+set}" = s - else +@@ -12871,7 +12871,7 @@ $as_echo_n "checking fuse compatibility... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking fuse compatibility" >&5 + $as_echo_n "checking fuse compatibility... " >&6; } + case "${target_os}" in +- linux*|solaris*) ++ freebsd*|linux*|solaris*) - case "${target_os}" in -- linux*) enable_mount_helper="yes" ;; -+ linux*|freebsd*) enable_mount_helper="yes" ;; - *) enable_mount_helper="no" ;; - esac - -@@ -12871,7 +12871,7 @@ fi + # Check whether --with-fuse was given. + if test "${with_fuse+set}" = set; then : +@@ -12885,9 +12885,6 @@ fi + darwin*|netbsd*|kfreebsd*-gnu) with_fuse="external" ;; - freebsd*) +- freebsd*) - as_fn_error $? "Please see FreeBSD support at http://www.freshports.org/sysutils/fusefs-ntfs" "$LINENO" 5 -+ with_fuse="external" - ;; +- ;; *) as_fn_error $? "ntfs-3g can be built for Linux, FreeBSD, Mac OS X, NetBSD, and Solaris only." "$LINENO" 5 -@@ -15014,7 +15014,7 @@ if test "x${DISTCHECK_HACK}" != "x"; the + ;; +@@ -15177,7 +15174,7 @@ fi fi # Settings