3 files changed, 18 insertions, 64 deletions

diff --git a/net/samba-libsmbclient/Makefile b/net/samba-libsmbclient/Makefile
index 9b7cf166ee74..34695d3308f8 100644
--- a/net/samba-libsmbclient/Makefile
+++ b/net/samba-libsmbclient/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=		0
+PORTREVISION=		1
 PORTEPOCH=		0
 PKGNAMESUFFIX=		-libsmbclient
 
@@ -22,7 +22,7 @@ PKGDIR=			${.CURDIR}
 USE_LDCONFIG=		yes
 
 OPTIONS=		ADS		"With Active Directory support" off \
-			MSRPC		"Build the libmsrpc shared library" off \
+			ADDNS		"Build the libaddns 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
index 52bc317311d7..362016e999a5 100644
--- a/net/samba-libsmbclient/Makefile.inc
+++ b/net/samba-libsmbclient/Makefile.inc
@@ -4,12 +4,13 @@ CONFIGURE_ARGS+=	--without-python
 CONFIGURE_ARGS+=	--with-libsmbclient
 SAMBA_INSTALL_LIBS=	libsmbclient
 
-.if !defined(WITHOUT_MSRPC)
-CONFIGURE_ARGS+=	--with-libmsrpc
-SAMBA_INSTALL_LIBS+=	libmsrpc
-PLIST_SUB+=		MSRPC=""
+.if !defined(WITHOUT_ADDNS)
+CONFIGURE_ARGS+=	--with-libaddns
+SAMBA_INSTALL_LIBS+=	libaddns
+PLIST_SUB+=		ADDNS=""
 .else
-PLIST_SUB+=		MSRPC="@comment "
+CONFIGURE_ARGS+=	--without-libaddns
+PLIST_SUB+=		ADDNS="@comment "
 .endif
 
 .if !defined(WITHOUT_SHAREMODES)
@@ -17,6 +18,7 @@ CONFIGURE_ARGS+=	--with-libsmbsharemodes
 SAMBA_INSTALL_LIBS+=	libsmbsharemodes
 PLIST_SUB+=		SHAREMODES=""
 .else
+CONFIGURE_ARGS+=	--without-libsmbsharemodes
 PLIST_SUB+=		SHAREMODES="@comment "
 .endif
 
@@ -25,8 +27,8 @@ MAN7=			libsmbclient.7
 do-build:
 	cd ${WRKSRC} && ${MAKE} proto
 	cd ${WRKSRC} && ${MAKE} libsmbclient
-.if !defined(WITHOUT_MSRPC)
-	cd ${WRKSRC} && ${MAKE} cac
+.if !defined(WITHOUT_ADDNS)
+	cd ${WRKSRC} && ${MAKE} libaddns
 .endif
 .if !defined(WITHOUT_SHAREMODES)
 	cd ${WRKSRC} && ${MAKE} libsmbsharemodes
@@ -39,8 +41,8 @@ do-install:
 .endfor
 	-@${MKDIR} ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/include/libsmbclient.h ${PREFIX}/include
-.if !defined(WITHOUT_MSRPC)
-	${INSTALL_DATA} ${WRKSRC}/include/libmsrpc.h ${PREFIX}/include
+.if !defined(WITHOUT_ADDNS)
+	${INSTALL_DATA} ${WRKSRC}/libaddns/addns.h ${PREFIX}/include
 .endif
 	-@${MKDIR} ${PREFIX}/lib
 .for lib in ${SAMBA_INSTALL_LIBS}
@@ -50,6 +52,3 @@ do-install:
 .endfor
 	-@${MKDIR} ${EXAMPLESDIR}
 	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/libsmbclient ${EXAMPLESDIR}
-.if !defined(WITHOUT_MSRPC)
-	@${CP} -Rp ${WRKDIR}/${DISTNAME}/examples/libmsrpc ${EXAMPLESDIR}
-.endif
diff --git a/net/samba-libsmbclient/pkg-plist b/net/samba-libsmbclient/pkg-plist
index 83c12f7fab45..ba046113527c 100644
--- a/net/samba-libsmbclient/pkg-plist
+++ b/net/samba-libsmbclient/pkg-plist
@@ -1,52 +1,14 @@
 include/libsmbclient.h
-%%MSRPC%%include/libmsrpc.h
+%%ADDNS%%include/addns.h
 lib/libsmbclient.a
 lib/libsmbclient.so
 lib/libsmbclient.so.0
-%%MSRPC%%lib/libmsrpc.a
-%%MSRPC%%lib/libmsrpc.so
-%%MSRPC%%lib/libmsrpc.so.0
+%%ADDNS%%lib/libaddns.a
+%%ADDNS%%lib/libaddns.so
+%%ADDNS%%lib/libaddns.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
@@ -65,6 +27,7 @@ lib/libsmbclient.so.0
 %%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
@@ -76,12 +39,4 @@ lib/libsmbclient.so.0
 %%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%%