Upgrade net/samba-libsmbclient to the 3.4.5 version

3 files changed, 62 insertions, 51 deletions

diff --git a/net/samba-libsmbclient/Makefile b/net/samba-libsmbclient/Makefile
index 8a825896d2c1..e92d96c3395c 100644
--- a/net/samba-libsmbclient/Makefile
+++ b/net/samba-libsmbclient/Makefile
@@ -13,16 +13,17 @@ COMMENT=		Shared libs from the samba package
 
 CONFLICTS=
 
-SAMBA_PORT?=		samba3
+SAMBA_PORT=		samba34
 SAMBA_SUBPORT=		yes
 
 MASTERDIR=		${.CURDIR}/../${SAMBA_PORT}
 PKGDIR=			${.CURDIR}
 
-USE_LDCONFIG=		yes
+USE_LDCONFIG=		${PREFIX}/lib
 
 OPTIONS=		ADS		"With Active Directory support" off \
 			ADDNS		"Build the libaddns shared library" off \
+			NETAPI		"Build the libnetapi shared library" off \
 			SHAREMODES	"Build the libsharemodes shared library" off
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/samba-libsmbclient/Makefile.inc b/net/samba-libsmbclient/Makefile.inc
index 590017dac48a..d05bd1759de9 100644
--- a/net/samba-libsmbclient/Makefile.inc
+++ b/net/samba-libsmbclient/Makefile.inc
@@ -1,10 +1,8 @@
-# Don't check for python presence
-CONFIGURE_ARGS+=	--without-python
 # We WANT shared libs
 CONFIGURE_ARGS+=	--with-libsmbclient
 SAMBA_INSTALL_LIBS=	libsmbclient
 
-.if !defined(WITHOUT_ADDNS)
+.if defined(WITH_ADDNS)
 CONFIGURE_ARGS+=	--with-libaddns
 SAMBA_INSTALL_LIBS+=	libaddns
 PLIST_SUB+=		ADDNS=""
@@ -13,7 +11,7 @@ CONFIGURE_ARGS+=	--without-libaddns
 PLIST_SUB+=		ADDNS="@comment "
 .endif
 
-.if !defined(WITHOUT_SHAREMODES)
+.if defined(WITH_SHAREMODES)
 CONFIGURE_ARGS+=	--with-libsmbsharemodes
 SAMBA_INSTALL_LIBS+=	libsmbsharemodes
 PLIST_SUB+=		SHAREMODES=""
@@ -22,26 +20,27 @@ CONFIGURE_ARGS+=	--without-libsmbsharemodes
 PLIST_SUB+=		SHAREMODES="@comment "
 .endif
 
+.if defined(WITH_NETAPI)
+CONFIGURE_ARGS+=	--with-libnetapi
+SAMBA_INSTALL_LIBS+=	libnetapi
+PLIST_SUB+=		NETAPI=""
+.else
+CONFIGURE_ARGS+=	--without-libnetapi
+PLIST_SUB+=		NETAPI="@comment "
+.endif
+
 MAN7=			libsmbclient.7
 
-do-build:
-	cd ${WRKSRC} && ${MAKE} proto bin/.dummy
-	cd ${WRKSRC} && ${MAKE} libsmbclient
-.if !defined(WITHOUT_ADDNS)
-	cd ${WRKSRC} && ${MAKE} libaddns
-.endif
-.if !defined(WITHOUT_SHAREMODES)
-	cd ${WRKSRC} && ${MAKE} libsmbsharemodes
-.endif
+ALL_TARGET=		libtdb ${SAMBA_INSTALL_LIBS}
 
 do-install:
-	-@${MKDIR} ${MAN8PREFIX}/man/man7
+	-@${MKDIR} ${MAN7PREFIX}/man/man7
 .for man in ${MAN7}
 	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/${man} ${MAN7PREFIX}/man/man7
 .endfor
 	-@${MKDIR} ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/include/libsmbclient.h ${PREFIX}/include
-.if !defined(WITHOUT_ADDNS)
+.if defined(WITH_ADDNS)
 	${INSTALL_DATA} ${WRKSRC}/libaddns/addns.h ${PREFIX}/include
 .endif
 	-@${MKDIR} ${PREFIX}/lib
@@ -51,4 +50,4 @@ do-install:
 	${LN} -snf ${lib}.so.0 ${PREFIX}/lib/${lib}.so
 .endfor
 	-@${MKDIR} ${EXAMPLESDIR}
-	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/libsmbclient ${EXAMPLESDIR}
+	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/libsmbclient/ ${EXAMPLESDIR}
diff --git a/net/samba-libsmbclient/pkg-plist b/net/samba-libsmbclient/pkg-plist
index cec51550c42b..be4a25228b1f 100644
--- a/net/samba-libsmbclient/pkg-plist
+++ b/net/samba-libsmbclient/pkg-plist
@@ -6,40 +6,51 @@ lib/libsmbclient.so.0
 %%ADDNS%%lib/libaddns.a
 %%ADDNS%%lib/libaddns.so
 %%ADDNS%%lib/libaddns.so.0
+%%NETAPI%%lib/libnetapi.a
+%%NETAPI%%lib/libnetapi.so
+%%NETAPI%%lib/libnetapi.so.0
 %%SHAREMODES%%lib/libsmbsharemodes.a
 %%SHAREMODES%%lib/libsmbsharemodes.so
 %%SHAREMODES%%lib/libsmbsharemodes.so.0
-%%EXAMPLESDIR%%/libsmbclient/Makefile
-%%EXAMPLESDIR%%/libsmbclient/README
-%%EXAMPLESDIR%%/libsmbclient/get_auth_data_fn.h
-%%EXAMPLESDIR%%/libsmbclient/smbwrapper/Makefile
-%%EXAMPLESDIR%%/libsmbclient/smbwrapper/README
-%%EXAMPLESDIR%%/libsmbclient/smbwrapper/bsd-strlcat.c
-%%EXAMPLESDIR%%/libsmbclient/smbwrapper/bsd-strlcpy.c
-%%EXAMPLESDIR%%/libsmbclient/smbwrapper/bsd-strlfunc.h
-%%EXAMPLESDIR%%/libsmbclient/smbwrapper/opendir_smbsh.c
-%%EXAMPLESDIR%%/libsmbclient/smbwrapper/select.c
-%%EXAMPLESDIR%%/libsmbclient/smbwrapper/smbsh.1
-%%EXAMPLESDIR%%/libsmbclient/smbwrapper/smbsh.1.html
-%%EXAMPLESDIR%%/libsmbclient/smbwrapper/smbsh.1.xml
-%%EXAMPLESDIR%%/libsmbclient/smbwrapper/smbsh.c
-%%EXAMPLESDIR%%/libsmbclient/smbwrapper/smbw.c
-%%EXAMPLESDIR%%/libsmbclient/smbwrapper/smbw.h
-%%EXAMPLESDIR%%/libsmbclient/smbwrapper/smbw_dir.c
-%%EXAMPLESDIR%%/libsmbclient/smbwrapper/smbw_stat.c
-%%EXAMPLESDIR%%/libsmbclient/smbwrapper/wrapper.c
-%%EXAMPLESDIR%%/libsmbclient/smbwrapper/wrapper.h
-%%EXAMPLESDIR%%/libsmbclient/testacl.c
-%%EXAMPLESDIR%%/libsmbclient/testacl2.c
-%%EXAMPLESDIR%%/libsmbclient/testbrowse.c
-%%EXAMPLESDIR%%/libsmbclient/testbrowse2.c
-%%EXAMPLESDIR%%/libsmbclient/testchmod.c
-%%EXAMPLESDIR%%/libsmbclient/testread.c
-%%EXAMPLESDIR%%/libsmbclient/testsmbc.c
-%%EXAMPLESDIR%%/libsmbclient/teststat.c
-%%EXAMPLESDIR%%/libsmbclient/teststat2.c
-%%EXAMPLESDIR%%/libsmbclient/testutime.c
-%%EXAMPLESDIR%%/libsmbclient/tree.c
-@dirrm %%EXAMPLESDIR%%/libsmbclient/smbwrapper
-@dirrm %%EXAMPLESDIR%%/libsmbclient
+%%EXAMPLESDIR%%/Makefile
+%%EXAMPLESDIR%%/Makefile.internal
+%%EXAMPLESDIR%%/Makefile.internal.in
+%%EXAMPLESDIR%%/README
+%%EXAMPLESDIR%%/get_auth_data_fn.h
+%%EXAMPLESDIR%%/smbwrapper/Makefile
+%%EXAMPLESDIR%%/smbwrapper/README
+%%EXAMPLESDIR%%/smbwrapper/bsd-strlcat.c
+%%EXAMPLESDIR%%/smbwrapper/bsd-strlcpy.c
+%%EXAMPLESDIR%%/smbwrapper/bsd-strlfunc.h
+%%EXAMPLESDIR%%/smbwrapper/opendir_smbsh.c
+%%EXAMPLESDIR%%/smbwrapper/select.c
+%%EXAMPLESDIR%%/smbwrapper/smbsh.1
+%%EXAMPLESDIR%%/smbwrapper/smbsh.1.html
+%%EXAMPLESDIR%%/smbwrapper/smbsh.1.xml
+%%EXAMPLESDIR%%/smbwrapper/smbsh.c
+%%EXAMPLESDIR%%/smbwrapper/smbw.c
+%%EXAMPLESDIR%%/smbwrapper/smbw.h
+%%EXAMPLESDIR%%/smbwrapper/smbw_dir.c
+%%EXAMPLESDIR%%/smbwrapper/smbw_stat.c
+%%EXAMPLESDIR%%/smbwrapper/wrapper.c
+%%EXAMPLESDIR%%/smbwrapper/wrapper.h
+%%EXAMPLESDIR%%/testacl.c
+%%EXAMPLESDIR%%/testacl2.c
+%%EXAMPLESDIR%%/testacl3.c
+%%EXAMPLESDIR%%/testbrowse.c
+%%EXAMPLESDIR%%/testbrowse2.c
+%%EXAMPLESDIR%%/testchmod.c
+%%EXAMPLESDIR%%/testctx.c
+%%EXAMPLESDIR%%/testfstatvfs.c
+%%EXAMPLESDIR%%/testread.c
+%%EXAMPLESDIR%%/testsmbc.c
+%%EXAMPLESDIR%%/teststat.c
+%%EXAMPLESDIR%%/teststat2.c
+%%EXAMPLESDIR%%/teststat3.c
+%%EXAMPLESDIR%%/teststatvfs.c
+%%EXAMPLESDIR%%/testtruncate.c
+%%EXAMPLESDIR%%/testutime.c
+%%EXAMPLESDIR%%/testwrite.c
+%%EXAMPLESDIR%%/tree.c
+@dirrm %%EXAMPLESDIR%%/smbwrapper
 @dirrm %%EXAMPLESDIR%%