From nobody Sun Oct 27 17:06:20 2024 X-Original-To: dev-commits-ports-main@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 4Xc2wr6RxVz5bDjm; Sun, 27 Oct 2024 17:06: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xc2wr5wVMz4Ww7; Sun, 27 Oct 2024 17:06:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730048780; 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=66JioOuibfHb4gQ/95YtDublvyHV/TKvWqRFisSfcQQ=; b=ShvpMbDLKp6o+IWwow4sy7w1JM3/Jf+cymy8AmSlVkeZjYaqURabzSoQuJtLvfoKw/pjK9 j6cZd6PzyOpolrQzCLz13iozRGDoBYwnTbKL4J+QclrAIZjJQ/25s9RXSxjVh/shigOd4l 6mO8RAMG4oTq+GTAAsF/c/6D4pxtiOPct1+IKU3QnO93ZBS1rrM2fNqfcp2uoPHNad1xbr fTDbaTebdbPtdUalz2blLRrloLzEjuCSrX76er7VJmg+BntmrSn+RFbJkx7cp/1JsLmzMH ShC1kxholG7nH2CcrPllt6jeGqeF8nS1qbqtE0Ijf6PKkY5uHT5AIvx8phFeiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730048780; 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=66JioOuibfHb4gQ/95YtDublvyHV/TKvWqRFisSfcQQ=; b=fPA3G/Eu7kHN1wWcu+wGCqVW5QFg6Bjc/z0oBEmyB2XnHROhFhB6R+oOFIzEAhGnzfXNpk Ih9X6EH5gzSEYZFgStNWJ3G+BHFGXI89JNs+rSkuqAOLZqvCb1TOz3WjR6IUvq+XBvoCyI J8IiVqfahMLHS0T1JHujCHBw25gEyWVNLgYB5HI+COEXK+Vh6ArPooIrWc1eizBsqMD3uX kTcm/DKKtQfV1Wa639/B7UbKY7KPh4cqBq0pciQmXcV6KW7eu/O9xKLY+ymuov7OuZnB2I uHuPMbxxoM8IZXLLqP6eA15gkPRczi0AlFt10x6Xd8Keaqi7xeZFOcRFfYSGAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730048780; a=rsa-sha256; cv=none; b=x01qzu6nA52GtKM/n38cQ/SDWRoJlTKG98uW7FvAKBocIm3/Cs9/YlKidngbp/covFOF3X CZhBEb9ylf/hFdTnBtaztkvDg8vTycS3vRWqBMSBeJ347kmQsAfxjf5ucvCUi2d0wbuNEg l/LqwCq1naJ2WP++F2yyjfBw/D9jUYL21U9x2n9DABTaYvr6snTfUUUtG2uqwjUFSFbo8s BH5RI9qEw6/rTTWl1Vh3GGbUPO5hCc7Na/rGqRPVPQMc6ghWHWSHrzlJdvVMOF+CFr1ktr H82LlB904ZVC5BPcNiE6P9oXe7Af0GqkeAU6kLr6idYfJfuSrgg/DFBKde/qcA== 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 4Xc2wr5VfFz13Mf; Sun, 27 Oct 2024 17:06:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49RH6KNh093193; Sun, 27 Oct 2024 17:06:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49RH6K36093190; Sun, 27 Oct 2024 17:06:20 GMT (envelope-from git) Date: Sun, 27 Oct 2024 17:06:20 GMT Message-Id: <202410271706.49RH6K36093190@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 7c64c77187f0 - main - sysutils/fusefs-bindfs: Simplify port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c64c77187f0c564aef90c73482a5cc4af0a27e9 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=7c64c77187f0c564aef90c73482a5cc4af0a27e9 commit 7c64c77187f0c564aef90c73482a5cc4af0a27e9 Author: Daniel Engberg AuthorDate: 2024-10-27 17:02:31 +0000 Commit: Daniel Engberg CommitDate: 2024-10-27 17:02:35 +0000 sysutils/fusefs-bindfs: Simplify port * Remove GNU_CONFIGURE_MANPREFIX * Remove if segment and rework Makefile PR: 282357 Reviewed by: Leon Dietrich (maintainer) --- sysutils/fusefs-bindfs/Makefile | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/sysutils/fusefs-bindfs/Makefile b/sysutils/fusefs-bindfs/Makefile index 0427d357c393..de87bf2c500d 100644 --- a/sysutils/fusefs-bindfs/Makefile +++ b/sysutils/fusefs-bindfs/Makefile @@ -14,21 +14,15 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= fuse:3 localbase:ldflags pkgconfig GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share + +CONFIGURE_ENV+= fuse3_LIBS="-L${LOCALBASE}/lib -lfuse3" +CONFIGURE_ARGS= --with-fuse3 PLIST_FILES= bin/bindfs \ share/man/man1/bindfs.1.gz -.include - -.if ${LIBFUSE_VER} == 3 -FUSEPKG= fuse3 -CONFIGURE_ENV+= FUSE_CFLAGS="-I${LOCALBASE}/include/fuse3" \ - FUSE_LIBS="-L${LOCALBASE}/lib -lfuse3" -LDFLAGS+= -lthr -.endif - -FUSE_VERSION= "`pkgconf --modversion ${FUSEPKG} | \ - ${SED} -E 's,^([0-9]+)\.([0-9]+)\..*,\1\2,'`" +post-patch: + @${REINPLACE_CMD} -e 's|-pthread|-lthr|g' \ + ${PATCH_WRKSRC}/configure -.include +.include