svn commit: r436659 - in head: . Mk Mk/Uses audio/musicpd audio/xmms2 devel/gnome-vfs devel/gvfs emulators/qemu emulators/qemu-devel emulators/qemu-sbruno mail/libmapi misc/amanda-server misc/linm ...
Antoine Brodin
antoine at FreeBSD.org
Tue Mar 21 21:59:37 UTC 2017
Author: antoine
Date: Tue Mar 21 21:59:31 2017
New Revision: 436659
URL: https://svnweb.freebsd.org/changeset/ports/436659
Log:
- 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
Added:
head/Mk/Uses/samba.mk (contents, props changed)
Deleted:
head/net/samba-libsmbclient/
head/net/samba-nmblookup/
head/net/samba-smbclient/
head/net/samba36/
Modified:
head/MOVED
head/Mk/bsd.default-versions.mk
head/UPDATING
head/audio/musicpd/Makefile
head/audio/xmms2/Makefile
head/devel/gnome-vfs/Makefile
head/devel/gvfs/Makefile
head/emulators/qemu-devel/Makefile
head/emulators/qemu-devel/pkg-message
head/emulators/qemu-sbruno/Makefile
head/emulators/qemu-sbruno/pkg-message
head/emulators/qemu/Makefile
head/emulators/qemu/pkg-message
head/mail/libmapi/Makefile
head/misc/amanda-server/Makefile
head/misc/linm/Makefile
head/multimedia/ffmpeg/Makefile
head/multimedia/gmerlin-avdecoder/Makefile
head/multimedia/kodi/Makefile
head/multimedia/libxine/Makefile
head/multimedia/mplayer/Makefile.common
head/multimedia/mplayer/Makefile.optvars
head/multimedia/mplayer2/Makefile
head/multimedia/mpv/Makefile
head/multimedia/vlc/Makefile
head/net-mgmt/sdig/pkg-message
head/net/Makefile
head/net/freeradius2/Makefile
head/net/jags/Makefile
head/net/opennx/Makefile
head/net/p5-Filesys-SmbClient/Makefile
head/net/p5-Filesys-SmbClient/files/patch-Makefile.PL
head/net/pecl-smbclient/Makefile
head/net/prosearch/Makefile
head/net/samba42/Makefile
head/net/samba42/pkg-plist
head/net/samba43/Makefile
head/net/samba43/pkg-plist
head/net/samba44/Makefile
head/net/samba44/pkg-plist
head/net/smb4k-kde4/Makefile
head/print/apsfilter/Makefile
head/print/cups-smb-backend/Makefile
head/print/gnome-cups-manager/Makefile
head/security/samba-virusfilter/Makefile
head/security/sssd/Makefile
head/sysutils/backuppc-devel/Makefile
head/sysutils/backuppc/Makefile
head/sysutils/fusefs-smbnetfs/Makefile
head/sysutils/gnome-control-center/Makefile
head/www/elinks/Makefile
head/www/mod_ntlm2/Makefile
head/www/smb_auth/Makefile
head/www/squid-devel/Makefile
head/www/squid/Makefile
head/x11-fm/doublecmd/Makefile
head/x11-fm/wcmcommander/Makefile
head/x11/kde4-runtime/Makefile
Modified: head/MOVED
==============================================================================
--- head/MOVED Tue Mar 21 21:28:41 2017 (r436658)
+++ head/MOVED Tue Mar 21 21:59:31 2017 (r436659)
@@ -9142,7 +9142,11 @@ devel/rubygem-devise-rails4|devel/rubyge
textproc/rubygem-github-markdown||2017-03-16|Has expired: This gem is not maintained and not supported by upstream
chinese/irssi|irc/irssi|2017-03-17|Use irc/irssi, which can handle Chinese locales
archivers/macutils||2017-03-19|Has expired: Not maintained in 16 years, many missing header inclusions
-www/npm012|www/npm|2017-03-20|Has expired: Depends on deprecated www/node012. Please use www/npm instead.
+www/npm012|www/npm|2017-03-20|Has expired: Depends on deprecated www/node012. Please use www/npm instead
sysutils/ucspi-ssl-tls|sysutils/ucspi-ssl|2017-03-20|Current ucspi-ssl supports TLS
net/rubygem-signet|security/rubygem-signet|2017-03-20|Duplicate
www/node012|www/node|2017-03-21|Has expired: Upstream has placed 0.12.x in maintenance mode, see https://github.com/nodejs/LTS
+net/samba-libsmbclient|net/samba43|2017-03-21|Obsolete
+net/samba-nmblookup|net/samba43|2017-03-21|Obsolete
+net/samba-smbclient|net/samba43|2017-03-21|Obsolete
+net/samba36|net/samba43|2017-03-21|Obsolete
Added: head/Mk/Uses/samba.mk
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/Mk/Uses/samba.mk Tue Mar 21 21:59:31 2017 (r436659)
@@ -0,0 +1,51 @@
+# $FreeBSD$
+#
+# Handle dependency on samba
+#
+# Feature: samba
+# Usage: USES=samba or USES=samba:ARGS
+# Valid ARGS: build, env, lib, run
+# default is build,run (implicit)
+#
+# When subpackages are available this can be more granular
+#
+
+.if !defined(_INCLUDE_USES_SAMBA_MK)
+_INCLUDE_USES_SAMBA_MK= yes
+
+.if !${samba_ARGS}
+samba_ARGS= build run
+.endif
+
+.if ${samba_ARGS:Nbuild:Nenv:Nlib:Nrun}
+IGNORE= USES=samba has invalid arguments: ${samba_ARGS:Nbuild:Nenv:Nlib:Nrun}
+.endif
+
+.if ${SAMBA_DEFAULT} == 4.2
+SAMBAINCLUDES= ${LOCALBASE}/include/samba4
+SAMBALIBS= ${LOCALBASE}/lib
+SAMBAPORT= net/samba42
+.elif ${SAMBA_DEFAULT} == 4.3
+SAMBAINCLUDES= ${LOCALBASE}/include/samba4
+SAMBALIBS= ${LOCALBASE}/lib
+SAMBAPORT= net/samba43
+.elif ${SAMBA_DEFAULT} == 4.4
+SAMBAINCLUDES= ${LOCALBASE}/include/samba4
+SAMBALIBS= ${LOCALBASE}/lib/samba4
+SAMBAPORT= net/samba44
+.else
+IGNORE= Invalid version of samba: ${SAMBA_DEFAULT}
+.endif
+
+.if ${samba_ARGS:Mbuild}
+BUILD_DEPENDS+= smbd:${SAMBAPORT}
+.endif
+.if ${samba_ARGS:Mlib}
+LIB_DEPENDS+= libsmbclient.so:${SAMBAPORT}
+.endif
+.if ${samba_ARGS:Mrun}
+RUN_DEPENDS+= smbd:${SAMBAPORT}
+.endif
+
+.endif
+
Modified: head/Mk/bsd.default-versions.mk
==============================================================================
--- head/Mk/bsd.default-versions.mk Tue Mar 21 21:28:41 2017 (r436658)
+++ head/Mk/bsd.default-versions.mk Tue Mar 21 21:59:31 2017 (r436659)
@@ -83,6 +83,8 @@ PYTHON2_DEFAULT?= 2.7
PYTHON3_DEFAULT?= 3.5
# Possible values: 2.1, 2.2, 2.3, 2.4
RUBY_DEFAULT?= 2.3
+# Possible values: 4.2, 4.3, 4.4
+SAMBA_DEFAULT?= 4.3
# Possible values: base, openssl, openssl-devel, libressl, libressl-devel
.if !defined(SSL_DEFAULT)
# If no preference was set, check for an installed base version
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Tue Mar 21 21:28:41 2017 (r436658)
+++ head/UPDATING Tue Mar 21 21:59:31 2017 (r436659)
@@ -5,6 +5,35 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20170321:
+ AFFECTS: users of samba36-libsmbclient, samba36-nmblookup samba36-smbclient and samba36
+ AUTHOR: antoine at FreeBSD.org
+
+ The obsolete samba36-libsmbclient, samba36-nmblookup, samba36-smbclient and samba36 packages/ports were removed
+ and USES=samba was introduced.
+ Upgrade instructions:
+
+ For package users having those ports installed indirectly (as dependencies):
+ # pkg upgrade
+
+ For package users having those ports installed directly (leaf ports):
+ # pkg upgrade
+ # pkg install samba43
+
+ For ports users:
+ Choose you samba version, for instance add DEFAULT_VERSIONS+= samba=4.3 to make.conf
+
+ Remove obsolete packages:
+ # pkg delete -f samba36-libsmbclient samba36-nmblookup samba36-smbclient samba36
+
+ Portmaster users:
+ # portmaster net/samba43
+ # portmaster -a
+
+ Portupgrade users:
+ # portupgrade net/samba43
+ # portupgrade -a
+
20170319:
AFFECTS: users of mail/pecl-mailparse
AUTHOR: dbaio at bsd.com.br
Modified: head/audio/musicpd/Makefile
==============================================================================
--- head/audio/musicpd/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/audio/musicpd/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -2,6 +2,7 @@
PORTNAME= musicpd
PORTVERSION= 0.20.6
+PORTREVISION= 1
CATEGORIES= audio ipv6
MASTER_SITES= http://www.musicpd.org/download/mpd/${PORTVERSION:R}/
DISTNAME= mpd-${PORTVERSION}
@@ -121,7 +122,7 @@ SAMPLERATE_LIB_DEPENDS=libsamplerate.so:
SIDPLAY2_CONFIGURE_ENABLE=sidplay
SIDPLAY2_LIB_DEPENDS=libsidplay2.so:audio/libsidplay2
SMB_CONFIGURE_enable=smbclient
-SMB_LIB_DEPENDS=libsmbclient.so:net/samba-libsmbclient
+SMB_USES= samba:lib
SNDFILE_CONFIGURE_ENABLE=sndfile
SNDFILE_LIB_DEPENDS=libsndfile.so:audio/libsndfile
SNDIO_CONFIGURE_ENABLE=sndio
Modified: head/audio/xmms2/Makefile
==============================================================================
--- head/audio/xmms2/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/audio/xmms2/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -4,7 +4,7 @@
PORTNAME?= xmms2
PORTVERSION= 0.8
DISTVERSIONSUFFIX= DrO_o
-PORTREVISION?= 19
+PORTREVISION?= 20
CATEGORIES?= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20${DISTVERSIONSUFFIX}
@@ -122,7 +122,9 @@ MUSEPACK_CONFIGURE_OFF= --without-plugin
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
PULSEAUDIO_CONFIGURE_OFF= --without-plugins="pulse"
-SAMBA_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
+SAMBA_USES= samba:lib
+SAMBA_CPPFLAGS= -I${SAMBAINCLUDES}
+SAMBA_LDFLAGS= -L${SAMBALIBS}
SAMBA_CONFIGURE_OFF= --without-plugins="samba"
SID_LIB_DEPENDS= libsidplay2.so:audio/libsidplay2
Modified: head/devel/gnome-vfs/Makefile
==============================================================================
--- head/devel/gnome-vfs/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/devel/gnome-vfs/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -3,7 +3,7 @@
PORTNAME= gnome-vfs
PORTVERSION= 2.24.4
-PORTREVISION?= 4
+PORTREVISION?= 5
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -60,7 +60,8 @@ CONFIGURE_ARGS+=--disable-hal
.endif
.if ${PORT_OPTIONS:MSAMBA}
-LIB_DEPENDS+= libsmbclient.so:net/samba-libsmbclient
+CONFIGURE_ARGS+=--with-samba-includes=${SAMBAINCLUDES} --with-samba-libs=${SAMBALIBS}
+USES+= samba:lib
PLIST_SUB+= SAMBA=""
.else
PLIST_SUB+= SAMBA="@comment "
Modified: head/devel/gvfs/Makefile
==============================================================================
--- head/devel/gvfs/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/devel/gvfs/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -3,7 +3,7 @@
PORTNAME= gvfs
PORTVERSION= 1.26.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -53,8 +53,9 @@ GOOGLE_DESC= Google backend
FUSE_USES= fuse
FUSE_CONFIGURE_ENABLE= fuse
-SAMBA_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
+SAMBA_USES= samba:lib
SAMBA_CONFIGURE_ENABLE= samba
+SAMBA_CONFIGURE_WITH= samba-includes=${SAMBAINCLUDES} samba-libs=${SAMBALIBS}
CDDA_LIB_DEPENDS= libcdio_paranoia.so:sysutils/libcdio-paranoia
CDDA_CONFIGURE_ENABLE= cdda
Modified: head/emulators/qemu-devel/Makefile
==============================================================================
--- head/emulators/qemu-devel/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/emulators/qemu-devel/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -3,7 +3,7 @@
PORTNAME= qemu
DISTVERSION= 2.6.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= emulators
MASTER_SITES= http://wiki.qemu.org/download/
PKGNAMESUFFIX= -devel
@@ -63,7 +63,7 @@ PCAP_EXTRA_PATCHES= ${FILESDIR}/pcap-pat
STATIC_LINK_CONFIGURE_ON= --static
STATIC_LINK_PREVENTS= GTK2 X11
STATIC_LINK_PREVENTS_MSG= X11 ui cannot be built static
-SAMBA_RUN_DEPENDS= ${LOCALBASE}/sbin/smbd:net/samba36
+SAMBA_USES= samba:run # smbd
DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html
DOCS_USES= makeinfo
DOCS_MAKE_ARGS_OFF= NOPORTDOCS=1
Modified: head/emulators/qemu-devel/pkg-message
==============================================================================
--- head/emulators/qemu-devel/pkg-message Tue Mar 21 21:28:41 2017 (r436658)
+++ head/emulators/qemu-devel/pkg-message Tue Mar 21 21:59:31 2017 (r436659)
@@ -44,7 +44,7 @@ FreeBSD host notes
the same way.
- The -smb option (smb-export local dir to guest using the default
- slirp networking) needs the net/samba36 port/package installed
+ slirp networking) needs the samba port/package installed
in addition to qemu. (SAMBA knob.)
- If you want to use usb devices connected to the host in the guest
Modified: head/emulators/qemu-sbruno/Makefile
==============================================================================
--- head/emulators/qemu-sbruno/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/emulators/qemu-sbruno/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -3,6 +3,7 @@
PORTNAME= qemu
PORTVERSION= 2.8.50.g20170307
+PORTREVISION= 1
CATEGORIES= emulators
MASTER_SITES= GH \
LOCAL/nox:dtc \
@@ -211,7 +212,7 @@ CONFIGURE_ARGS+= --static
.endif
.if ${PORT_OPTIONS:MSAMBA}
-RUN_DEPENDS+= ${LOCALBASE}/sbin/smbd:net/samba36
+USES+= samba:run # smbd
.endif
.if ${PORT_OPTIONS:MDOCS}
Modified: head/emulators/qemu-sbruno/pkg-message
==============================================================================
--- head/emulators/qemu-sbruno/pkg-message Tue Mar 21 21:28:41 2017 (r436658)
+++ head/emulators/qemu-sbruno/pkg-message Tue Mar 21 21:59:31 2017 (r436659)
@@ -44,7 +44,7 @@ FreeBSD host notes
the same way.
- The -smb option (smb-export local dir to guest using the default
- slirp networking) needs the net/samba36 port/package installed
+ slirp networking) needs the samba port/package installed
in addition to qemu. (SAMBA knob.)
- If you want to use usb devices connected to the host in the guest
Modified: head/emulators/qemu/Makefile
==============================================================================
--- head/emulators/qemu/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/emulators/qemu/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -3,7 +3,7 @@
PORTNAME= qemu
PORTVERSION= 2.8.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= emulators
MASTER_SITES= http://wiki.qemu.org/download/
DIST_SUBDIR= qemu/${PORTVERSION}
@@ -66,7 +66,7 @@ STATIC_LINK_CONFIGURE_ON= --static
STATIC_LINK_PREVENTS= GTK2 X11
STATIC_LINK_PREVENTS_MSG= X11 ui cannot be built static
NCURSES_USES= ncurses:base
-SAMBA_RUN_DEPENDS= ${LOCALBASE}/sbin/smbd:net/samba36
+SAMBA_USES= samba:run # smbd
DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html
DOCS_USES= makeinfo
DOCS_MAKE_ARGS_OFF= NOPORTDOCS=1
Modified: head/emulators/qemu/pkg-message
==============================================================================
--- head/emulators/qemu/pkg-message Tue Mar 21 21:28:41 2017 (r436658)
+++ head/emulators/qemu/pkg-message Tue Mar 21 21:59:31 2017 (r436659)
@@ -44,7 +44,7 @@ FreeBSD host notes
the same way.
- The -smb option (smb-export local dir to guest using the default
- slirp networking) needs the net/samba36 port/package installed
+ slirp networking) needs the samba port/package installed
in addition to qemu. (SAMBA knob.)
- If you want to use usb devices connected to the host in the guest
Modified: head/mail/libmapi/Makefile
==============================================================================
--- head/mail/libmapi/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/mail/libmapi/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -3,7 +3,7 @@
PORTNAME= libmapi
PORTVERSION= 2.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= mail
MASTER_SITES= https://github.com/openchange/openchange/archive/
DISTNAME= openchange-${PORTVERSION}-${CODENAME}
@@ -28,7 +28,7 @@ WRKSRC= ${WRKDIR}/openchange-openchange
USE_MYSQL= yes
USES= autoreconf:build bison compiler:c++11-lib gmake pathfix \
- pkgconfig python shebangfix sqlite
+ pkgconfig python samba:lib shebangfix sqlite
PATHFIX_MAKEFILEIN= Makefile
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
@@ -48,24 +48,18 @@ SHEBANG_FILES= libmapi/conf/mparse.pl \
OPTIONS_SUB= yes
OPTIONS_DEFINE= BOOST DOXYGEN
-# SAMBA43
OPTIONS_DEFAULT=BOOST
BOOST_LIB_DEPENDS= libboost_thread.so:devel/boost-libs
BOOST_CONFIGURE_ENV_OFF= ov_cv_boost_thread=no
BOOST_DESC= libmapi C++ library (needs boost)
DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
DOXYGEN_CONFIGURE_ENV_OFF= ac_cv_path_DOXYGEN=""
-SAMBA43_DESC= Build agains samba 4.3 instead of 4.2
+PLIST_SUB= SAMBA=${SAMBAPORT:T}
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
-# no support for samba 4.3 yet
-.if ${PORT_OPTIONS:MSAMBA43}
-SAMBA_DEP= samba43>=4.3.0:net/samba43
-PLIST_SUB+= SAMBA=samba43
-.else
-SAMBA_DEP= samba42>=4.2.0:net/samba42
-PLIST_SUB+= SAMBA=samba42
+.if ${SAMBA_DEFAULT} == 4.4
+BROKEN= fails to build
.endif
# --enable-openchange-qt4 Compile OpenChange Qt4 wrapper.
@@ -89,4 +83,4 @@ post-install:
@${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/shared-modules/dcerpc_server/*.so
@${STRIP_CMD} ${STAGEDIR}/${PREFIX}/modules/dcerpc_mapiproxy*/*.so
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Modified: head/misc/amanda-server/Makefile
==============================================================================
--- head/misc/amanda-server/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/misc/amanda-server/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -3,7 +3,7 @@
PORTNAME= amanda
PORTVERSION= 3.3.6
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= misc
MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION}
@@ -121,9 +121,7 @@ CONFIGURE_ARGS+= --without-gnuplot
.endif
.if ${PORT_OPTIONS:MSAMBA}
-SAMBA_PORT?= samba44
-BUILD_DEPENDS+= smbclient:net/${SAMBA_PORT}
-RUN_DEPENDS+= smbclient:net/${SAMBA_PORT}
+USES+= pkgconfig samba
CONFIGURE_ARGS+= --with-smbclient=${LOCALBASE}/bin/smbclient
.endif
Modified: head/misc/linm/Makefile
==============================================================================
--- head/misc/linm/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/misc/linm/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -3,7 +3,7 @@
PORTNAME= linm
DISTVERSION= 0.8.1-1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= misc shells
MASTER_SITES= http://kldp.net/frs/download.php/4508/
DISTNAME= ${PORTNAME}_${DISTVERSION}
@@ -28,8 +28,10 @@ LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS_DEFINE= SMB DOCS
OPTIONS_SUB= yes
-SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
SMB_CONFIGURE_ENV_OFF= ac_cv_lib_smbclient_smbc_new_context=no
+SMB_CPPFLAGS= -I${SAMBAINCLUDES}
+SMB_LIBS= -L${SAMBALIBS}
+SMB_USES= iconv samba:lib
post-patch:
@${REINPLACE_CMD} -e 's|configpath|cfgpath|g' ${WRKSRC}/configure
Modified: head/multimedia/ffmpeg/Makefile
==============================================================================
--- head/multimedia/ffmpeg/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/multimedia/ffmpeg/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -3,7 +3,7 @@
PORTNAME= ffmpeg
PORTVERSION= 3.2.4
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= http://ffmpeg.org/releases/
@@ -305,7 +305,7 @@ SDL_CONFIGURE_ENABLE= ffplay
SDL_CONFIGURE_OFF= --disable-outdev=sdl --disable-sdl2
# smbclient
-SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
+SMB_USES= samba:lib
SMB_CONFIGURE_ENABLE= libsmbclient
SMB_IMPLIES= GPL3
Modified: head/multimedia/gmerlin-avdecoder/Makefile
==============================================================================
--- head/multimedia/gmerlin-avdecoder/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/multimedia/gmerlin-avdecoder/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -3,7 +3,7 @@
PORTNAME= gmerlin-avdecoder
PORTVERSION= 1.2.0
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= multimedia
MASTER_SITES= SF/gmerlin/${PORTNAME}/${PORTVERSION}
@@ -87,7 +87,9 @@ CONFIGURE_ARGS+=--disable-libtiff
.endif
.if ${PORT_OPTIONS:MSAMBA}
-LIB_DEPENDS+= libsmbclient.so:net/samba-libsmbclient
+USES+= samba:lib
+CPPFLAGS+= -I${SAMBAINCLUDES}
+LDFLAGS+= -L${SAMBALIBS}
.else
CONFIGURE_ARGS+=--disable-samba
.endif
Modified: head/multimedia/kodi/Makefile
==============================================================================
--- head/multimedia/kodi/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/multimedia/kodi/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -2,7 +2,7 @@
PORTNAME= kodi
DISTVERSION= 16.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= multimedia java
MAINTAINER= mickael.maillot at gmail.com
@@ -136,8 +136,7 @@ PULSEAUDIO_CONFIGURE_ENABLE= pulse
RTMP_LIB_DEPENDS= librtmp.so:multimedia/librtmp
RTMP_CONFIGURE_ENABLE= rtmp
-SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
-SMB_RUN_DEPENDS= nmblookup:net/samba-nmblookup
+SMB_USES= samba:lib
SMB_CONFIGURE_ENABLE= samba
VAAPI_LIB_DEPENDS= libva.so:multimedia/libva
Modified: head/multimedia/libxine/Makefile
==============================================================================
--- head/multimedia/libxine/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/multimedia/libxine/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -3,7 +3,7 @@
PORTNAME= xine
PORTVERSION= 1.2.6
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= multimedia ipv6
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
PKGNAMEPREFIX= lib
@@ -97,9 +97,9 @@ XVMC_CONFIGURE_ON= --with-xvmc-lib=XvMCW
XVMC_LIB_DEPENDS= libXvMC.so:x11/libXvMC
.endif
XVMC_CONFIGURE_OFF= --disable-xvmc
-SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
-SMB_CONFIGURE_ENV= LIBSMBCLIENT_LIBS="-L${LOCALBASE}/lib -lsmbclient" \
- LIBSMBCLIENT_CFLAGS="-I${LOCALBASE}/include"
+SMB_USES= samba:lib
+SMB_CONFIGURE_ENV= LIBSMBCLIENT_LIBS="-L${SAMBALIBS} -lsmbclient" \
+ LIBSMBCLIENT_CFLAGS="-I${SAMBAINCLUDES}"
SMB_CONFIGURE_ENABLE= samba
AALIB_LIB_DEPENDS= libaa.so:graphics/aalib
AALIB_CONFIGURE_OFF= --disable-aalib --disable-aalibtest
Modified: head/multimedia/mplayer/Makefile.common
==============================================================================
--- head/multimedia/mplayer/Makefile.common Tue Mar 21 21:28:41 2017 (r436658)
+++ head/multimedia/mplayer/Makefile.common Tue Mar 21 21:59:31 2017 (r436659)
@@ -6,7 +6,7 @@
MPLAYER_PORT_VERSION= 1.3.0
MPLAYER_SNAPSHOT_DATE= 2016-12-28
-PORTREVISION?= 4
+PORTREVISION?= 5
MASTER_SITES= LOCAL/riggs/mplayer
DISTNAME= mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
Modified: head/multimedia/mplayer/Makefile.optvars
==============================================================================
--- head/multimedia/mplayer/Makefile.optvars Tue Mar 21 21:28:41 2017 (r436658)
+++ head/multimedia/mplayer/Makefile.optvars Tue Mar 21 21:59:31 2017 (r436659)
@@ -116,7 +116,8 @@ SNDIO_CONFIGURE_OFF= --disable-sndio
SKINS_RUN_DEPENDS= mplayer-skins>=0:multimedia/mplayer-skins
SKINS_IMPLIES= GUI
-SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
+SMB_USES= samba:lib
+SMB_CONFIGURE_ON= --extra-ldflags="-L${SAMBALIBS}"
SMB_CONFIGURE_OFF= --disable-smb
SPEEX_LIB_DEPENDS= libspeex.so:audio/speex
Modified: head/multimedia/mplayer2/Makefile
==============================================================================
--- head/multimedia/mplayer2/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/multimedia/mplayer2/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -2,7 +2,7 @@
PORTNAME= mplayer2
PORTVERSION= ${MPLAYER2_PORT_VERSION}
-PORTREVISION= 28
+PORTREVISION= 29
CATEGORIES= multimedia audio
MASTER_SITES= LOCAL/gblach/
@@ -148,7 +148,8 @@ RTCPU_CONFIGURE_OFF= --disable-runtime-c
SDL_USE= SDL=sdl
SDL_CONFIGURE_OFF= --disable-sdl
-SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
+SMB_USES= samba:lib
+SMB_CONFIGURE_ON= --extra-cflags="-I${SAMBAINCLUDES}" --extra-ldflags="-L${SAMBALIBS}"
SMB_CONFIGURE_OFF= --disable-smb
SPEEX_LIB_DEPENDS= libspeex.so:audio/speex
Modified: head/multimedia/mpv/Makefile
==============================================================================
--- head/multimedia/mpv/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/multimedia/mpv/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -4,7 +4,7 @@
PORTNAME= mpv
PORTVERSION= 0.24.0
DISTVERSIONPREFIX= v
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= multimedia audio
@@ -118,7 +118,7 @@ SNDIO_LIB_DEPENDS= libsndio.so:audio/sn
SNDIO_CONFIGURE_ON= --enable-sndio
SNDIO_CONFIGURE_OFF= --disable-sndio
-SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
+SMB_USES= samba:lib
SMB_CONFIGURE_OFF= --disable-libsmbclient
UCHARDET_LIB_DEPENDS= libuchardet.so:textproc/uchardet
Modified: head/multimedia/vlc/Makefile
==============================================================================
--- head/multimedia/vlc/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/multimedia/vlc/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -3,7 +3,7 @@
PORTNAME= vlc
DISTVERSION= 2.2.4
-PORTREVISION= 9
+PORTREVISION= 10
PORTEPOCH= 4
CATEGORIES= multimedia audio ipv6 net www
MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
@@ -274,7 +274,7 @@ SHOUTCAST_CONFIGURE_ENABLE= shout
SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
SNDIO_CONFIGURE_ENABLE= sndio
-SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
+SMB_USES= samba:lib
SMB_CONFIGURE_ENABLE= smbclient
STREAM_CONFIGURE_ENABLE=sout
Modified: head/net-mgmt/sdig/pkg-message
==============================================================================
--- head/net-mgmt/sdig/pkg-message Tue Mar 21 21:28:41 2017 (r436658)
+++ head/net-mgmt/sdig/pkg-message Tue Mar 21 21:59:31 2017 (r436659)
@@ -1,2 +1,2 @@
If you wish to use the NMBLOOKUP option within sdig, you must
-install net/samba-nmblookup (or net/samba).
+install samba.
Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/net/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -1231,10 +1231,6 @@
SUBDIR += rubygem-uri-redis
SUBDIR += rubygem-whois
SUBDIR += rude
- SUBDIR += samba-libsmbclient
- SUBDIR += samba-nmblookup
- SUBDIR += samba-smbclient
- SUBDIR += samba36
SUBDIR += samba42
SUBDIR += samba43
SUBDIR += samba44
Modified: head/net/freeradius2/Makefile
==============================================================================
--- head/net/freeradius2/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/net/freeradius2/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -236,7 +236,7 @@ EXPM= yes
# No SMB option yet; rlm_smb is still unbuildable
#.if ${PORT_OPTIONS:MSMB}
-#LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
+#USES+= samba:lib
#CONFIGURE_ARGS+=--with-rlm_smb
#CONFIGURE_ARGS+=--with-rlm-smb-lib-dir=${LOCALBASE}/lib
#CONFIGURE_ARGS+=--with-rlm-smb-include-dir=${LOCALBASE}/include
Modified: head/net/jags/Makefile
==============================================================================
--- head/net/jags/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/net/jags/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -3,20 +3,16 @@
PORTNAME= jags
PORTVERSION= 0.22.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/Jags/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports at FreeBSD.org
COMMENT= JAGS - Just Another GTK+ Samba Client
-RUN_DEPENDS= smbclient:${SAMBA_PORT}
-
-SAMBA_PORT?= net/samba36
-
CONFLICTS= jags-1.*
-USES= gmake
+USES= gmake samba:run # smbclient
USE_XORG= xi xext x11
USE_GNOME= gtk12
GNU_CONFIGURE= yes
Modified: head/net/opennx/Makefile
==============================================================================
--- head/net/opennx/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/net/opennx/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -3,7 +3,7 @@
PORTNAME= opennx
PORTVERSION= 0.16.0.729
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/CI-source
@@ -15,20 +15,19 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${LOCALBASE}/bin/zip:archivers/zip
LIB_DEPENDS= libcups.so:print/cups \
- libcurl.so:ftp/curl \
- libsmbclient.so:net/samba-libsmbclient
+ libcurl.so:ftp/curl
WRKSRC= ${WRKDIR}/${PORTNAME}-0.16
GNU_CONFIGURE= yes
-USES= gmake
+USES= gmake samba:lib
USE_XORG= xmu
USE_WX= 2.8+
WX_UNICODE= yes
-LDFLAGS+= -L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib -L${SAMBALIBS}
CONFIGURE_ARGS= --with-wx-config=${WX_CONFIG}
-CPPFLAGS+= -I${LOCALBASE}/include
+CPPFLAGS+= -I${LOCALBASE}/include -I${SAMBAINCLUDES}
INSTALLS_ICONS= yes
Modified: head/net/p5-Filesys-SmbClient/Makefile
==============================================================================
--- head/net/p5-Filesys-SmbClient/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/net/p5-Filesys-SmbClient/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -11,14 +11,17 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl at FreeBSD.org
COMMENT= Interface for access Samba filesystem with libsmclient.so
-LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
+BROKEN= no member named close in struct _SMBCCTX
+
BUILD_DEPENDS= p5-Test-Simple>=0:devel/p5-Test-Simple
-USES= perl5
+USES= perl5 samba:lib
USE_PERL5= configure
post-patch:
@${REINPLACE_CMD} -i '' -e 's!%%LOCALBASE%%!${LOCALBASE}!g' \
+ -e 's!%%SAMBAINCLUDES%%!${SAMBAINCLUDES}!g' \
+ -e 's!%%SAMBALIBS%%!${SAMBALIBS}!g' \
${WRKSRC}/Makefile.PL
post-install:
Modified: head/net/p5-Filesys-SmbClient/files/patch-Makefile.PL
==============================================================================
--- head/net/p5-Filesys-SmbClient/files/patch-Makefile.PL Tue Mar 21 21:28:41 2017 (r436658)
+++ head/net/p5-Filesys-SmbClient/files/patch-Makefile.PL Tue Mar 21 21:59:31 2017 (r436659)
@@ -34,8 +34,8 @@
-# Trace for debug
-$ans = prompt("Compile module with trace to STDERR ?", "no");
-if ($ans =~ /^y(es)?$/i) { $define = "-DVERBOSE"; }
-+my $include = '%%LOCALBASE%%/include/';
-+my $lib = '%%LOCALBASE%%/lib/';
++my $include = '%%SAMBAINCLUDES%%/';
++my $lib = '%%SAMBALIBS%%/';
# Create config.h for alloca via configure
-my $prefix = $include;
Modified: head/net/pecl-smbclient/Makefile
==============================================================================
--- head/net/pecl-smbclient/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/net/pecl-smbclient/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -2,6 +2,7 @@
PORTNAME= smbclient
PORTVERSION= 0.9.0
+PORTREVISION= 1
CATEGORIES= net pear
MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-
@@ -13,10 +14,10 @@ COMMENT= Smbclient wrapper extension
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
-
-USES= php:ext tar:tgz
+USES= php:ext samba:lib tar:tgz
CONFIGURE_ARGS= --with-libsmbclient=${LOCALBASE}
+CPPFLAGS+= -I${SAMBAINCLUDES}
+LDFLAGS+= -L${SAMBALIBS}
.include <bsd.port.mk>
Modified: head/net/prosearch/Makefile
==============================================================================
--- head/net/prosearch/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/net/prosearch/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -2,7 +2,7 @@
PORTNAME= prosearch
PORTVERSION= 0.19.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net www
MASTER_SITES= http://pro.setun.net/search/download/ SF/pro-search/pro-search/${PORTVERSION}
@@ -57,7 +57,7 @@ p5-Net-DirectConnect>=0:net-p2p/p5-Net-D
.endif
.if ${PORT_OPTIONS:MSAMBA}
-RUN_DEPENDS+=smbclient:net/samba44
+USES+= samba:run # smbclient
.endif
.if ${PORT_OPTIONS:MRSYNC}
Modified: head/net/samba42/Makefile
==============================================================================
--- head/net/samba42/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/net/samba42/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -3,7 +3,7 @@
PORTNAME?= ${SAMBA4_BASENAME}42
PORTVERSION?= ${SAMBA4_VERSION}
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= net
MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME}
@@ -155,7 +155,6 @@ CONFIGURE_ARGS+= \
--with-winbind \
--without-gettext \
--with-sendfile-support \
- --builtin-libraries=smbclient \
${ICONV_CONFIGURE_BASE}
# for libexecinfo: (so that __builtin_frame_address() finds the top of the stack)
Modified: head/net/samba42/pkg-plist
==============================================================================
--- head/net/samba42/pkg-plist Tue Mar 21 21:28:41 2017 (r436658)
+++ head/net/samba42/pkg-plist Tue Mar 21 21:59:31 2017 (r436659)
@@ -197,6 +197,8 @@ lib/libsamba-util.so
lib/libsamba-util.so.0
lib/libsamdb.so
lib/libsamdb.so.0
+lib/libsmbclient.so
+lib/libsmbclient.so.0
lib/libsmbclient-raw.so
lib/libsmbclient-raw.so.0
lib/libsmbconf.so
@@ -473,6 +475,7 @@ lib/shared-modules/vfs/zfsacl.so
%%PKGCONFIGDIR%%/samba-policy.pc
%%PKGCONFIGDIR%%/samba-util.pc
%%PKGCONFIGDIR%%/samdb.pc
+%%PKGCONFIGDIR%%/smbclient.pc
%%PKGCONFIGDIR%%/smbclient-raw.pc
%%PKGCONFIGDIR%%/torture.pc
%%PKGCONFIGDIR%%/wbclient.pc
Modified: head/net/samba43/Makefile
==============================================================================
--- head/net/samba43/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/net/samba43/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -3,7 +3,7 @@
PORTNAME?= ${SAMBA4_BASENAME}43
PORTVERSION?= ${SAMBA4_VERSION}
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES?= net
MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME}
@@ -155,7 +155,6 @@ CONFIGURE_ARGS+= \
--with-winbind \
--without-gettext \
--with-sendfile-support \
- --builtin-libraries=smbclient \
${ICONV_CONFIGURE_BASE}
# for libexecinfo: (so that __builtin_frame_address() finds the top of the stack)
.if ${ARCH} == "amd64"
Modified: head/net/samba43/pkg-plist
==============================================================================
--- head/net/samba43/pkg-plist Tue Mar 21 21:28:41 2017 (r436658)
+++ head/net/samba43/pkg-plist Tue Mar 21 21:59:31 2017 (r436659)
@@ -204,6 +204,8 @@ lib/libsamba-util.so
lib/libsamba-util.so.0
lib/libsamdb.so
lib/libsamdb.so.0
+lib/libsmbclient.so
+lib/libsmbclient.so.0
lib/libsmbclient-raw.so
lib/libsmbclient-raw.so.0
lib/libsmbconf.so
@@ -496,6 +498,7 @@ lib/shared-modules/vfs/zfsacl.so
%%PKGCONFIGDIR%%/samba-policy.pc
%%PKGCONFIGDIR%%/samba-util.pc
%%PKGCONFIGDIR%%/samdb.pc
+%%PKGCONFIGDIR%%/smbclient.pc
%%PKGCONFIGDIR%%/smbclient-raw.pc
%%PKGCONFIGDIR%%/torture.pc
%%PKGCONFIGDIR%%/wbclient.pc
Modified: head/net/samba44/Makefile
==============================================================================
--- head/net/samba44/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/net/samba44/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -3,7 +3,7 @@
PORTNAME?= ${SAMBA4_BASENAME}44
PORTVERSION?= ${SAMBA4_VERSION}
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES?= net
MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME}
@@ -156,7 +156,6 @@ CONFIGURE_ARGS+= \
--disable-rpath \
--without-gettext \
--with-sendfile-support \
- --builtin-libraries=smbclient \
${ICONV_CONFIGURE_BASE}
# for libexecinfo: (so that __builtin_frame_address() finds the top of the stack)
.if ${ARCH} == "amd64"
Modified: head/net/samba44/pkg-plist
==============================================================================
--- head/net/samba44/pkg-plist Tue Mar 21 21:28:41 2017 (r436658)
+++ head/net/samba44/pkg-plist Tue Mar 21 21:59:31 2017 (r436659)
@@ -160,6 +160,8 @@ lib/samba4/libsamba-util.so
lib/samba4/libsamba-util.so.0
lib/samba4/libsamdb.so
lib/samba4/libsamdb.so.0
+lib/samba4/libsmbclient.so
+lib/samba4/libsmbclient.so.0
lib/samba4/libsmbconf.so
lib/samba4/libsmbconf.so.0
%%LDAP%%lib/samba4/libsmbldap.so
@@ -448,6 +450,7 @@ lib/shared-modules/vfs/zfsacl.so
%%PKGCONFIGDIR%%/samba-policy.pc
%%PKGCONFIGDIR%%/samba-util.pc
%%PKGCONFIGDIR%%/samdb.pc
+%%PKGCONFIGDIR%%/smbclient.pc
%%PKGCONFIGDIR%%/wbclient.pc
%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/dckeytab.so
%%AD_DC%%%%PYTHON_SITELIBDIR%%/samba/posix_eadb.so
Modified: head/net/smb4k-kde4/Makefile
==============================================================================
--- head/net/smb4k-kde4/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/net/smb4k-kde4/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -3,7 +3,7 @@
PORTNAME= smb4k-kde4
PORTVERSION= 0.10.9
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= net kde
MASTER_SITES= SF/smb4k
DISTNAME= smb4k-${PORTVERSION}
@@ -11,12 +11,9 @@ DISTNAME= smb4k-${PORTVERSION}
MAINTAINER= jpaetzel at FreeBSD.org
COMMENT= KDE 4.x SMB Network browser and SMB shares mounting center
-RUN_DEPENDS= sudo:security/sudo \
- smbstatus:${SAMBA_PORT}
+RUN_DEPENDS= sudo:security/sudo
-SAMBA_PORT?= net/samba36
-
-USES= cmake gettext kde:4 tar:bzip2
+USES= cmake gettext kde:4 samba:run tar:bzip2
USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/kde4
USE_KDE= kdelibs automoc4 runtime
USE_QT4= corelib gui network opengl script svg webkit \
Modified: head/print/apsfilter/Makefile
==============================================================================
--- head/print/apsfilter/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/print/apsfilter/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -3,7 +3,7 @@
PORTNAME= apsfilter
PORTVERSION= 7.2.8
-PORTREVISION= 18
+PORTREVISION= 19
CATEGORIES= print
MASTER_SITES= http://www.apsfilter.org/download/
DIST_SUBDIR= apsfilter
@@ -51,6 +51,7 @@ DOCS_MAKE_ARGS= -DDOCS
PORTDOCS= ANNOUNCE FAQ HOWTO-BUGREPORTS apsfilter4.png \
README.BSD handbook.html README.TeX paper
GS_USES= ghostscript:run
+SAMBA_USES= samba:run
.include <bsd.port.options.mk>
@@ -108,7 +109,6 @@ _DEPENDS_FIG2DEV= \
_DEPENDS_HTML2PS= \
html2ps:print/html2ps
_DEPENDS_ATALK= pap:net/netatalk
-_DEPENDS_SAMBA= smbclient:net/samba36
_DEPENDS_MP3= mpg321:audio/mpg321
_DEPENDS_OGG= ogg123:audio/vorbis-tools
_DEPENDS_WAV= wavplay:audio/wavplay
Modified: head/print/cups-smb-backend/Makefile
==============================================================================
--- head/print/cups-smb-backend/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/print/cups-smb-backend/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -3,7 +3,7 @@
PORTNAME= cups-smb-backend
PORTVERSION= 1.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= print
MASTER_SITES= # empty
DISTFILES= # empty
@@ -11,12 +11,11 @@ DISTFILES= # empty
MAINTAINER= ports at FreeBSD.org
COMMENT= CUPS backend for printing to Windows servers
-RUN_DEPENDS= smbspool:net/${SAMBA_PORT} \
- ${LOCALBASE}/sbin/cupsd:print/cups
+RUN_DEPENDS= ${LOCALBASE}/sbin/cupsd:print/cups
+USES= samba:run # smbspool
NO_BUILD= yes
PLIST_FILES= libexec/cups/backend/smb
-SAMBA_PORT?= samba36
SUB_FILES= pkg-message
do-install:
Modified: head/print/gnome-cups-manager/Makefile
==============================================================================
--- head/print/gnome-cups-manager/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/print/gnome-cups-manager/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -4,7 +4,7 @@
PORTNAME= gnome-cups-manager
PORTVERSION= 0.31
-PORTREVISION= 16
+PORTREVISION= 17
PORTEPOCH= 1
CATEGORIES= print gnome
MASTER_SITES= GNOME
@@ -16,15 +16,15 @@ COMMENT= Administration tool for cups
LIB_DEPENDS= libgnomecups-1.0.so:print/libgnomecups
RUN_DEPENDS= gnomesu:security/libgnomesu
-USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES= gettext gmake libtool pathfix pkgconfig samba:lib tar:bzip2
USE_GNOME= gnomeprefix intlhack libgnomeprintui libgnomeui
USE_LDCONFIG= yes
USE_XORG= x11
INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include -D_IPP_PRIVATE_STRUCTURES
-LIBS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include -I${SAMBAINCLUDES} -D_IPP_PRIVATE_STRUCTURES
+LIBS+= -L${LOCALBASE}/lib -L${SAMBALIBS}
post-patch:
@${SED} -e 's|%%PREFIX%%|${PREFIX}|' \
Modified: head/security/samba-virusfilter/Makefile
==============================================================================
--- head/security/samba-virusfilter/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/security/samba-virusfilter/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -9,21 +9,22 @@ MASTER_SITES= GHC
MAINTAINER= kuriyama at FreeBSD.org
COMMENT= On-access anti-virus filter for Samba
-PATCH_DEPENDS= smbclient:net/${SAMBA_PORT}
-BUILD_DEPENDS= ${NONEXISTENT}:net/${SAMBA_PORT}:configure
+BROKEN= fails to configure with samba 4
+
+PATCH_DEPENDS= smbclient:${SAMBAPORT}
+BUILD_DEPENDS= ${NONEXISTENT}:${SAMBAPORT}:configure
RUN_DEPENDS= ksh:shells/pdksh
GNU_CONFIGURE= yes
-USES= gmake shebangfix tar:bzip2
+USES= gmake samba:env shebangfix tar:bzip2
SHEBANG_FILES= bin/svf-notify.ksh
USE_GITHUB= yes
GH_ACCOUNT= fumiyas
ALL_TARGET= # should empty
-CONFIGURE_ARGS= --with-samba-source=`cd ${PORTSDIR}/net/${SAMBA_PORT}; ${MAKE} -VWRKSRC` \
+CONFIGURE_ARGS= --with-samba-source=`cd ${PORTSDIR}/${SAMBAPORT}; ${MAKE} -VWRKSRC` \
--with-clamd=${PREFIX}/sbin/clamd --with-savdid=${PREFIX}/bin/savdid
-SAMBA_PORT?= samba36
-USE_AUTOTOOLS= autoconf autoheader # for net/${SAMBA_PORT} configure
+USE_AUTOTOOLS= autoconf autoheader # for ${SAMBAPORT} configure
MAKE_ARGS= SAMBA_DATADIR=${PREFIX}
.include <bsd.port.mk>
Modified: head/security/sssd/Makefile
==============================================================================
--- head/security/sssd/Makefile Tue Mar 21 21:28:41 2017 (r436658)
+++ head/security/sssd/Makefile Tue Mar 21 21:59:31 2017 (r436659)
@@ -3,7 +3,7 @@
PORTNAME= sssd
PORTVERSION= 1.11.7
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= security
MASTER_SITES= https://fedorahosted.org/released/${PORTNAME}/ \
http://mirrors.rit.edu/zi/
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list