4 files changed, 63 insertions, 56 deletions

diff --git a/net/samba-libsmbclient/Makefile b/net/samba-libsmbclient/Makefile
index f04ca2332034..ddb5c7925768 100644
--- a/net/samba-libsmbclient/Makefile
+++ b/net/samba-libsmbclient/Makefile
@@ -21,60 +21,8 @@ PKGDIR=			${.CURDIR}
 
 INSTALLS_SHLIB=		yes
 
-# We WANT shared libs
-CONFIGURE_ARGS+=	--with-libsmbclient
-SAMBA_INSTALL_LIBS=	libsmbclient
-
-.if defined(WITH_SHAREMODES)
-CONFIGURE_ARGS+=	--with-libsmbsharemodes
-SAMBA_INSTALL_LIBS+=	libsmbsharemodes
-PLIST_SUB+=		SHAREMODES=""
-.else
-PLIST_SUB+=		SHAREMODES="@comment "
-.endif
-
-.if defined(WITH_MSRPC)
-CONFIGURE_ARGS+=	--with-libmsrpc
-SAMBA_INSTALL_LIBS+=	libmsrpc
-PLIST_SUB+=		MSRPC=""
-.else
-PLIST_SUB+=		MSRPC="@comment "
-.endif
-# Don't check for python presence
-CONFIGURE_ARGS+=	--without-python
-
-MAN7=			libsmbclient.7
-
-do-build:
-	cd ${WRKSRC} && ${MAKE} proto
-	cd ${WRKSRC} && ${MAKE} libsmbclient
-.if defined(WITH_SHAREMODES)
-	cd ${WRKSRC} && ${MAKE} libsmbsharemodes
-.endif
-.if defined(WITH_MSRPC)
-	cd ${WRKSRC} && ${MAKE} cac
-.endif
-
-do-install:
-	-@${MKDIR} ${MAN8PREFIX}/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(WITH_MSRPC)
-	${INSTALL_DATA} ${WRKSRC}/include/libmsrpc.h ${PREFIX}/include
-.endif
-	-@${MKDIR} ${PREFIX}/lib
-.for lib in ${SAMBA_INSTALL_LIBS}
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${lib}.a ${PREFIX}/lib
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${lib}.so ${PREFIX}/lib/${lib}.so.0
-	${LN} -snf ${lib}.so.0 ${PREFIX}/lib/${lib}.so
-.endfor
-	-@${MKDIR} ${EXAMPLESDIR}
-	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/libsmbclient ${EXAMPLESDIR}
-.if defined(WITH_MSRPC)
-	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/libmsrpc ${EXAMPLESDIR}
-.endif
+OPTIONS=		ADS		"With Active Directory support" off \
+			MSRPC		"Build the libmsrpc shared library" off \
+			SHAREMODES	"Build the libsharemods shared library" off
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/samba-libsmbclient/Makefile.inc b/net/samba-libsmbclient/Makefile.inc
new file mode 100644
index 000000000000..79d60c2e2cdf
--- /dev/null
+++ b/net/samba-libsmbclient/Makefile.inc
@@ -0,0 +1,55 @@
+# Don't check for python presence
+CONFIGURE_ARGS+=	--without-python
+# We WANT shared libs
+CONFIGURE_ARGS+=	--with-libsmbclient
+SAMBA_INSTALL_LIBS=	libsmbclient
+
+.if defined(WITH_MSRPC)
+CONFIGURE_ARGS+=	--with-libmsrpc
+SAMBA_INSTALL_LIBS+=	libmsrpc
+PLIST_SUB+=		MSRPC=""
+.else
+PLIST_SUB+=		MSRPC="@comment "
+.endif
+
+.if defined(WITH_SHAREMODES)
+CONFIGURE_ARGS+=	--with-libsmbsharemodes
+SAMBA_INSTALL_LIBS+=	libsmbsharemodes
+PLIST_SUB+=		SHAREMODES=""
+.else
+PLIST_SUB+=		SHAREMODES="@comment "
+.endif
+
+MAN7=			libsmbclient.7
+
+do-build:
+	cd ${WRKSRC} && ${MAKE} proto
+	cd ${WRKSRC} && ${MAKE} libsmbclient
+.if defined(WITH_MSRPC)
+	cd ${WRKSRC} && ${MAKE} cac
+.endif
+.if defined(WITH_SHAREMODES)
+	cd ${WRKSRC} && ${MAKE} libsmbsharemodes
+.endif
+
+do-install:
+	-@${MKDIR} ${MAN8PREFIX}/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(WITH_MSRPC)
+	${INSTALL_DATA} ${WRKSRC}/include/libmsrpc.h ${PREFIX}/include
+.endif
+	-@${MKDIR} ${PREFIX}/lib
+.for lib in ${SAMBA_INSTALL_LIBS}
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${lib}.a ${PREFIX}/lib
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${lib}.so ${PREFIX}/lib/${lib}.so.0
+	${LN} -snf ${lib}.so.0 ${PREFIX}/lib/${lib}.so
+.endfor
+	-@${MKDIR} ${EXAMPLESDIR}
+	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/libsmbclient ${EXAMPLESDIR}
+.if defined(WITH_MSRPC)
+	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/libmsrpc ${EXAMPLESDIR}
+.endif
diff --git a/net/samba-libsmbclient/pkg-descr b/net/samba-libsmbclient/pkg-descr
index 9ce35e8a8dee..5af983161c7a 100644
--- a/net/samba-libsmbclient/pkg-descr
+++ b/net/samba-libsmbclient/pkg-descr
@@ -1,4 +1,4 @@
 This is the set of shared libraries from the Samba port. It lets other
-programs to utialize various aspects of the SMB protocol.
+programs to utilize various aspects of the SMB protocol.
 
 WWW: http://www.samba.org/
diff --git a/net/samba-libsmbclient/pkg-plist b/net/samba-libsmbclient/pkg-plist
index 020c0c229470..83c12f7fab45 100644
--- a/net/samba-libsmbclient/pkg-plist
+++ b/net/samba-libsmbclient/pkg-plist
@@ -52,6 +52,9 @@ lib/libsmbclient.so.0
 %%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.c
@@ -68,6 +71,7 @@ lib/libsmbclient.so.0
 %%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