diff options
| author | Yasuhiro Kimura <yasu@FreeBSD.org> | 2023-11-03 08:59:50 +0000 |
|---|---|---|
| committer | Yasuhiro Kimura <yasu@FreeBSD.org> | 2023-11-18 00:27:23 +0000 |
| commit | 88d031b449271f1beb10d96ff344582429bfada9 (patch) | |
| tree | 94bdb2ab0619f384d55ebc718c39eff3fd8de8bd | |
| parent | ce99a9feeaab7628b8379ab5a59c115b87e0ecaa (diff) | |
| download | ports-88d031b449271f1beb10d96ff344582429bfada9.tar.gz ports-88d031b449271f1beb10d96ff344582429bfada9.zip | |
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
| -rw-r--r-- | net/samba413/Makefile | 10 | ||||
| -rw-r--r-- | 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}" \ |