3 files changed, 122 insertions, 36 deletions

diff --git a/net/samba-libsmbclient/Makefile b/net/samba-libsmbclient/Makefile
index 6fc89f968010..5014c6b0c96d 100644
--- a/net/samba-libsmbclient/Makefile
+++ b/net/samba-libsmbclient/Makefile
@@ -5,11 +5,11 @@
 # $FreeBSD$
 #
 
-PORTREVISION=		2
+PORTREVISION=		0
 PORTEPOCH=		0
 PKGNAMESUFFIX=		-libsmbclient
 
-COMMENT=		The shared lib from the samba packages
+COMMENT=		Shared libs from the samba package
 
 CONFLICTS=
 
@@ -21,10 +21,26 @@ PKGDIR=			${.CURDIR}
 
 INSTALLS_SHLIB=		yes
 
-# We WANT libsmbclient support :)
+# We WANT shared libs
 CONFIGURE_ARGS+=	--with-libsmbclient
-# This is taken from SAMBA_PORT(grep without)
-CONFIGURE_ARGS+=	--disable-cups
+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
 CONFIGURE_ARGS+=	--without-syslog
 CONFIGURE_ARGS+=	--without-quotas
@@ -38,19 +54,33 @@ MAN8=			libsmbclient.8
 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/man8
-.for man in ${MAN8}
-	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/manpages/${man} ${MAN8PREFIX}/man/man8
+	-@${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
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/libsmbclient.a ${PREFIX}/lib
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/libsmbclient.so.0 ${PREFIX}/lib
-	${LN} -snf libsmbclient.so.0 ${PREFIX}/lib/libsmbclient.so
+.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}
+	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/libsmbclient ${EXAMPLESDIR}
+.if defined(WITH_MSRPC)
+	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/libmsrpc ${EXAMPLESDIR}
+.endif
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/samba-libsmbclient/pkg-descr b/net/samba-libsmbclient/pkg-descr
index 4a808dcf47b2..9ce35e8a8dee 100644
--- a/net/samba-libsmbclient/pkg-descr
+++ b/net/samba-libsmbclient/pkg-descr
@@ -1,4 +1,4 @@
-This is the shared library from the Samba port. It lets other programs
-to use the SMB protocol.
+This is the set of shared libraries from the Samba port. It lets other
+programs to utialize 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 197797d463b3..020c0c229470 100644
--- a/net/samba-libsmbclient/pkg-plist
+++ b/net/samba-libsmbclient/pkg-plist
@@ -1,27 +1,83 @@
 include/libsmbclient.h
+%%MSRPC%%include/libmsrpc.h
 lib/libsmbclient.a
 lib/libsmbclient.so
 lib/libsmbclient.so.0
-%%EXAMPLESDIR%%/get_auth_data_fn.h
-%%EXAMPLESDIR%%/smbwrapper/Makefile
-%%EXAMPLESDIR%%/smbwrapper/README
-%%EXAMPLESDIR%%/smbwrapper/opendir_smbsh.c
-%%EXAMPLESDIR%%/smbwrapper/select.c
-%%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%%/Makefile
-%%EXAMPLESDIR%%/README
-%%EXAMPLESDIR%%/testacl.c
-%%EXAMPLESDIR%%/testbrowse.c
-%%EXAMPLESDIR%%/testchmod.c
-%%EXAMPLESDIR%%/testsmbc.c
-%%EXAMPLESDIR%%/teststat.c
-%%EXAMPLESDIR%%/testutime.c
-%%EXAMPLESDIR%%/tree.c
-@dirrm %%EXAMPLESDIR%%/smbwrapper
+%%MSRPC%%lib/libmsrpc.a
+%%MSRPC%%lib/libmsrpc.so
+%%MSRPC%%lib/libmsrpc.so.0
+%%SHAREMODES%%lib/libsmbsharemodes.a
+%%SHAREMODES%%lib/libsmbsharemodes.so
+%%SHAREMODES%%lib/libsmbsharemodes.so.0
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/cacusermgr/Makefile
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/cacusermgr/cacusermgr.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/cacusermgr/cacusermgr.h
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/cacusermgr/mgr_group.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/cacusermgr/mgr_user.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/cacusermgr/util.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/Makefile
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/README
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/lsa/ear.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/lsa/lsaenum.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/lsa/lsaenumprivs.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/lsa/lsapol.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/lsa/lsapriv.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/lsa/lsaq.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/lsa/lsatrust.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/reg/regdelete.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/reg/regkey.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/reg/regkeycreate.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/reg/regkeyenum.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/reg/regopen.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/reg/regopenkey.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/reg/regqueryval.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/reg/regsetval.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/reg/regvalenum.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/reg/security.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/reg/shutdown.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/sam/adduser.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/sam/disable.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/sam/dominfo.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/sam/enable.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/sam/samenum.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/sam/samgroup.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/sam/samlookup.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/sam/samuser.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/smbc_test/smbc.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/svcctl/svc.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/test_util.c
+%%MSRPC%%%%EXAMPLESDIR%%/libmsrpc/test/test_util.h
+%%EXAMPLESDIR%%/libsmbclient/Makefile
+%%EXAMPLESDIR%%/libsmbclient/README
+%%EXAMPLESDIR%%/libsmbclient/get_auth_data_fn.h
+%%EXAMPLESDIR%%/libsmbclient/smbwrapper/Makefile
+%%EXAMPLESDIR%%/libsmbclient/smbwrapper/README
+%%EXAMPLESDIR%%/libsmbclient/smbwrapper/opendir_smbsh.c
+%%EXAMPLESDIR%%/libsmbclient/smbwrapper/select.c
+%%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/testbrowse.c
+%%EXAMPLESDIR%%/libsmbclient/testbrowse2.c
+%%EXAMPLESDIR%%/libsmbclient/testchmod.c
+%%EXAMPLESDIR%%/libsmbclient/testread.c
+%%EXAMPLESDIR%%/libsmbclient/testsmbc.c
+%%EXAMPLESDIR%%/libsmbclient/teststat.c
+%%EXAMPLESDIR%%/libsmbclient/testutime.c
+%%EXAMPLESDIR%%/libsmbclient/tree.c
+@dirrm %%EXAMPLESDIR%%/libsmbclient/smbwrapper
+@dirrm %%EXAMPLESDIR%%/libsmbclient
+%%MSRPC%%@dirrm %%EXAMPLESDIR%%/libmsrpc/test/svcctl
+%%MSRPC%%@dirrm %%EXAMPLESDIR%%/libmsrpc/test/smbc_test
+%%MSRPC%%@dirrm %%EXAMPLESDIR%%/libmsrpc/test/sam
+%%MSRPC%%@dirrm %%EXAMPLESDIR%%/libmsrpc/test/reg
+%%MSRPC%%@dirrm %%EXAMPLESDIR%%/libmsrpc/test/lsa
+%%MSRPC%%@dirrm %%EXAMPLESDIR%%/libmsrpc/test
+%%MSRPC%%@dirrm %%EXAMPLESDIR%%/libmsrpc/cacusermgr
+%%MSRPC%%@dirrm %%EXAMPLESDIR%%/libmsrpc
 @dirrm %%EXAMPLESDIR%%