From eb72ca76ef7d9878d3f76537c542facb8c32ae2f Mon Sep 17 00:00:00 2001 From: antoine Date: Tue, 21 Mar 2017 21:59:31 +0000 Subject: - Add USES=samba to handle dependency on samba Valid ARGS: build, env, lib, run (default: build,run) - Add SAMBA_DEFAULT to bsd.default-versions.mk (default: 4.3) - Remove obsolete samba36 ports - Modify samba4x ports to install libsmbclient - Convert the ports tree to USES=samba Reviewed by: mat Differential Revision: https://reviews.freebsd.org/D8919 --- x11-fm/doublecmd/Makefile | 4 ++-- x11-fm/wcmcommander/Makefile | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'x11-fm') diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile index 00ecfaa832e7..b8ed299737e5 100644 --- a/x11-fm/doublecmd/Makefile +++ b/x11-fm/doublecmd/Makefile @@ -3,7 +3,7 @@ PORTNAME= doublecmd PORTVERSION= 0.7.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-fm MASTER_SITES= SF/${PORTNAME}/Double%20Commander%20Source DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -107,7 +107,7 @@ QT4_LIB_DEPENDS= libQt4Pas.so:x11-toolkits/qt4pas QT4_BUILD_DEPENDS= ${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt WCX_UNRAR_LIB_DEPENDS= libunrar.so.5:archivers/libunrar5 -WFX_SAMBA_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient +WFX_SAMBA_USES= samba:lib WLX_MPLAYER_RUN_DEPENDS= mplayer:multimedia/mplayer .include diff --git a/x11-fm/wcmcommander/Makefile b/x11-fm/wcmcommander/Makefile index d55d3b977655..aded2a54e6fe 100644 --- a/x11-fm/wcmcommander/Makefile +++ b/x11-fm/wcmcommander/Makefile @@ -4,7 +4,7 @@ PORTNAME= wcmcommander PORTVERSION= 0.20.0 DISTVERSIONPREFIX= release- -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fm MAINTAINER= amdmi3@FreeBSD.org @@ -28,8 +28,9 @@ OPTIONS_DEFAULT=FREETYPE SMB SSH FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 FREETYPE_CMAKE_BOOL= WITH_FREETYPE -SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient +SMB_USES= samba:lib SMB_CMAKE_BOOL= WITH_SMBCLIENT +SMB_CMAKE_ON= -DSMBCLIENT_LIBRARY=${SAMBALIBS}/libsmbclient.so -DSMBCLIENT_INCLUDE_DIR=${SAMBAINCLUDES} SSH_LIB_DEPENDS= libssh2.so:security/libssh2 SSH_CMAKE_BOOL= WITH_LIBSSH2 -- cgit