git: 823bd066c923 - main - Mk/Uses/samba.mk: Remove legacy variables
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 03 Feb 2025 23:27:32 UTC
The branch main has been updated by yasu:
URL: https://cgit.FreeBSD.org/ports/commit/?id=823bd066c923cb107485270d0f021a8ee0171b8a
commit 823bd066c923cb107485270d0f021a8ee0171b8a
Author: Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2025-02-03 02:58:53 +0000
Commit: Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2025-02-03 23:26:46 +0000
Mk/Uses/samba.mk: Remove legacy variables
* Replace occurrence of them in each port with new ones.
* Add entry to CHANGES.
Reviewed by: kiwi, mikael
Differential Revision: https://reviews.freebsd.org/D48801
---
CHANGES | 15 +++++++++++++++
Mk/Uses/samba.mk | 6 ------
filesystems/smbnetfs/Makefile | 4 ++--
multimedia/libxine/Makefile | 4 ++--
multimedia/mplayer/Makefile.optvars | 2 +-
net/pecl-smbclient/Makefile | 4 ++--
6 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/CHANGES b/CHANGES
index b7b8e8a93a40..7152c6609bd2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,21 @@ in the release notes and/or placed into UPDATING.
All ports committers are allowed to commit to this file.
+20250203:
+AUTHOR: yasu@FreeBSD.org
+
+Following legacy variables are removed from Mk/Uses/samba.mk
+
+* SAMBAPORT
+* SAMBAINCLUDES
+* SAMBALIBS
+
+And ones below should be used instead.
+
+* SAMBA_PORT
+* SAMBA_INCLUDEDIR
+* SAMBA_LIBDIR
+
20241231:
AUTHOR: bofh@FreeBSD.org
diff --git a/Mk/Uses/samba.mk b/Mk/Uses/samba.mk
index 9db89f7ed386..3f442b434227 100644
--- a/Mk/Uses/samba.mk
+++ b/Mk/Uses/samba.mk
@@ -45,10 +45,4 @@ LIB_DEPENDS+= libsmbclient.so:${SAMBA_PORT}
. if ${samba_ARGS:Mrun}
RUN_DEPENDS+= smbd:${SAMBA_PORT}
. endif
-
-# Legacy variables. Removing those requires a tree-wide update
-# and a note in the CHANGES file
-SAMBAPORT= ${SAMBA_PORT}
-SAMBAINCLUDES= ${SAMBA_INCLUDEDIR}
-SAMBALIBS= ${SAMBA_LIBDIR}
.endif
diff --git a/filesystems/smbnetfs/Makefile b/filesystems/smbnetfs/Makefile
index a577b6ece99b..8ff0341647ac 100644
--- a/filesystems/smbnetfs/Makefile
+++ b/filesystems/smbnetfs/Makefile
@@ -26,8 +26,8 @@ USE_GNOME= glib20:build
GNU_CONFIGURE= yes
# A hack to disable gratuitous linking with -lglib-2.0
CONFIGURE_ENV+= GLIB_LIBS=-L/var/empty
-CFLAGS+= -I${SAMBAINCLUDES} -DFUSE_USE_VERSION=${FUSE_VERSION}
-LDFLAGS+= -L${SAMBALIBS}
+CFLAGS+= -I${SAMBA_INCLUDEDIR} -DFUSE_USE_VERSION=${FUSE_VERSION}
+LDFLAGS+= -L${SAMBA_LIBDIR}
SUB_FILES= pkg-message
# configure just generated config.h -- we do not need to redo it:
MAKE_ARGS+= AUTOHEADER=${TRUE}
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 22e3c489b6e6..dcaac8b7598c 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -126,8 +126,8 @@ SDL_USE= SDL=sdl
SFTP_LIB_DEPENDS= libssh2.so:security/libssh2
SFTP_CONFIGURE_ENABLE= sftp
SMB_USES= samba:lib
-SMB_CONFIGURE_ENV= LIBSMBCLIENT_LIBS="-L${SAMBALIBS} -lsmbclient" \
- LIBSMBCLIENT_CFLAGS="-I${SAMBAINCLUDES}"
+SMB_CONFIGURE_ENV= LIBSMBCLIENT_LIBS="-L${SAMBA_LIBDIR} -lsmbclient" \
+ LIBSMBCLIENT_CFLAGS="-I${SAMBA_INCLUDEDIR}"
SMB_CONFIGURE_ENABLE= samba
SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
SNDIO_CONFIGURE_ENABLE= sndio
diff --git a/multimedia/mplayer/Makefile.optvars b/multimedia/mplayer/Makefile.optvars
index a01297813a61..0353ef4598a9 100644
--- a/multimedia/mplayer/Makefile.optvars
+++ b/multimedia/mplayer/Makefile.optvars
@@ -115,7 +115,7 @@ SKINS_RUN_DEPENDS= mplayer-skins>=0:multimedia/mplayer-skins
SKINS_IMPLIES= GUI
SMB_USES= samba:lib
-SMB_CONFIGURE_ON= --extra-ldflags="-L${SAMBALIBS}"
+SMB_CONFIGURE_ON= --extra-ldflags="-L${SAMBA_LIBDIR}"
SMB_CONFIGURE_OFF= --disable-smb
SPEEX_LIB_DEPENDS= libspeex.so:audio/speex
diff --git a/net/pecl-smbclient/Makefile b/net/pecl-smbclient/Makefile
index 247373a2e0ef..cab418368c25 100644
--- a/net/pecl-smbclient/Makefile
+++ b/net/pecl-smbclient/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
USES= php:pecl samba:lib
CONFIGURE_ARGS= --with-libsmbclient=${LOCALBASE}
-CPPFLAGS+= -I${SAMBAINCLUDES}
-LDFLAGS+= -L${SAMBALIBS}
+CPPFLAGS+= -I${SAMBA_INCLUDEDIR}
+LDFLAGS+= -L${SAMBA_LIBDIR}
.include <bsd.port.mk>