So yesterday I looked at the ports that make use of samba. Turns out
switching to samba4 should be easy. The only issues I'd hate to see
would be weak architecture support (__sync_fetch_and_blah...).
Anyway, this is a post-5.8 change.
I'd appreciate testing from people running the affected ports:
sqlite> select * from depends where dependspath like '%samba%';
multimedia/mpv|net/samba|||net/samba|L
sysutils/backuppc|net/samba|||net/samba|B
sysutils/usmb|net/samba|||net/samba|L
x11/gnome/control-center|net/samba|||net/samba|L
x11/gnome/gvfs,,-smb|net/samba|||net/samba|L
x11/kde/base3,-samba|STEM->=3:net/samba|STEM->=3||net/samba|L
x11/kde4/runtime,-main|net/samba|||net/samba|L
x11/kde4/network-filesharing|net/samba|||net/samba|R
x11/nx/opennx|net/samba|||net/samba|B
net/monitoring-plugins,-samba|net/samba|||net/samba|R
x11/gnome/gvfs,-smb|net/samba|||net/samba|L
sqlite>
You'll of course have to hook up samba4 in net/Makefile, to remove the
samba package, and to clean up packages built against net/samba.
Most ports require trivial changes. The only issue so far - on
amd64... - is x11/gnome/gvfs. it's not hooked up to the build by
default, the problem seems to be a difference between gnu and base
libtool.
Comments and feedback welcome.
PS: I'll probably look into rc.d scripts later during c2k15, unless
someone already has something usable.
Index: multimedia/mpv/Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- multimedia/mpv/Makefile 30 May 2015 07:27:40 -0000 1.13
+++ multimedia/mpv/Makefile 14 Jul 2015 18:48:00 -0000
@@ -41,12 +41,12 @@ LIB_DEPENDS = audio/libcdio \
multimedia/libass \
multimedia/libbluray>=0.8.0 \
multimedia/libdvdnav \
- net/samba
+ net/samba4
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
-CFLAGS += -I. -I.. -I${LOCALBASE}/include
+CFLAGS += -I. -I.. -I${LOCALBASE}/include `pkg-config --cflags
smbclient`
CONFIGURE_STYLE = simple
CONFIGURE_SCRIPT = old-configure
Index: sysutils/backuppc/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/backuppc/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- sysutils/backuppc/Makefile 15 Jul 2015 14:20:38 -0000 1.10
+++ sysutils/backuppc/Makefile 15 Jul 2015 17:05:19 -0000
@@ -19,7 +19,7 @@ NO_BUILD = Yes
# XXX one of them needed as runtime dep... buildep to get them found by
configure
BUILD_DEPENDS = archivers/gtar \
- net/samba \
+ net/samba4 \
net/rsync \
devel/p5-File-RsyncP
Index: sysutils/usmb/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/usmb/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- sysutils/usmb/Makefile 21 Apr 2015 18:19:27 -0000 1.2
+++ sysutils/usmb/Makefile 15 Jul 2015 17:17:15 -0000
@@ -12,7 +12,7 @@ HOMEPAGE= http://ametros.net/code.html
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += c fuse glib-2.0 lib/samba/smbclient pthread xml2
+WANTLIB += c fuse glib-2.0 smbclient pthread xml2
#
http://repo.or.cz/w/usmb.git/snapshot/aa94e132c12faf1a00f547ea4a96b5728612dea6.tar.gz
MASTER_SITES= http://spacehopper.org/mirrors/
@@ -20,13 +20,15 @@ MASTER_SITES= http://spacehopper.org/mir
MODULES= devel/gettext
BUILD_DEPENDS= textproc/gsed
LIB_DEPENDS= devel/glib2 \
- net/samba \
+ net/samba4 \
textproc/libxml
SEPARATE_BUILD= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-samba=${LOCALBASE}
+CONFIGURE_ENV = CFLAGS="`pkg-config --cflags smbclient`" \
+ LDFLAGS="`pkg-config --libs smbclient`"
NO_TEST= Yes
Index: x11/gnome/control-center/Makefile
===================================================================
RCS file: /cvs/ports/x11/gnome/control-center/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- x11/gnome/control-center/Makefile 12 May 2015 15:41:40 -0000 1.7
+++ x11/gnome/control-center/Makefile 14 Jul 2015 19:50:13 -0000
@@ -45,7 +45,7 @@ LIB_DEPENDS= audio/pulseaudio \
audio/libcanberra,-gtk3 \
devel/libgtop2 \
graphics/colord-gtk \
- net/samba \
+ net/samba4 \
print/cups,-libs \
security/libpwquality \
sysutils/accountsservice \
Index: x11/gnome/gvfs/Makefile
===================================================================
RCS file: /cvs/ports/x11/gnome/gvfs/Makefile,v
retrieving revision 1.136
diff -u -p -r1.136 Makefile
--- x11/gnome/gvfs/Makefile 15 Apr 2015 09:40:53 -0000 1.136
+++ x11/gnome/gvfs/Makefile 15 Jul 2015 17:18:25 -0000
@@ -57,7 +57,7 @@ RUN_DEPENDS-smb= ${MODGETTEXT_RUN_DEPEND
${MODDCONF_RUN_DEPENDS} \
${BASE_PKGPATH},-main=${GNOME_VERSION}
LIB_DEPENDS-smb= ${LIB_DEPENDS} \
- net/samba
+ net/samba4
RUN_DEPENDS-goa= ${MODGETTEXT_RUN_DEPENDS} \
${BASE_PKGPATH},-main=${GNOME_VERSION}
Index: x11/kde/base3/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde/base3/Makefile,v
retrieving revision 1.132
diff -u -p -r1.132 Makefile
--- x11/kde/base3/Makefile 7 Jul 2015 14:49:50 -0000 1.132
+++ x11/kde/base3/Makefile 15 Jul 2015 06:37:03 -0000
@@ -62,7 +62,7 @@ LIB_DEPENDS-main = ${LIB_DEPENDS} \
devel/glib2
LIB_DEPENDS-samba = ${LIB_DEPENDS} \
x11/kde/libs3 \
- net/samba>=3
+ net/samba4
WANTLIB = crypto expat m pthread pthread-stubs ssl stdc++ util z
WANTLIB += ICE SM X11 Xext Xfixes Xrender Xt freetype fontconfig xcb
@@ -88,11 +88,15 @@ WANTLIB-main += glib-2.0 gmodule-2.0 gth
WANTLIB-main += ogg pcre pcreposix qtmcop usb usb-1.0 vorbis vorbisenc
WANTLIB-main += vorbisfile
-WANTLIB-samba = ${WANTLIB} execinfo
-WANTLIB-samba += lib/samba/smbclient talloc tdb lib/samba/wbclient
+WANTLIB-samba = ${WANTLIB}
+WANTLIB-samba += execinfo ndr ndr-standard nss_wrapper replace samba-hostconfig
+WANTLIB-samba += samba-util smbclient smbconf socket_wrapper talloc tdb tevent
+WANTLIB-samba += tevent-util uid_wrapper util_setid
WANTLIB-en_US =
WANTLIB-locale =
+
+CONFIGURE_ENV += CPPFLAGS="`pkg-config --cflags smbclient`"
SEPARATE_BUILD = flavored
SUBST_VARS = PREFIX
Index: x11/kde4/runtime/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/runtime/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- x11/kde4/runtime/Makefile 26 Jun 2015 09:18:39 -0000 1.25
+++ x11/kde4/runtime/Makefile 15 Jul 2015 03:10:00 -0000
@@ -36,7 +36,7 @@ WANTLIB-main += ${KDE4LIB}/kxmlrpcclient
WANTLIB-main += ${KDE4LIB}/nepomukutils
WANTLIB-main += ${KDE4LIB}/plasma ${KDE4LIB}/qgpgme ${KDE4LIB}/solid
WANTLIB-main += attica canberra exiv2 glib-2.0 jpeg pulse
-WANTLIB-main += pulse-mainloop-glib lib/samba/smbclient ssh soprano webp
+WANTLIB-main += pulse-mainloop-glib smbclient ssh soprano webp
WANTLIB-main += assuan gcrypt gpg-error gpgme++-pthread gpgme-pthread
WANTLIB-locale =
@@ -75,7 +75,7 @@ LIB_DEPENDS-main = ${LIB_DEPENDS} \
graphics/libwebp \
graphics/openexr \
graphics/exiv2 \
- net/samba \
+ net/samba4 \
productivity/attica \
security/libssh \
${MODKDE4_DEP_DIR}/kactivities>=${MIN_ACTIVITIES_VERSION}
Index: x11/kde4/network-filesharing/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/network-filesharing/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- x11/kde4/network-filesharing/Makefile 28 May 2015 10:17:30 -0000
1.4
+++ x11/kde4/network-filesharing/Makefile 15 Jul 2015 03:28:57 -0000
@@ -14,7 +14,7 @@ WANTLIB += ${KDE4LIB}/kdeui ${KDE4LIB}/k
MODKDE4_USE = libs
-RUN_DEPENDS = net/samba
+RUN_DEPENDS = net/samba4
CONFIGURE_ARGS = -DSAMBA_INSTALL:Bool=No
Index: x11/nx/opennx/Makefile
===================================================================
RCS file: /cvs/ports/x11/nx/opennx/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- x11/nx/opennx/Makefile 7 Jul 2015 14:43:36 -0000 1.36
+++ x11/nx/opennx/Makefile 14 Jul 2015 20:27:22 -0000
@@ -27,7 +27,7 @@ LIB_DEPENDS= x11/wxWidgets \
net/curl
BUILD_DEPENDS= archivers/zip \
devel/bison \
- net/samba
+ net/samba4
# configure checks for cupsd(8)
BUILD_DEPENDS += print/cups
@@ -40,7 +40,7 @@ RUN_DEPENDS= devel/desktop-file-utils \
WRKDIST = ${WRKDIR}/opennx-0.16
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
+ CPPFLAGS="-I${LOCALBASE}/include `pkg-config --cflags
smbclient` -I${X11BASE}/include"
pre-configure:
${SUBST_CMD} ${WRKSRC}/opennxApp.cpp \
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
