qiurui
/
freebsd-ports
mirror of https://git.FreeBSD.org/ports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Yasuhiro Kimura 2025-02-03 11:58:53 +09:00
parent 4537784c7c
commit 823bd066c9
6 changed files with 22 additions and 13 deletions
CHANGES
Mk/Uses
samba.mk
filesystems/smbnetfs
Makefile
multimedia
libxine
Makefile
mplayer
Makefile.optvars
net/pecl-smbclient
Makefile

15
CHANGES
View File

@ -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

6
Mk/Uses/samba.mk
View File

@ -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

4
filesystems/smbnetfs/Makefile
View File

@ -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}

4
multimedia/libxine/Makefile
View File

@ -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

2
multimedia/mplayer/Makefile.optvars
View File

@ -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

4
net/pecl-smbclient/Makefile
View File

@ -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>