Page MenuHomeFreeBSD
Files F153249612

D48801.diff
No OneTemporary
Actions

D48801.diff
View Options

diff --git a/CHANGES b/CHANGES
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,21 @@
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
--- a/Mk/Uses/samba.mk
+++ b/Mk/Uses/samba.mk
@@ -45,10 +45,4 @@
. 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
--- a/filesystems/smbnetfs/Makefile
+++ b/filesystems/smbnetfs/Makefile
@@ -26,8 +26,8 @@
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
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -126,8 +126,8 @@
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
--- a/multimedia/mplayer/Makefile.optvars
+++ b/multimedia/mplayer/Makefile.optvars
@@ -115,7 +115,7 @@
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
--- a/net/pecl-smbclient/Makefile
+++ b/net/pecl-smbclient/Makefile
@@ -13,7 +13,7 @@
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>

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 21, 1:43 AM (4 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31878226
Default Alt Text
D48801.diff (2 KB)

Event Timeline