From nobody Sat Nov 18 00:30:00 2023 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 4SXF611hJVz51Xfp; Sat, 18 Nov 2023 00:30:01 +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 4SXF6111sgz4Y0M; Sat, 18 Nov 2023 00:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700267401; 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=AmBL96BQ57FHX+bcJCsJIYlOTMkEERPMREtvaScjtbU=; b=ONRUZaK955MHozgt4ZiHxu5QA9dh3C78wyzivFY0adP5M/pR/GeaqDK6maYz+h6hyJgB3X meMCe/5QkJzE0FECZC7l7kw5+5dNA5ySza48k1ihIab1/v6D+laf2HZb+mLBeiMcQgdKaN 9kf0oI5KNp6Kdy4rVZR1Rd/2nyK9woJAI7Dg8Uy0st30BUCEjN6/K+QlorXCguNr8HcOrI o0/ZkYmkZx54khxKieJL6JsXPDh7j7h4OTC49Vvai68DxtOlrbDsF2pGqGgkss5IJG6OI0 dLuJN6EAEGOjyO8XmXPs64FVBMEBRHT0sV5m468Adr7aCr3zVSQjDAAUyboBdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700267401; 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=AmBL96BQ57FHX+bcJCsJIYlOTMkEERPMREtvaScjtbU=; b=V81K7HQwJlr+2LQyQdfSAUnE3JXMcMOAs4ztr2vpFdPWJwMvbZPECF2B4gq3FtZfB851I5 uqJwYmA3YDKZGabZ6dKHIgWjABv5bPhG+D95PlelnH/f83oQEneacHKUASz3GukJ2RCQgT BRq9UKlyiaFfdaKPVkPmcMAFXZd8efXldLV0TqbhyzOKSxkG1sD6hb4lv050sutBgMY2XZ bs4IjOsl7zVAEqICrP/DEOHJaHGhLJZEz0nIq0GL7jGusiwKXZekAkoZ+CiHMS+78mJz5u DIwMJiaEl5VwCHABcAlM3F/eafkWwfmUreldo4W/XOJsiSfAV/+pZuKCr115lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700267401; a=rsa-sha256; cv=none; b=F4W2odxTgwqEEPMHNIQEZ6jiLnRY1Q6pBTZ178yrhKxpDXFcmxWyYKjCbVfO/ABvoA0TET 88sYa9V2voAR0tTDd9AHi52lh11CQBe6K4iCzzxs2sY1xR4G1OWlfJcCVTxMLJ/8H64may XGxqly+5wDJLncOjGXe/yoUHt9ExOj1kpsH1DUR/ortI3u5GF9H8mB8HOSklQn67V//nzO YwJsjhj+9oEQfCC7bp3im7KO7mg5BRnlniB+7Xxx4gx0sQwOiI4jGctIl28knD3H0LLEmP gs9ZLtpWK/lp0jSYoM7DCPMT36tncuLp6VaZ5yPix3naxTKXMkYrRQrSOdZgoA== 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 4SXF6106HGz14f9; Sat, 18 Nov 2023 00:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AI0U0Zw014801; Sat, 18 Nov 2023 00:30:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AI0U0RE014797; Sat, 18 Nov 2023 00:30:00 GMT (envelope-from git) Date: Sat, 18 Nov 2023 00:30:00 GMT Message-Id: <202311180030.3AI0U0RE014797@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 88d031b44927 - main - net/samba41[36]: Make 'USES=shebangfix' work as is expected 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88d031b449271f1beb10d96ff344582429bfada9 Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=88d031b449271f1beb10d96ff344582429bfada9 commit 88d031b449271f1beb10d96ff344582429bfada9 Author: Yasuhiro Kimura AuthorDate: 2023-11-03 08:59:50 +0000 Commit: Yasuhiro Kimura CommitDate: 2023-11-18 00:27:23 +0000 net/samba41[36]: Make 'USES=shebangfix' work as is expected While testing patch submitted to bug #270383, I noticed 'USES=shebangfix' doesn't work as is expected with current samba ports. According to the investigation by Tatsuki Makino, it is because SHEBANG_FILES is defined after bsd.port.options.mk and bsd.port.pre.mk are included. So fix the issue by moving the definition before the inclusion of them Reference: https://lists.freebsd.org/archives/freebsd-ports/2023-November/004849.html Reference: https://lists.freebsd.org/archives/freebsd-ports/2023-November/004852.html Reference: https://lists.freebsd.org/archives/freebsd-ports/2023-November/004853.html PR: 274885 Approved by: maintainer timeout --- net/samba413/Makefile | 10 +++++----- net/samba416/Makefile | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/net/samba413/Makefile b/net/samba413/Makefile index 6afbeb0ef94b..8d9915a9ea16 100644 --- a/net/samba413/Makefile +++ b/net/samba413/Makefile @@ -1,6 +1,6 @@ PORTNAME= ${SAMBA4_BASENAME}413 PORTVERSION= ${SAMBA4_VERSION} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -102,6 +102,10 @@ USE_LDCONFIG= ${SAMBA4_LIBDIR} WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log +# Make sure that the right version of Python is used by the tools +# https://bugzilla.samba.org/show_bug.cgi?id=7305 +SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/* ${PATCH_WRKSRC}/selftest/* + PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PKGCONFIGDIR_REL?= ${PKGCONFIGDIR:S,^${PREFIX}/,,} PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR_REL} @@ -575,10 +579,6 @@ MAKE_ENV+= RPCGEN_CPP="${CPP}" # undefined symbols. LDFLAGS+= -Wl,--undefined-version -# Make sure that the right version of Python is used by the tools -# https://bugzilla.samba.org/show_bug.cgi?id=7305 -SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/* ${PATCH_WRKSRC}/selftest/* - SAMBA4_SUB= SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \ SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \ SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \ diff --git a/net/samba416/Makefile b/net/samba416/Makefile index ebc257d9ab3d..91962ceac147 100644 --- a/net/samba416/Makefile +++ b/net/samba416/Makefile @@ -1,6 +1,6 @@ PORTNAME= ${SAMBA4_BASENAME}416 PORTVERSION= ${SAMBA4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -105,6 +105,10 @@ USE_LDCONFIG= ${SAMBA4_LIBDIR} WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log +# Make sure that the right version of Python is used by the tools +# https://bugzilla.samba.org/show_bug.cgi?id=7305 +SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/* ${PATCH_WRKSRC}/selftest/* + PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PKGCONFIGDIR_REL?= ${PKGCONFIGDIR:S,^${PREFIX}/,,} PLIST_SUB= PKGCONFIGDIR=${PKGCONFIGDIR_REL} @@ -555,10 +559,6 @@ MAKE_ENV+= RPCGEN_CPP="${CPP}" #CFLAGS+= -D_FUNCTION_DEF #.endif -# Make sure that the right version of Python is used by the tools -# https://bugzilla.samba.org/show_bug.cgi?id=7305 -SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/* ${PATCH_WRKSRC}/selftest/* - SAMBA4_SUB= SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \ SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \ SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \