From nobody Mon Feb 3 23:27:32 2025 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 4Yn2j05d06z5md1K; Mon, 03 Feb 2025 23:27:32 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yn2j04lvdz3pnG; Mon, 03 Feb 2025 23:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738625252; 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=JhSnhPe0HdI/+f9LavSaZxmGHrLtyMTfHG9ZtGcSHLE=; b=t9hh0CqPtgczbuenzCsbyMvhmgjtPF8Nvinjo3flKL2GvZg9z8uTR5ogQ59/P6p5TRjigX cAVdZ7SA902Nl/uayI1uSg3xWolEwC28rBdIASl/uSW/T2QMuyQ3f4m8BOr6kKUfwUnJKk ApdxIYcSEXocQiZqWZXI4vz8QQmvEHJEWdIeqmDznXEeow2RV6JF0StU2DD5IqLLBgoCts ZQxr1MSUXCIfAGn0ygAubsrp5Z4cFklTz5ELjzZ/nRE1NM5HYKlsE4Bj9Fea2rr3BmX5+6 jfxoOJ6mII+p2rjLYpy0Who4X+qkFzCkjmI3TLfuWg5/PTE5TLlkWExNrx/aOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738625252; 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=JhSnhPe0HdI/+f9LavSaZxmGHrLtyMTfHG9ZtGcSHLE=; b=YCQbPB9StkVNYKh6y6ZrOoIYJi1r8kOcbGC+LaZTy3IAy7LrqYsBs3Wf6mKFWxeruqvnD1 or4uPKS/dW3aqhwFQdWPdsYjQV3/GBTVDTy1AHLUYBlKySFkv3PhS2KXje8yMCElwmvmr7 2svkKJl8/z6EU8GnU6N6mO8toyIoq5/A1kXkPdgWvKZJtKxB4JV4FXsZ1jNj0RmYAG2MTg pGS1hKT3F0grIu5sDph6BdU/Ufis/2K7hiUyS9SaO4e8ct8LerwU6mmvaX0vQk1vJnvTwL PWohkXmfJIvvhfxPD12oMvSKBWqepo2OOqJ3WkDPjpY7zWLh+2efQegMKSj4hQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738625252; a=rsa-sha256; cv=none; b=BF6gmp0YK/PFYRFSWFSZUS2WIZW/2Ce37pj9erKqkP2fMyRnjysBbx+Q4S+pXwpYxMyDD0 AFaNyyQqV8I8hHMZ9svnogV9wwDmHvWDjxWerWkNHzIhxXUhabJm9ytUWNcGbFMr7lJe2v OZjbAVu+8rJnxCSDRtUa05VmFwsm9d/BeB+lbZsk08pYMvv3TP7PgY/93b0DaEhgocLQzc kW+chybKgo3lTqOeThaWhQs3GEnSC1eFQxnUCUgZFct08V3Yuf4ZIz30PFT30uaBas1NaW Rn1u7sVZK+9rA7Wy1gXPtlt88/lY3BsZnHyHiY1zng8bh3R9YF2Z9R3fQBeBvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yn2j040FmzxTQ; Mon, 03 Feb 2025 23:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 513NRW5M084741; Mon, 3 Feb 2025 23:27:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 513NRWm2084738; Mon, 3 Feb 2025 23:27:32 GMT (envelope-from git) Date: Mon, 3 Feb 2025 23:27:32 GMT Message-Id: <202502032327.513NRWm2084738@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: 823bd066c923 - main - Mk/Uses/samba.mk: Remove legacy variables 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 823bd066c923cb107485270d0f021a8ee0171b8a Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=823bd066c923cb107485270d0f021a8ee0171b8a commit 823bd066c923cb107485270d0f021a8ee0171b8a Author: Yasuhiro Kimura AuthorDate: 2025-02-03 02:58:53 +0000 Commit: Yasuhiro Kimura 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